don't automatically hide Junk and Execute button.

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

5 files changed, 39 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index c8358f67..cc0c0538 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-30
+
+	* src/mainwindow.c: main_window_set_toolbar_button_visibility():
+	  don't automatically hide Junk and Execute button.
+	* src/prefs_toolbar.h: PrefsToolbarItem: added stock_id.
+
 2007-01-29
 
 	* version 2.4.0beta1
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 2872cb16..ad87e7dd 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,9 @@
+2007-01-30
+
+	* src/mainwindow.c: main_window_set_toolbar_button_visibility():
+	  迷惑メールと実行ボタンを自動的に隠さないようにした。
+	* src/prefs_toolbar.h: PrefsToolbarItem: stock_id を追加。
+
 2007-01-29
 
 	* version 2.4.0beta1
diff --git a/src/compose.c b/src/compose.c
index c3fecaaa..2455e391 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -4847,25 +4847,25 @@ static void compose_connect_changed_callbacks(Compose *compose)
 static PrefsToolbarItem items[] =
 {
 	{T_SEND,	N_("Send message"),
-	 STOCK_PIXMAP_MAIL_SEND,	toolbar_send_cb},
+	 STOCK_PIXMAP_MAIL_SEND,	NULL,	toolbar_send_cb},
 	{T_SEND_LATER,	N_("Put into queue folder and send later"),
-	 STOCK_PIXMAP_MAIL_SEND_QUEUE,	toolbar_send_later_cb},
+	 STOCK_PIXMAP_MAIL_SEND_QUEUE,	NULL,	toolbar_send_later_cb},
 	{T_DRAFT,	N_("Save to draft folder"),
-	 STOCK_PIXMAP_MAIL,		toolbar_draft_cb},
+	 STOCK_PIXMAP_MAIL,		NULL,	toolbar_draft_cb},
 	{T_INSERT_FILE,	N_("Insert file"),
-	 STOCK_PIXMAP_INSERT_FILE,	toolbar_insert_cb},
+	 STOCK_PIXMAP_INSERT_FILE,	NULL,	toolbar_insert_cb},
 	{T_ATTACH_FILE,	N_("Attach file"),
-	 STOCK_PIXMAP_MAIL_ATTACH,	toolbar_attach_cb},
+	 STOCK_PIXMAP_MAIL_ATTACH,	NULL,	toolbar_attach_cb},
 	{T_SIGNATURE,	N_("Append signature"),
-	 STOCK_PIXMAP_SIGN,		toolbar_sig_cb},
+	 STOCK_PIXMAP_SIGN,		NULL,	toolbar_sig_cb},
 	{T_EDITOR,	N_("Edit with external editor"),
-	 STOCK_PIXMAP_MAIL_COMPOSE,	toolbar_ext_editor_cb},
+	 STOCK_PIXMAP_MAIL_COMPOSE,	NULL,	toolbar_ext_editor_cb},
 	{T_LINEWRAP,	N_("Wrap all long lines"),
-	 STOCK_PIXMAP_LINEWRAP,		toolbar_linewrap_cb},
+	 STOCK_PIXMAP_LINEWRAP,		NULL,	toolbar_linewrap_cb},
 	{T_ADDRESS_BOOK,	N_("Address book"),
-	 STOCK_PIXMAP_ADDRESS_BOOK,	toolbar_address_cb},
+	 STOCK_PIXMAP_ADDRESS_BOOK,	NULL,	toolbar_address_cb},
 
-	{-1, NULL, -1, NULL}
+	{-1, NULL, -1, NULL, NULL}
 };
 
 static GtkWidget *compose_toolbar_create(Compose *compose)
diff --git a/src/mainwindow.c b/src/mainwindow.c
index eebfaaa8..d57e8acf 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1921,6 +1921,7 @@ static void main_window_set_toolbar_button_visibility(MainWindow *mainwin)
 	} else
 		gtk_widget_hide(mainwin->toolbar);
 
+#if 0
 	if (mainwin->junk_btn) {
 		if (prefs_common.enable_junk)
 			gtk_widget_show(mainwin->junk_btn);
@@ -1934,6 +1935,7 @@ static void main_window_set_toolbar_button_visibility(MainWindow *mainwin)
 		else
 			gtk_widget_show(mainwin->exec_btn);
 	}
+#endif
 }
 
 void main_window_set_menu_sensitive(MainWindow *mainwin)
