From a40d7f37a69592c6176ec928cc1e7f957f10058f Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Sun, 4 Mar 2007 19:22:22 +0000 Subject: [PATCH] * small updates, show toolbar pmo-trunk-r879 --- src/maemo/modest-icon-names.h | 4 ++-- src/maemo/modest-main-window.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/maemo/modest-icon-names.h b/src/maemo/modest-icon-names.h index 2efcd56..80e01f3 100644 --- a/src/maemo/modest-icon-names.h +++ b/src/maemo/modest-icon-names.h @@ -54,8 +54,8 @@ #define MODEST_FOLDER_ICON_INBOX PIXMAP_PREFIX "qgn_list_messagin_inbox.png" #define MODEST_FOLDER_ICON_OUTBOX PIXMAP_PREFIX "qgn_list_messagin_outbox.png" #define MODEST_FOLDER_ICON_SENT PIXMAP_PREFIX "qgn_list_messagin_sent.png" -#define MODEST_FOLDER_ICON_TRASH PIXMAP_PREFIX "qgn_list_messagin_mail_deleted.png" -#define MODEST_FOLDER_ICON_JUNK PIXMAP_PREFIX "qgn_list_messagin_mail_deleted.png" +#define MODEST_FOLDER_ICON_TRASH PIXMAP_PREFIX "qgn_toolb_messagin_delete.png" +#define MODEST_FOLDER_ICON_JUNK PIXMAP_PREFIX "qgn_toolb_messagin_delete.png" #define MODEST_FOLDER_ICON_DRAFTS PIXMAP_PREFIX "qgn_list_messagin_drafts.png" #define MODEST_FOLDER_ICON_NORMAL PIXMAP_PREFIX "qgn_list_gene_fldr_cls.png" diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index 65fa35f..0be1368 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -293,7 +293,7 @@ get_toolbar (ModestMainWindow *self) priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); /* Toolbar */ - toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar"); + toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar"); progress_box = gtk_hbox_new (FALSE, HILDON_MARGIN_DEFAULT); progress_alignment = gtk_alignment_new (0.5, 0.5, 1, 0); @@ -452,14 +452,14 @@ modest_main_window_new (void) gtk_container_add (GTK_CONTAINER(self), main_vbox); restore_sizes (MODEST_MAIN_WINDOW(self)); - + gtk_window_set_title (GTK_WINDOW(self), _("Modest")); gtk_window_set_icon_from_file (GTK_WINDOW(self), MODEST_APP_ICON, NULL); gtk_widget_show_all (main_vbox); /* should we hide the toolbar? */ - if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_TOOLBAR, NULL)) - gtk_widget_hide (parent_priv->toolbar); + //if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_TOOLBAR, NULL)) + // gtk_widget_hide (parent_priv->toolbar); /* Connect signals */ connect_signals (self); -- 1.7.9.5