* Use osso_abook_aggregator_get_default to open the addressbook

[modest] / src / hildon2 / modest-folder-window.c

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index 4fca617..181ae00 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -299,7 +299,7 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
                          G_CALLBACK (edit_mode_changed), (gpointer) self);
 
        action_area_box = hildon_tree_view_get_action_area_box (GTK_TREE_VIEW (priv->folder_view));
-       priv->new_message_button = hildon_button_new (0, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+       priv->new_message_button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
 
        hildon_button_set_title (HILDON_BUTTON (priv->new_message_button), _("mcen_ti_new_message"));
        new_message_pixbuf = modest_platform_get_icon ("general_add", MODEST_ICON_SIZE_BIG);
@@ -506,10 +506,7 @@ on_folder_activated (ModestFolderView *folder_view,
 
        priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
 
-       if (!folder)
-               return;
-
-       if (!TNY_IS_FOLDER (folder))
+       if (!folder || !TNY_IS_FOLDER (folder))
                return;
 
        /* We cannot open noselect folders (fake ones) */
@@ -811,15 +808,18 @@ on_visible_account_changed (ModestFolderView *folder_view,
 {
        TnyAccount *account;
 
+       if (!account_id)
+               return;
+
        account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(),
                                                               MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
                                                               account_id);
 
        /* Update window title */
-       update_window_title (MODEST_FOLDER_WINDOW (user_data), account);
-
-       if (account)
+       if (account) {
+               update_window_title (MODEST_FOLDER_WINDOW (user_data), account);
                g_object_unref (account);
+       }
 }
 
 static void