From c191f3e40a3c7fe9abf4e4a74546ec78ea97b6db Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Sun, 1 Jul 2007 08:32:40 +0000 Subject: [PATCH] * don't set the window icon explicitly; maemo seems to ignore it, and as we could not find the icon anyway, this saves a runtime warning pmo-trunk-r2514 --- src/maemo/modest-main-window.c | 8 -------- src/maemo/modest-msg-edit-window.c | 2 -- 2 files changed, 10 deletions(-) diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index d6bbd45..36237be 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -773,7 +773,6 @@ modest_main_window_new (void) ModestDimmingRulesGroup *toolbar_rules_group = NULL; GtkActionGroup *action_group = NULL; GError *error = NULL; - GdkPixbuf *window_icon = NULL; ModestConf *conf = NULL; GtkAction *action = NULL; @@ -897,13 +896,6 @@ modest_main_window_new (void) gtk_box_pack_start (GTK_BOX(priv->main_vbox), priv->main_paned, TRUE, TRUE,0); gtk_container_add (GTK_CONTAINER(self), priv->main_vbox); - - /* 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 (G_OBJECT(window_icon)); - } HildonProgram *app = hildon_program_get_instance (); hildon_program_add_window (app, HILDON_WINDOW (self)); diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index 32a4e17..9599e6c 100644 --- a/src/maemo/modest-msg-edit-window.c +++ b/src/maemo/modest-msg-edit-window.c @@ -941,8 +941,6 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name) restore_settings (MODEST_MSG_EDIT_WINDOW(obj)); - gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL); - modest_window_set_active_account (MODEST_WINDOW(obj), account_name); modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj)); -- 1.7.9.5