Fixed Hildon2 compilation

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index 9a96912..4f9eb66 100644 (file)
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -1188,6 +1188,8 @@ modest_account_mgr_account_is_multimailbox (ModestAccountMgr *mgr,
        gchar *transport_account;
        gboolean result = FALSE;
 
+       g_return_val_if_fail (account_name, FALSE);
+
        if (mmb_protocol)
                *mmb_protocol = NULL;
 

diff --git a/src/widgets/modest-folder-window.c b/src/widgets/modest-folder-window.c
index 1f62529..e99010f 100644 (file)
--- a/src/widgets/modest-folder-window.c
+++ b/src/widgets/modest-folder-window.c
@@ -338,8 +338,6 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
        ModestFolderWindowPrivate *priv = NULL;
        GdkPixbuf *window_icon;
        GtkWidget *scrollable;
-       guint accel_key;
-       GdkModifierType accel_mods;
        GtkWidget *top_alignment;
        
        self  = MODEST_FOLDER_WINDOW(g_object_new(MODEST_TYPE_FOLDER_WINDOW, NULL));
@@ -456,6 +454,9 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
 
 #ifdef MODEST_TOOLKIT_HILDON2
        GtkAccelGroup *accel_group;
+       guint accel_key;
+       GdkModifierType accel_mods;
+
        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,