disabled GtkHandleBox.

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

5 files changed, 45 insertions, 83 deletions

diff --git a/src/compose.c b/src/compose.c
index aecdb455..2f497d99 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -48,7 +48,6 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkcontainer.h>
-#include <gtk/gtkhandlebox.h>
 #include <gtk/gtktoolbar.h>
 #include <gtk/gtktable.h>
 #include <gtk/gtkhbox.h>
@@ -161,8 +160,7 @@ static Compose *compose_create			(PrefsAccount	*account,
 						 ComposeMode	 mode);
 static Compose *compose_find_window_by_target	(MsgInfo	*msginfo);
 static void compose_connect_changed_callbacks	(Compose	*compose);
-static void compose_toolbar_create		(Compose	*compose,
-						 GtkWidget	*container);
+static GtkWidget *compose_toolbar_create	(Compose	*compose);
 static GtkWidget *compose_account_option_menu_create
 						(Compose	*compose);
 static void compose_set_out_encoding		(Compose	*compose);
@@ -3829,7 +3827,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 	GtkWidget *window;
 	GtkWidget *vbox;
 	GtkWidget *menubar;
-	GtkWidget *handlebox;
+	GtkWidget *toolbar;
 
 	GtkWidget *vbox2;
 
@@ -3926,12 +3924,12 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 	n_menu_entries = sizeof(compose_entries) / sizeof(compose_entries[0]);
 	menubar = menubar_create(window, compose_entries,
 				 n_menu_entries, "<Compose>", compose);
+	gtk_widget_set_size_request(menubar, 300, -1);
 	gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
 
-	handlebox = gtk_handle_box_new();
-	gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
-
-	compose_toolbar_create(compose, handlebox);
+	toolbar = compose_toolbar_create(compose);
+	gtk_widget_set_size_request(toolbar, 300, -1);
+	gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
 
 	vbox2 = gtk_vbox_new(FALSE, 2);
 	gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
@@ -4213,19 +4211,16 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 
 	switch (prefs_common.toolbar_style) {
 	case TOOLBAR_NONE:
-		gtk_widget_hide(handlebox);
+		gtk_widget_hide(toolbar);
 		break;
 	case TOOLBAR_ICON:
-		gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
-				      GTK_TOOLBAR_ICONS);
+		gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
 		break;
 	case TOOLBAR_TEXT:
-		gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
-				      GTK_TOOLBAR_TEXT);
+		gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_TEXT);
 		break;
 	case TOOLBAR_BOTH:
-		gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
-				      GTK_TOOLBAR_BOTH);
+		gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
 		break;
 	}
 
@@ -4238,7 +4233,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 	compose->window        = window;
 	compose->vbox	       = vbox;
 	compose->menubar       = menubar;
-	compose->handlebox     = handlebox;
+	compose->toolbar       = toolbar;
 
 	compose->vbox2	       = vbox2;
 
@@ -4421,7 +4416,7 @@ static void compose_connect_changed_callbacks(Compose *compose)
 			 G_CALLBACK(compose_changed_cb), compose);
 }
 
-static void compose_toolbar_create(Compose *compose, GtkWidget *container)
+static GtkWidget *compose_toolbar_create(Compose *compose)
 {
 	GtkWidget *toolbar;
 	GtkWidget *icon_wid;
@@ -4441,10 +4436,8 @@ static void compose_toolbar_create(Compose *compose, GtkWidget *container)
 	gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
 	gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar),
 				  GTK_ICON_SIZE_LARGE_TOOLBAR);
-	gtk_container_add(GTK_CONTAINER(container), toolbar);
-	gtk_widget_set_size_request(toolbar, 1, -1);
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_SEND);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_SEND);
 	send_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					   _("Send"),
 					   _("Send message"),
@@ -4453,7 +4446,7 @@ static void compose_toolbar_create(Compose *compose, GtkWidget *container)
 					   G_CALLBACK(toolbar_send_cb),
 					   compose);
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_SEND_QUEUE);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_SEND_QUEUE);
 	sendl_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					   _("Send later"),
 					   _("Put into queue folder and send later"),
