From bab05fb4ddefb299db7a8b9d66a87fbeaa9af344 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 22 Jun 2006 13:11:01 +0000 Subject: [PATCH] * Pack toolbar in hildon specific way. pmo-trunk-r331 --- src/hildon/modest-ui-main-view.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/hildon/modest-ui-main-view.c b/src/hildon/modest-ui-main-view.c index 0909599..a0d1ca1 100644 --- a/src/hildon/modest-ui-main-view.c +++ b/src/hildon/modest-ui-main-view.c @@ -103,7 +103,7 @@ modest_ui_show_main_window (ModestUI *modest_ui) GtkWidget *open_item; GtkWidget *view_attachments_item; GtkWidget *new_account_item; - GtkWidget *main_menu, *menu_item; + GtkWidget *main_menu, *menu_item, *main_toolbar; GtkWidget *folder_view_holder, *header_view_holder, @@ -241,7 +241,6 @@ modest_ui_show_main_window (ModestUI *modest_ui) main_menu = hildon_appview_get_menu(HILDON_APPVIEW(app_view)); menu_item = glade_xml_get_widget (priv->glade_xml, "MessageMenuItem"); - //gtk_menu_append(main_menu, menu_item); gtk_widget_reparent(menu_item, main_menu); menu_item = glade_xml_get_widget (priv->glade_xml, "EditMenuItem"); gtk_widget_reparent(menu_item, main_menu); @@ -256,6 +255,13 @@ modest_ui_show_main_window (ModestUI *modest_ui) menu_item = glade_xml_get_widget (priv->glade_xml, "CloseMenuItem"); gtk_widget_reparent(menu_item, main_menu); + main_toolbar = glade_xml_get_widget (priv->glade_xml, "toolbar1"); + g_object_ref (main_toolbar); + gtk_container_remove (glade_xml_get_widget (priv->glade_xml, + "main_top_contianer"), main_toolbar); + hildon_window_add_toolbar(win, GTK_TOOLBAR(main_toolbar)); + + gtk_widget_show_all (win); menu_item = glade_xml_get_widget (priv->glade_xml, "menubar1"); -- 1.7.9.5