* restore the window-icons

pmo-trunk-r2633

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 1b23a08..8c4778b 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -800,7 +800,8 @@ modest_main_window_new (void)
        GError *error = NULL;
        ModestConf *conf = NULL;
        GtkAction *action = NULL;
-
+       GdkPixbuf *window_icon;
+       
        self  = MODEST_MAIN_WINDOW(g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL));
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
        parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
@@ -936,6 +937,12 @@ modest_main_window_new (void)
        g_signal_connect (G_OBJECT(self), "show",
                          G_CALLBACK (modest_main_window_on_show), folder_win);
                
+       /* Set window icon */
+       window_icon = modest_platform_get_icon (MODEST_APP_ICON);
+       if (window_icon) {
+               gtk_window_set_icon (GTK_WINDOW (self), window_icon);
+               g_object_unref (window_icon);
+       }
 
        restore_settings (MODEST_MAIN_WINDOW(self), FALSE);
 

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index fc1a520..e192d8a 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -974,7 +974,10 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
 
        /* Set window icon */
        window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON);
-       gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
+       if (window_icon) {
+               gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
+               g_object_unref (window_icon);
+       }
 
        /* Dim at start clipboard actions */
        action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CutMenu");

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index 5db7724..b7960a4 100644 (file)
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -518,6 +518,7 @@ modest_msg_view_window_new (TnyMsg *msg,
        ModestDimmingRulesGroup *toolbar_rules_group = NULL;
        GtkActionGroup *action_group = NULL;
        GError *error = NULL;
+       GdkPixbuf *window_icon;
 
        g_return_val_if_fail (msg, NULL);
        
@@ -594,7 +595,14 @@ modest_msg_view_window_new (TnyMsg *msg,
        init_window (MODEST_MSG_VIEW_WINDOW(obj), msg);
        restore_settings (MODEST_MSG_VIEW_WINDOW(obj));
        
-/*     g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj); */
+       /* Set window icon */
+       window_icon = modest_platform_get_icon (MODEST_APP_MSG_VIEW_ICON); 
+       if (window_icon) {
+               gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
+               g_object_unref (window_icon);
+       }
+
+       /* g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj); */
 
        g_signal_connect (G_OBJECT(priv->msg_view), "link_clicked",
                          G_CALLBACK (modest_ui_actions_on_msg_link_clicked), obj);