@@ -2363,29 +2365,29 @@ static GtkItemFactoryEntry forward_entries[] =
 static PrefsToolbarItem items[] =
 {
 	{T_GET,		N_("Incorporate new mail"),
-	 STOCK_PIXMAP_MAIL_RECEIVE,	toolbar_inc_cb},
+	 STOCK_PIXMAP_MAIL_RECEIVE,	NULL,	toolbar_inc_cb},
 	{T_GET_ALL,	N_("Incorporate new mail of all accounts"),
-	 STOCK_PIXMAP_MAIL_RECEIVE_ALL,	toolbar_inc_all_cb},
+	 STOCK_PIXMAP_MAIL_RECEIVE_ALL,	NULL,	toolbar_inc_all_cb},
 	{T_SEND_QUEUE,	N_("Send queued message(s)"),
-	 STOCK_PIXMAP_MAIL_SEND,	toolbar_send_cb},
+	 STOCK_PIXMAP_MAIL_SEND,	NULL,	toolbar_send_cb},
 	{T_COMPOSE,	N_("Compose new message"),
-	 STOCK_PIXMAP_MAIL_COMPOSE,	toolbar_compose_cb},
+	 STOCK_PIXMAP_MAIL_COMPOSE,	NULL,	toolbar_compose_cb},
 	{T_REPLY,	N_("Reply to the message"),
-	 STOCK_PIXMAP_MAIL_REPLY,	toolbar_reply_cb},
+	 STOCK_PIXMAP_MAIL_REPLY,	NULL,	toolbar_reply_cb},
 	{T_REPLY_ALL,	N_("Reply to all"),
-	 STOCK_PIXMAP_MAIL_REPLY_TO_ALL, toolbar_reply_to_all_cb},
+	 STOCK_PIXMAP_MAIL_REPLY_TO_ALL, NULL,	toolbar_reply_to_all_cb},
 	{T_FORWARD,	N_("Forward the message"),
-	 STOCK_PIXMAP_MAIL_FORWARD,	toolbar_forward_cb},
+	 STOCK_PIXMAP_MAIL_FORWARD,	NULL,	toolbar_forward_cb},
 	{T_DELETE,	N_("Delete the message"),
-	 STOCK_PIXMAP_DELETE,		toolbar_delete_cb},
+	 STOCK_PIXMAP_DELETE,		NULL,	toolbar_delete_cb},
 	{T_JUNK,	N_("Set as junk mail"),
-	 STOCK_PIXMAP_SPAM,		toolbar_junk_cb},
+	 STOCK_PIXMAP_SPAM,		NULL,	toolbar_junk_cb},
 	{T_EXECUTE,	N_("Execute marked process"),
-	 -1,				toolbar_exec_cb},
+	 -1,		GTK_STOCK_EXECUTE,	toolbar_exec_cb},
 	{T_NEXT,	N_("Next unread message"),
-	 -1,				toolbar_next_unread_cb},
+	 -1,		GTK_STOCK_GO_DOWN,	toolbar_next_unread_cb},
 
-	{-1, NULL, -1, NULL}
+	{-1, NULL, -1, NULL, NULL}
 };
 
 static GtkWidget *main_window_toolbar_create(MainWindow *mainwin)
@@ -2459,14 +2461,9 @@ static GtkWidget *main_window_toolbar_create_from_list(MainWindow *mainwin,
 		if (item->id == -1)
 			continue;
 
-		if (ditem->id == T_EXECUTE) {
-			icon_wid = gtk_image_new_from_stock
-				(GTK_STOCK_EXECUTE,
-				 GTK_ICON_SIZE_LARGE_TOOLBAR);
-		} else if (ditem->id == T_NEXT) {
+		if (item->stock_id) {
 			icon_wid = gtk_image_new_from_stock
-				(GTK_STOCK_GO_DOWN,
-				 GTK_ICON_SIZE_LARGE_TOOLBAR);
+				(item->stock_id, GTK_ICON_SIZE_LARGE_TOOLBAR);
 		} else
 			icon_wid = stock_pixbuf_widget(NULL, item->icon);
 
diff --git a/src/prefs_toolbar.h b/src/prefs_toolbar.h
index e89bb497..2fceb283 100644
--- a/src/prefs_toolbar.h
+++ b/src/prefs_toolbar.h
@@ -68,6 +68,7 @@ struct _PrefsToolbarItem
 	gint id;
 	gchar *tooltip;
 	StockPixmap icon;
+	const gchar *stock_id;
 	void (*callback) (GtkWidget *widget, gpointer data);
 	gpointer data;
 };