@@ -4462,7 +4455,7 @@ static void compose_toolbar_create(Compose *compose, GtkWidget *container)
 					   G_CALLBACK(toolbar_send_later_cb),
 					   compose);
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL);
 	draft_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					    _("Draft"),
 					    _("Save to draft folder"),
@@ -4473,7 +4466,7 @@ static void compose_toolbar_create(Compose *compose, GtkWidget *container)
 
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_INSERT_FILE);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_INSERT_FILE);
 	insert_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					     _("Insert"),
 					     _("Insert file"),
@@ -4482,7 +4475,7 @@ static void compose_toolbar_create(Compose *compose, GtkWidget *container)
 					     G_CALLBACK(toolbar_insert_cb),
 					     compose);
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_ATTACH);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_ATTACH);
 	attach_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					     _("Attach"),
 					     _("Attach file"),
@@ -4493,7 +4486,7 @@ static void compose_toolbar_create(Compose *compose, GtkWidget *container)
 
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_SIGN);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_SIGN);
 	sig_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					  _("Signature"),
 					  _("Insert signature"),
@@ -4503,7 +4496,7 @@ static void compose_toolbar_create(Compose *compose, GtkWidget *container)
 
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_COMPOSE);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_COMPOSE);
 	exteditor_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 						_("Editor"),
 						_("Edit with external editor"),
@@ -4512,7 +4505,7 @@ static void compose_toolbar_create(Compose *compose, GtkWidget *container)
 						G_CALLBACK(toolbar_ext_editor_cb),
 						compose);
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_LINEWRAP);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_LINEWRAP);
 	linewrap_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					       _("Linewrap"),
 					       _("Wrap all long lines"),
@@ -4523,7 +4516,7 @@ static void compose_toolbar_create(Compose *compose, GtkWidget *container)
 
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_ADDRESS_BOOK);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_ADDRESS_BOOK);
 	addrbook_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					       _("Address"),
 					       _("Address book"),
@@ -4532,7 +4525,6 @@ static void compose_toolbar_create(Compose *compose, GtkWidget *container)
 					       G_CALLBACK(toolbar_address_cb),
 					       compose);
 
-	compose->toolbar       = toolbar;
 	compose->send_btn      = send_btn;
 	compose->sendl_btn     = sendl_btn;
 	compose->draft_btn     = draft_btn;
@@ -4544,6 +4536,8 @@ static void compose_toolbar_create(Compose *compose, GtkWidget *container)
 	compose->addrbook_btn  = addrbook_btn;
 
 	gtk_widget_show_all(toolbar);
+
+	return toolbar;
 }
 
 static GtkWidget *compose_account_option_menu_create(Compose *compose)
diff --git a/src/compose.h b/src/compose.h
index d937389f..868820eb 100644
--- a/src/compose.h
+++ b/src/compose.h
@@ -76,7 +76,6 @@ struct _Compose
 	GtkWidget *vbox;
 	GtkWidget *menubar;
 
-	GtkWidget *handlebox;
 	GtkWidget *toolbar;
 	GtkWidget *send_btn;
 	GtkWidget *sendl_btn;
diff --git a/src/mainwindow.c b/src/mainwindow.c
index eb54d8c1..faca8664 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -37,7 +37,6 @@
 #include <gtk/gtkeditable.h>
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkmenuitem.h>
-#include <gtk/gtkhandlebox.h>
 #include <gtk/gtktoolbar.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtktooltips.h>
@@ -112,8 +111,7 @@ static void main_window_show_cur_account	(MainWindow	*mainwin);
 
 static void main_window_set_widgets		(MainWindow	*mainwin,
 						 SeparateType	 type);
