Fixes several G_CRITICALS

diff --git a/src/gtk/modest-shell.c b/src/gtk/modest-shell.c
index fc3f7e2..763b76a 100644 (file)
--- a/src/gtk/modest-shell.c
+++ b/src/gtk/modest-shell.c
@@ -334,6 +334,7 @@ update_title (ModestShell *self)
        GtkWidget *child;
        GString *title_buffer;
        GString *subtitle_buffer;
+       const gchar *tab_label_text;
 
        priv = MODEST_SHELL_GET_PRIVATE (self);
 
@@ -347,7 +348,9 @@ update_title (ModestShell *self)
        child = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), n_pages - 1);
        title_buffer = g_string_new ("");
        title_buffer = g_string_append (title_buffer, "<b>");
-       title_buffer = g_string_append (title_buffer, gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (priv->notebook), child));
+       tab_label_text = gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (priv->notebook), child);
+       if (tab_label_text)
+               title_buffer = g_string_append (title_buffer, tab_label_text);
        title_buffer = g_string_append (title_buffer, "</b>");
        gtk_label_set_markup (GTK_LABEL (priv->title_label), 
                              title_buffer->str);

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 26543a6..31373f5 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -875,6 +875,7 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr,
        TnyLockable *lockable;
        GnomeVFSVolumeMonitor* monitor = NULL;
        gboolean auto_update;
+       const gchar *mmc_path = NULL;
 
        g_return_val_if_fail (account_mgr, NULL);
        g_return_val_if_fail (device, NULL);
@@ -950,7 +951,8 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr,
                add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE(obj));
 
        /* This is a singleton, so it does not need to be unrefed. */
-       if (volume_path_is_mounted (g_getenv (MODEST_MMC1_VOLUMEPATH_ENV))) {
+       mmc_path = g_getenv (MODEST_MMC1_VOLUMEPATH_ENV);
+       if (mmc_path && volume_path_is_mounted (mmc_path)) {
                /* It is mounted: */
                add_mmc_account (MODEST_TNY_ACCOUNT_STORE (obj), FALSE /* don't emit the insert signal. */);
        }

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 462ad44..03d1ee6 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -3385,7 +3385,9 @@ modest_folder_view_get_activity (ModestFolderView *self)
 
        g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
-       g_return_val_if_fail (get_inner_models (self, NULL, NULL, &inner_model), FALSE);
+
+       if (!get_inner_models (self, NULL, NULL, &inner_model))
+               return FALSE;
 
        if (TNY_IS_GTK_FOLDER_LIST_STORE (inner_model)) {
                return tny_gtk_folder_list_store_get_activity (TNY_GTK_FOLDER_LIST_STORE (inner_model));

diff --git a/src/widgets/modest-folder-window.c b/src/widgets/modest-folder-window.c
index a81e38e..e6c1ae7 100644 (file)
--- a/src/widgets/modest-folder-window.c
+++ b/src/widgets/modest-folder-window.c
@@ -124,7 +124,9 @@ struct _ModestFolderWindowPrivate {
 
        GtkWidget *folder_view;
        GtkWidget *top_vbox;
+#ifdef MODEST_TOOLKIT_HILDON2
        GtkWidget *new_message_button;
+#endif
 
        /* signals */
        GSList *sighandlers;
@@ -308,10 +310,12 @@ connect_signals (ModestFolderWindow *self)
                                                       "activity-changed",
                                                       G_CALLBACK (on_activity_changed), self);
 
+#ifdef MODEST_TOOLKIT_HILDON2
        priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
                                                       G_OBJECT (priv->new_message_button),
                                                       "clicked",
                                                       G_CALLBACK (modest_ui_actions_on_new_msg), self);
+#endif
 
        priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
                                                       G_OBJECT (modest_runtime_get_account_store()),
@@ -332,7 +336,6 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
        GtkWidget *scrollable;
        guint accel_key;
        GdkModifierType accel_mods;
-       GtkAccelGroup *accel_group;
        GtkWidget *top_alignment;
        
        self  = MODEST_FOLDER_WINDOW(g_object_new(MODEST_TYPE_FOLDER_WINDOW, NULL));
@@ -447,11 +450,14 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
                          G_OBJECT (self));
        update_progress_hint (self);
 
+#ifdef MODEST_TOOLKIT_HILDON2
+       GtkAccelGroup *accel_group;
        accel_group = gtk_accel_group_new ();
        gtk_accelerator_parse ("<Control>n", &accel_key, &accel_mods);
        gtk_widget_add_accelerator (priv->new_message_button, "clicked", accel_group,
                                    accel_key, accel_mods, 0);
        gtk_window_add_accel_group (GTK_WINDOW (self), accel_group);
+#endif
 
        return MODEST_WINDOW(self);
 }
@@ -564,7 +570,7 @@ setup_menu (ModestFolderWindow *self)
 {
        g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
 
-       /* folders actions */
+       /* folders actions*/
        modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_new_folder"), NULL,
                                   MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_new_folder),
                                   NULL);

diff --git a/src/widgets/modest-header-window.c b/src/widgets/modest-header-window.c
index 2c7c186..1361522 100644 (file)
--- a/src/widgets/modest-header-window.c
+++ b/src/widgets/modest-header-window.c
@@ -393,13 +393,14 @@ connect_signals (ModestHeaderWindow *self)
                                                       G_OBJECT (modest_runtime_get_window_mgr ()),
                                                       "progress-list-changed",
                                                       G_CALLBACK (on_progress_list_changed), self);
+
+#ifdef MODEST_TOOLKIT_HILDON2
        priv->sighandlers =
                modest_signal_mgr_connect (priv->sighandlers,
                                           G_OBJECT (priv->new_message_button),
                                           "clicked",
                                           G_CALLBACK (modest_ui_actions_on_new_msg), self);
 
-#ifdef MODEST_TOOLKIT_HILDON2
        /* Delete using horizontal gesture */
        /* DISABLED because it's unreliabile */
        if (HILDON_IS_PANNABLE_AREA (priv->contents_view)) {

diff --git a/src/widgets/modest-msg-edit-window.c b/src/widgets/modest-msg-edit-window.c
index 69a67a2..035d5ba 100644 (file)
--- a/src/widgets/modest-msg-edit-window.c
+++ b/src/widgets/modest-msg-edit-window.c
@@ -892,10 +892,6 @@ init_window (ModestMsgEditWindow *obj)
                g_clear_error (&error);
        }
 
-       /* Add accelerators */
-       gtk_window_add_accel_group (GTK_WINDOW (obj), 
-                                   gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
-
        parent_priv->menubar = NULL;
 
        title_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);

diff --git a/src/widgets/modest-msg-view-window.c b/src/widgets/modest-msg-view-window.c
index 7be874e..3882232 100644 (file)
--- a/src/widgets/modest-msg-view-window.c
+++ b/src/widgets/modest-msg-view-window.c
@@ -472,11 +472,6 @@ modest_msg_view_window_init (ModestMsgViewWindow *obj)
                g_error_free (error);
                error = NULL;
        }
-       /* ****** */
-
-       /* Add accelerators */
-       gtk_window_add_accel_group (GTK_WINDOW (obj), 
-                                   gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
        
        priv->is_search_result = FALSE;
        priv->is_outbox = FALSE;