fixed 'Set display item of summary...' button in the common prefs dialog.

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

3 files changed, 19 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 099db695..faa0de34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-20
+
+	* src/prefs_common_dialog.c: fixed a bug that 'Set display item of
+	  summary...' button' always show send folder setting.
+
 2007-09-19
 
 	* version 2.4.6
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 63cfd15c..dcb4b484 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2007-09-20
+
+	* src/prefs_common_dialog.c: 「サマリの表示項目を設定...」ボタンが
+	  常に送信フォルダの設定を表示していたバグを修正。
+
 2007-09-19
 
 	* version 2.4.6
diff --git a/src/prefs_common_dialog.c b/src/prefs_common_dialog.c
index f2ce4f59..df1dcb00 100644
--- a/src/prefs_common_dialog.c
+++ b/src/prefs_common_dialog.c
@@ -615,6 +615,8 @@ static gboolean prefs_keybind_key_pressed	(GtkWidget	*widget,
 static void prefs_keybind_cancel		(void);
 static void prefs_keybind_apply_clicked		(GtkWidget	*widget);
 
+static void prefs_common_dispitem_clicked	(void);
+
 static void prefs_common_select_folder_cb	(GtkWidget	*widget,
 						 gpointer	 data);
 
@@ -1495,7 +1497,7 @@ static void prefs_display_create(void)
 	gtk_widget_show (button_dispitem);
 	gtk_box_pack_start (GTK_BOX (hbox1), button_dispitem, FALSE, TRUE, 0);
 	g_signal_connect (G_OBJECT (button_dispitem), "clicked",
-			  G_CALLBACK (prefs_summary_column_open), NULL);
+			  G_CALLBACK (prefs_common_dispitem_clicked), NULL);
 
 	APPEND_SUB_NOTEBOOK(notebook, vbox_tab, _("Message"));
 	msg_wid = prefs_message_create();
@@ -3851,6 +3853,12 @@ static void prefs_common_uri_set_entry(PrefParam *pparam)
 	}
 }
 
+static void prefs_common_dispitem_clicked(void)
+{
+	prefs_summary_column_open(FOLDER_ITEM_IS_SENT_FOLDER
+		(main_window_get()->summaryview->folder_item));
+}
+
 static void prefs_common_select_folder_cb(GtkWidget *widget, gpointer data)
 {
 	FolderItem *item;