-static void main_window_toolbar_create		(MainWindow	*mainwin,
-						 GtkWidget	*container);
+static GtkWidget *main_window_toolbar_create	(MainWindow	*mainwin);
 
 /* callback functions */
 static void toolbar_inc_cb		(GtkWidget	*widget,
@@ -153,13 +151,6 @@ static void toolbar_account_button_pressed	(GtkWidget	*widget,
 						 gpointer	 data);
 #endif
 
-static void toolbar_child_attached		(GtkWidget	*widget,
-						 GtkWidget	*child,
-						 gpointer	 data);
-static void toolbar_child_detached		(GtkWidget	*widget,
-						 GtkWidget	*child,
-						 gpointer	 data);
-
 static void online_switch_clicked		(GtkWidget	*widget,
 						 gpointer	 data);
 static void ac_label_button_pressed		(GtkWidget	*widget,
@@ -792,7 +783,7 @@ MainWindow *main_window_create(SeparateType type)
 	GtkWidget *window;
 	GtkWidget *vbox;
 	GtkWidget *menubar;
-	GtkWidget *handlebox;
+	GtkWidget *toolbar;
 	GtkWidget *vbox_body;
 	GtkWidget *statusbar;
 	GtkWidget *progressbar;
@@ -852,18 +843,13 @@ MainWindow *main_window_create(SeparateType type)
 	menubar = menubar_create(window, mainwin_entries, 
 				 n_menu_entries, "<Main>", mainwin);
 	gtk_widget_show(menubar);
+	gtk_widget_set_size_request(menubar, 300, -1);
 	gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
 	ifactory = gtk_item_factory_from_widget(menubar);
 
-	handlebox = gtk_handle_box_new();
-	gtk_widget_show(handlebox);
-	gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
-	g_signal_connect(G_OBJECT(handlebox), "child_attached",
-			 G_CALLBACK(toolbar_child_attached), mainwin);
-	g_signal_connect(G_OBJECT(handlebox), "child_detached",
-			 G_CALLBACK(toolbar_child_detached), mainwin);
-
-	main_window_toolbar_create(mainwin, handlebox);
+	toolbar = main_window_toolbar_create(mainwin);
+	gtk_widget_set_size_request(toolbar, 300, -1);
+	gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
 
 	/* vbox that contains body */
 	vbox_body = gtk_vbox_new(FALSE, BORDER_WIDTH);
@@ -939,7 +925,7 @@ MainWindow *main_window_create(SeparateType type)
 	mainwin->vbox           = vbox;
 	mainwin->menubar        = menubar;
 	mainwin->menu_factory   = ifactory;
-	mainwin->handlebox      = handlebox;
+	mainwin->toolbar        = toolbar;
 	mainwin->vbox_body      = vbox_body;
 	mainwin->statusbar      = statusbar;
 	mainwin->progressbar    = progressbar;
@@ -2166,8 +2152,7 @@ static GtkItemFactoryEntry forward_entries[] =
 	{N_("/Redirec_t"),		NULL, reply_cb, COMPOSE_REDIRECT, NULL}
 };
 
-static void main_window_toolbar_create(MainWindow *mainwin,
-				       GtkWidget *container)
+static GtkWidget *main_window_toolbar_create(MainWindow *mainwin)
 {
 	GtkWidget *toolbar;
 	GtkWidget *icon_wid;
@@ -2197,10 +2182,8 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 	gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
 	gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar),
 				  GTK_ICON_SIZE_LARGE_TOOLBAR);
-	gtk_container_add(GTK_CONTAINER(container), toolbar);
-	gtk_widget_set_size_request(toolbar, 1, -1);
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_RECEIVE);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_RECEIVE);
 	get_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					  _("Get"),
 					  _("Incorporate new mail"),
@@ -2208,7 +2191,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 					  icon_wid,
 					  G_CALLBACK(toolbar_inc_cb),
 					  mainwin);
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_RECEIVE_ALL);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_RECEIVE_ALL);
 	getall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					     _("Get all"),
 					     _("Incorporate new mail of all accounts"),
@@ -2219,7 +2202,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_SEND);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_SEND);
 	send_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					   _("Send"),
 					   _("Send queued message(s)"),
@@ -2230,7 +2213,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_COMPOSE);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_COMPOSE);
 	compose_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					      _("Compose"),
 					      _("Compose new message"),
