removed '/Edit/Advanced' menu.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@220 ee746299-78ed-0310-b773-934348b2243d

4 files changed, 13 insertions, 186 deletions

diff --git a/ChangeLog b/ChangeLog
index 803d0f1c..ea25c330 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-19
+
+	* src/compose.c
+	  src/prefs_common.c: removed '/Edit/Advanced' menu which had been
+	  provided for old GtkSText, and had interfered with gtk-key-theme
+	  configuration.
+
 2005-04-15
 
 	* src/folderview.c: folderview_create(): check GTK version for
diff --git a/ChangeLog.ja b/ChangeLog.ja
index a790379c..5ebbc1c0 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,9 @@
+2005-04-19
+
+	* src/compose.c
+	  src/prefs_common.c: 古い GtkSText のために用意され、 gtk-key-theme
+	  の設定と干渉していた '/編集/高度な操作' メニューを削除。
+
 2005-04-15
 
 	* src/folderview.c: folderview_create(): "ellipsize" プロパティの
diff --git a/src/compose.c b/src/compose.c
index 1e864ddd..2be9056f 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -381,9 +381,6 @@ static void compose_paste_cb		(Compose	*compose);
 static void compose_paste_as_quote_cb	(Compose	*compose);
 static void compose_allsel_cb		(Compose	*compose);
 
-static void compose_action_cb		(Compose	*compose,
-					 ComposeAction	 action);
-
 static void compose_grab_focus_cb	(GtkWidget	*widget,
 					 Compose	*compose);
 
@@ -502,77 +499,6 @@ static GtkItemFactoryEntry compose_entries[] =
 	{N_("/_Edit/Paste as _quotation"),
 					NULL, compose_paste_as_quote_cb, 0, NULL},
 	{N_("/_Edit/Select _all"),	"<control>A", compose_allsel_cb, 0, NULL},
-	{N_("/_Edit/A_dvanced"),	NULL, NULL, 0, "<Branch>"},
-	{N_("/_Edit/A_dvanced/Move a character backward"),
-					"<control>B",
-					compose_action_cb,
-					COMPOSE_ACTION_MOVE_BACKWARD_CHARACTER,
-					NULL},
-	{N_("/_Edit/A_dvanced/Move a character forward"),
-					"<control>F",
-					compose_action_cb,
-					COMPOSE_ACTION_MOVE_FORWARD_CHARACTER,
-					NULL},
-	{N_("/_Edit/A_dvanced/Move a word backward"),
-					NULL, /* "<alt>B" */
-					compose_action_cb,
-					COMPOSE_ACTION_MOVE_BACKWARD_WORD,
-					NULL},
-	{N_("/_Edit/A_dvanced/Move a word forward"),
-					NULL, /* "<alt>F" */
-					compose_action_cb,
-					COMPOSE_ACTION_MOVE_FORWARD_WORD,
-					NULL},
-	{N_("/_Edit/A_dvanced/Move to beginning of line"),
-					NULL, /* "<control>A" */
-					compose_action_cb,
-					COMPOSE_ACTION_MOVE_BEGINNING_OF_LINE,
-					NULL},
-	{N_("/_Edit/A_dvanced/Move to end of line"),
-					"<control>E",
-					compose_action_cb,
-					COMPOSE_ACTION_MOVE_END_OF_LINE,
-					NULL},
-	{N_("/_Edit/A_dvanced/Move to previous line"),
-					"<control>P",
-					compose_action_cb,
-					COMPOSE_ACTION_MOVE_PREVIOUS_LINE,
-					NULL},
-	{N_("/_Edit/A_dvanced/Move to next line"),
-					"<control>N",
-					compose_action_cb,
-					COMPOSE_ACTION_MOVE_NEXT_LINE,
-					NULL},
-	{N_("/_Edit/A_dvanced/Delete a character backward"),
-					"<control>H",
-					compose_action_cb,
-					COMPOSE_ACTION_DELETE_BACKWARD_CHARACTER,
-					NULL},
-	{N_("/_Edit/A_dvanced/Delete a character forward"),
-					"<control>D",
-					compose_action_cb,
-					COMPOSE_ACTION_DELETE_FORWARD_CHARACTER,
-					NULL},
-	{N_("/_Edit/A_dvanced/Delete a word backward"),
-					NULL, /* "<control>W" */
-					compose_action_cb,
-					COMPOSE_ACTION_DELETE_BACKWARD_WORD,
-					NULL},
-	{N_("/_Edit/A_dvanced/Delete a word forward"),
-					NULL, /* "<alt>D", */
-					compose_action_cb,
-					COMPOSE_ACTION_DELETE_FORWARD_WORD,
-					NULL},
-	{N_("/_Edit/A_dvanced/Delete line"),
-					"<control>U",
-					compose_action_cb,
-					COMPOSE_ACTION_DELETE_LINE,
-					NULL},
-	{N_("/_Edit/A_dvanced/Delete to end of line"),
-					"<control>K",
-					compose_action_cb,
-					COMPOSE_ACTION_DELETE_TO_LINE_END,
-					NULL},
 	{N_("/_Edit/---"),		NULL, NULL, 0, "<Separator>"},
 	{N_("/_Edit/_Wrap current paragraph"),
 					"<control>L", compose_wrap_cb, 0, NULL},
