Use modest_window_add_toolbar in all the code.

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 1323d6d..e38b965 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -1500,7 +1500,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
        parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
        gtk_toolbar_set_show_arrow (GTK_TOOLBAR (parent_priv->toolbar), FALSE);
        gtk_toolbar_set_icon_size (GTK_TOOLBAR (parent_priv->toolbar), HILDON_ICON_SIZE_FINGER);
-       hildon_window_add_toolbar (HILDON_WINDOW (window), GTK_TOOLBAR (parent_priv->toolbar));
+       modest_window_add_toolbar (MODEST_WINDOW (window), GTK_TOOLBAR (parent_priv->toolbar));
 
        /* Font color placeholder */
        placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/FontColor");
@@ -1669,7 +1669,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, const gchar
                                 hildon_touch_selector_get_current_text 
                                 (HILDON_TOUCH_SELECTOR (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON (priv->from_field)))));
        modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj));
-       hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar));
+       modest_window_add_toolbar (MODEST_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar));
 
        /* Init window */
        connect_signals (MODEST_MSG_EDIT_WINDOW(obj));

diff --git a/src/widgets/modest-msg-view-window.c b/src/widgets/modest-msg-view-window.c
index d6081d8..cc5ecf1 100644 (file)
--- a/src/widgets/modest-msg-view-window.c
+++ b/src/widgets/modest-msg-view-window.c
@@ -852,7 +852,7 @@ modest_msg_view_window_construct (ModestMsgViewWindow *self,
        /* ... and later the find toolbar. This way find toolbar will
           be shown over the other */
        priv->find_toolbar = hildon_find_toolbar_new (NULL);
-       hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar));
+       modest_window_add_toolbar (MODEST_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar));
        gtk_widget_set_no_show_all (priv->find_toolbar, TRUE);
        g_signal_connect (G_OBJECT (priv->find_toolbar), "close", 
                          G_CALLBACK (modest_msg_view_window_find_toolbar_close), obj);
@@ -2390,13 +2390,8 @@ modest_msg_view_window_show_toolbar (ModestWindow *self,
                priv->prev_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageBack");
                toolbar_resize (MODEST_MSG_VIEW_WINDOW (self));
 
-               /****** HILDON2:START
-                * attach toolbar to window
-                */
-               /* Add to window */
-               hildon_window_add_toolbar (HILDON_WINDOW (self), 
+               modest_window_add_toolbar (MODEST_WINDOW (self), 
                                           GTK_TOOLBAR (parent_priv->toolbar));
-               /****** HILDON2:END */
 
        }