@@ -2239,7 +2222,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 					      G_CALLBACK(toolbar_compose_cb),
 					      mainwin);
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_REPLY);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_REPLY);
 	reply_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					    _("Reply"),
 					    _("Reply to the message"),
@@ -2257,8 +2240,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 				  GTK_WIDGET_PTR(reply_combo),
 				  _("Reply to the message"), "Reply");
 
-	icon_wid = stock_pixbuf_widget
-		(container, STOCK_PIXMAP_MAIL_REPLY_TO_ALL);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_REPLY_TO_ALL);
 	replyall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					       _("Reply all"),
 					       _("Reply to all"),
@@ -2267,7 +2249,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 					       G_CALLBACK(toolbar_reply_to_all_cb),
 					       mainwin);
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_FORWARD);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_FORWARD);
 	fwd_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					  _("Forward"),
 					  _("Forward the message"),
@@ -2287,7 +2269,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_DELETE);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_DELETE);
 	delete_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					  _("Delete"),
 					  _("Delete the message"),
@@ -2296,7 +2278,7 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 					  G_CALLBACK(toolbar_delete_cb),
 					  mainwin);
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_SPAM);
+	icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_SPAM);
 	junk_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					   _("Junk"),
 					   _("Set as junk mail"),
@@ -2350,7 +2332,6 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 			 G_CALLBACK(toolbar_account_button_pressed), mainwin);
 #endif
 
-	mainwin->toolbar      = toolbar;
 	mainwin->get_btn      = get_btn;
 	mainwin->getall_btn   = getall_btn;
 	mainwin->compose_btn  = compose_btn;
@@ -2370,6 +2351,8 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 	mainwin->exec_btn     = exec_btn;
 
 	gtk_widget_show_all(toolbar);
+
+	return toolbar;
 }
 
 /* callback functions */
@@ -2498,18 +2481,6 @@ static void toolbar_account_button_pressed(GtkWidget *widget,
 }
 #endif
 
-static void toolbar_child_attached(GtkWidget *widget, GtkWidget *child,
-				   gpointer data)
-{
-	gtk_widget_set_size_request(child, 1, -1);
-}
-
-static void toolbar_child_detached(GtkWidget *widget, GtkWidget *child,
-				   gpointer data)
-{
-	gtk_widget_set_size_request(child, -1, -1);
-}
-
 static void online_switch_clicked(GtkWidget *widget, gpointer data)
 {
 	MainWindow *mainwin = (MainWindow *)data;
@@ -2796,7 +2767,7 @@ static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
 {
 	switch ((ToolbarStyle)action) {
 	case TOOLBAR_NONE:
-		gtk_widget_hide(mainwin->handlebox);
+		gtk_widget_hide(mainwin->toolbar);
 	case TOOLBAR_ICON:
 		gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
 				      GTK_TOOLBAR_ICONS);
@@ -2812,8 +2783,8 @@ static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
 	}
 
 	if (action != TOOLBAR_NONE) {
-		gtk_widget_show(mainwin->handlebox);
-		gtk_widget_queue_resize(mainwin->handlebox);
+		gtk_widget_show(mainwin->toolbar);
+		gtk_widget_queue_resize(mainwin->toolbar);
 	}
 
 	mainwin->toolbar_style = (ToolbarStyle)action;
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 60d5c019..c763f99b 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -81,7 +81,6 @@ struct _MainWindow
 	GtkItemFactory *menu_factory;
 
 	/* toolbar */
-	GtkWidget *handlebox;
 	GtkWidget *toolbar;
 	GtkWidget *get_btn;
 	GtkWidget *getall_btn;
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 2e0a4fe7..486d6723 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -155,7 +155,6 @@ GtkWidget *stock_pixbuf_widget(GtkWidget *window, StockPixmap icon)
 {
 	GdkPixbuf *pixbuf;
 
-	g_return_val_if_fail(window != NULL, NULL);
 	g_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, NULL);
 
 	stock_pixbuf_gdk(window, icon, &pixbuf);