@@ -4191,7 +4117,6 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 		menu_set_sensitive(ifactory, "/Edit/Wrap current paragraph", FALSE);
 		menu_set_sensitive(ifactory, "/Edit/Wrap all long lines", FALSE);
 		menu_set_sensitive(ifactory, "/Edit/Auto wrapping", FALSE);
-		menu_set_sensitive(ifactory, "/Edit/Advanced", FALSE);
 		menu_set_sensitive(ifactory, "/View/Attachment", FALSE);
 		menu_set_sensitive(ifactory, "/Tools/Template", FALSE);
 		menu_set_sensitive(ifactory, "/Tools/Actions", FALSE);
@@ -5739,92 +5664,6 @@ static void compose_allsel_cb(Compose *compose)
 	}
 }
 
-static void textview_move_beginning_of_line(GtkTextView *text)
-{
-}
-
-static void textview_move_forward_character(GtkTextView *text)
-{
-}
-
-static void textview_move_backward_character(GtkTextView *text)
-{
-}
-
-static void textview_move_forward_word(GtkTextView *text)
-{
-}
-
-static void textview_move_backward_word(GtkTextView *text)
-{
-}
-
-static void textview_move_end_of_line(GtkTextView *text)
-{
-}
-
-static void textview_move_next_line(GtkTextView *text)
-{
-}
-
-static void textview_move_previous_line(GtkTextView *text)
-{
-}
-
-static void textview_delete_forward_character(GtkTextView *text)
-{
-}
-
-static void textview_delete_backward_character(GtkTextView *text)
-{
-}
-
-static void textview_delete_forward_word(GtkTextView *text)
-{
-}
-
-static void textview_delete_backward_word(GtkTextView *text)
-{
-}
-
-static void textview_delete_line(GtkTextView *text)
-{
-}
-
-static void textview_delete_to_line_end(GtkTextView *text)
-{
-}
-
-static void compose_action_cb(Compose *compose, ComposeAction action)
-{
-	GtkTextView *text = GTK_TEXT_VIEW(compose->text);
-	static struct {
-		void (*do_action) (GtkTextView *text);
-	} action_table[] = {
-		{textview_move_beginning_of_line},
-		{textview_move_forward_character},
-		{textview_move_backward_character},
-		{textview_move_forward_word},
-		{textview_move_backward_word},
-		{textview_move_end_of_line},
-		{textview_move_next_line},
-		{textview_move_previous_line},
-		{textview_delete_forward_character},
-		{textview_delete_backward_character},
-		{textview_delete_forward_word},
-		{textview_delete_backward_word},
-		{textview_delete_line},
-		{NULL}, /* textview_delete_line_n */
-		{textview_delete_to_line_end}
-	};
-
-	if (!GTK_WIDGET_HAS_FOCUS(text)) return;
-
-	if (action >= COMPOSE_ACTION_MOVE_BEGINNING_OF_LINE &&
-	    action <= COMPOSE_ACTION_DELETE_TO_LINE_END)
-		action_table[action].do_action(text);
-}
-
 static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
 {
 	if (GTK_IS_EDITABLE(widget) || GTK_IS_TEXT_VIEW(widget))
diff --git a/src/prefs_common.c b/src/prefs_common.c
index 7197142b..99232748 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -3208,11 +3208,6 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 
 		{"<Compose>/File/Close",			"<control>W"},
 		{"<Compose>/Edit/Select all",			"<control>A"},
-		{"<Compose>/Edit/Advanced/Move a word backward",	""},
-		{"<Compose>/Edit/Advanced/Move a word forward",		""},
-		{"<Compose>/Edit/Advanced/Move to beginning of line",	""},
-		{"<Compose>/Edit/Advanced/Delete a word backward",	""},
-		{"<Compose>/Edit/Advanced/Delete a word forward",	""},
 	};
 
 	static struct KeyBind mew_wl_menurc[] = {
@@ -3261,11 +3256,6 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 
 		{"<Compose>/File/Close",			"<alt>W"},
 		{"<Compose>/Edit/Select all",			""},
-		{"<Compose>/Edit/Advanced/Move a word backward",	"<alt>B"},
-		{"<Compose>/Edit/Advanced/Move a word forward",		"<alt>F"},
-		{"<Compose>/Edit/Advanced/Move to beginning of line",	"<control>A"},
-		{"<Compose>/Edit/Advanced/Delete a word backward",	"<control>W"},
-		{"<Compose>/Edit/Advanced/Delete a word forward",	"<alt>D"},
 	};
 
 	static struct KeyBind mutt_menurc[] = {
@@ -3314,11 +3304,6 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 
 		{"<Compose>/File/Close",			"<alt>W"},
 		{"<Compose>/Edit/Select all",			""},
-		{"<Compose>/Edit/Advanced/Move a word backward",	"<alt>B"},
-		{"<Compose>/Edit/Advanced/Move a word forward",		"<alt>F"},
-		{"<Compose>/Edit/Advanced/Move to beginning of line",	"<control>A"},
-		{"<Compose>/Edit/Advanced/Delete a word backward",	"<control>W"},
-		{"<Compose>/Edit/Advanced/Delete a word forward",	"<alt>D"},
 	};
 
 	static struct KeyBind old_sylpheed_menurc[] = {
@@ -3367,11 +3352,6 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 
 		{"<Compose>/File/Close",			"<alt>W"},
 		{"<Compose>/Edit/Select all",			""},
-		{"<Compose>/Edit/Advanced/Move a word backward",	"<alt>B"},
-		{"<Compose>/Edit/Advanced/Move a word forward",		"<alt>F"},
-		{"<Compose>/Edit/Advanced/Move to beginning of line",	"<control>A"},
-		{"<Compose>/Edit/Advanced/Delete a word backward",	"<control>W"},
-		{"<Compose>/Edit/Advanced/Delete a word forward",	"<alt>D"},
 	};
 
 	static struct KeyBind empty_menurc[] = {
@@ -3420,11 +3400,6 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
 
 		{"<Compose>/File/Close",			""},
 		{"<Compose>/Edit/Select all",			""},
-		{"<Compose>/Edit/Advanced/Move a word backward",	""},
-		{"<Compose>/Edit/Advanced/Move a word forward",		""},
-		{"<Compose>/Edit/Advanced/Move to beginning of line",	""},
-		{"<Compose>/Edit/Advanced/Delete a word backward",	""},
-		{"<Compose>/Edit/Advanced/Delete a word forward",	""},
 	};
 
 	text = gtk_entry_get_text(entry);