2007-04-27 Murray Cumming <murrayc@murrayc.com>

* src/maemo/modest-main-window.c:
        (modest_main_window_show_toolbar): Check that a toolbar item is not NULL before
        showing/hiding it. Added TODO because it probably should not be NULL.
        * src/modest-init.c: (modest_init_init_ui): Use a g_message() instead of a g_warning()
        because unnecessary g_warnings() make degugging difficult.

pmo-trunk-r1703

diff --git a/ChangeLog2 b/ChangeLog2
index 017164f..eda8440 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,13 @@
 2007-04-27  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/maemo/modest-main-window.c:
+       (modest_main_window_show_toolbar): Check that a toolbar item is not NULL before 
+       showing/hiding it. Added TODO because it probably should not be NULL.
+       * src/modest-init.c: (modest_init_init_ui): Use a g_message() instead of a g_warning() 
+       because unnecessary g_warnings() make degugging difficult.
+
+2007-04-27  Murray Cumming  <murrayc@murrayc.com>
+
        * src/maemo/modest-msg-edit-window.c:
        (modest_msg_edit_window_select_color),
        (modest_msg_edit_window_select_background_color): 2 const corrections and 

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index db8a848..72dade6 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -712,12 +712,14 @@ modest_main_window_show_toolbar (ModestWindow *self,
                                   NULL, self);
        }
 
-
-       if (show_toolbar) {
-               gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
-               set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
-       } else
-               gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
+       /* TODO: Why is this sometimes NULL? murrayc */
+       if (parent_priv->toolbar) {
+               if (show_toolbar) {
+                       gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
+                       set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
+               } else
+                       gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
+       }
 }
 
 /*

diff --git a/src/modest-init.c b/src/modest-init.c
index e6d695c..b5949c0 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -191,7 +191,7 @@ modest_init_init_ui (gint argc, gchar** argv)
 
        /* Set application name */
        g_set_application_name (modest_platform_get_app_name());
-       g_warning (modest_platform_get_app_name());
+       g_message (modest_platform_get_app_name());
 
        init_stock_icons ();
        return TRUE;