X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=8d6987b16567671eb53bc820f6b988946bd76c7c;hp=91cd6eb283da7349aebc535a6bc93b00efd39acf;hb=0f092ed43eb331d03c0db9ca1e76ab12cba678b5;hpb=e5fdccbc38e45f1d91c4a0e23abea60b81fce937

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 91cd6eb..8d6987b 100644
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -100,7 +100,6 @@ static void  modest_msg_edit_window_set_zoom (ModestWindow *window, gdouble zoom
 static gdouble modest_msg_edit_window_get_zoom (ModestWindow *window);
 static gboolean modest_msg_edit_window_zoom_minus (ModestWindow *window);
 static gboolean modest_msg_edit_window_zoom_plus (ModestWindow *window);
-static void modest_msg_edit_window_create_toolbar (ModestWindow *window);
 static void modest_msg_edit_window_show_toolbar   (ModestWindow *window,
 						   gboolean show_toolbar);
 
@@ -191,7 +190,6 @@ modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass)
 	modest_window_class->get_zoom_func = modest_msg_edit_window_get_zoom;
 	modest_window_class->zoom_plus_func = modest_msg_edit_window_zoom_plus;
 	modest_window_class->zoom_minus_func = modest_msg_edit_window_zoom_minus;
-	modest_window_class->create_toolbar_func = modest_msg_edit_window_create_toolbar;
 	modest_window_class->show_toolbar_func = modest_msg_edit_window_show_toolbar;
 
 	g_type_class_add_private (gobject_class, sizeof(ModestMsgEditWindowPrivate));
@@ -1409,15 +1407,6 @@ modest_msg_edit_window_show_bcc (ModestMsgEditWindow *window,
 		gtk_widget_hide (priv->bcc_caption);
 }
 
-
-static void 
-modest_msg_edit_window_create_toolbar (ModestWindow *self)
-{
-	/* FIXME: we can not just use the code of
-	   modest_msg_edit_window_setup_toolbar because it has a
-	   mixture of both initialization and creation code. */
-}
-
 static void
 modest_msg_edit_window_show_toolbar (ModestWindow *self,
 				     gboolean show_toolbar)
@@ -1426,14 +1415,12 @@ modest_msg_edit_window_show_toolbar (ModestWindow *self,
 	
 	parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
 
-	if (!parent_priv->toolbar)
-		return;
+	/* FIXME: we can not just use the code of
+	   modest_msg_edit_window_setup_toolbar because it has a
+	   mixture of both initialization and creation code. */
 
-	if (show_toolbar) {
-		hildon_window_add_toolbar (HILDON_WINDOW (self), 
-					   GTK_TOOLBAR (parent_priv->toolbar));
-		gtk_widget_show_all (GTK_WIDGET (self));
-	} else
-		hildon_window_remove_toolbar (HILDON_WINDOW (self), 
-					      GTK_TOOLBAR (parent_priv->toolbar));
+	if (show_toolbar)
+		gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
+	else
+		gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
 }