* Use osso_abook_aggregator_get_default to open the addressbook

[modest] / src / hildon2 / modest-platform.c

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 61a9b2c..e47bf1f 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -109,6 +109,8 @@
 #define FOLDER_PICKER_CURRENT_FOLDER "current-folder"
 #define MODEST_ALARMD_APPID PACKAGE_NAME
 
+static ca_context *ca_con = NULL;
+
 
 static void modest_platform_play_email_tone (void);
 
@@ -163,23 +165,16 @@ gboolean
 modest_platform_init (int argc, char *argv[])
 {
        osso_context_t *osso_context;
-       
        osso_hw_state_t hw_state = { 0 };
-       DBusConnection *con;    
+       DBusConnection *con;
        GSList *acc_names;
-       
+
        if (!check_required_files ()) {
                g_printerr ("modest: missing required files\n");
                return FALSE;
        }
-       
-       osso_context =  osso_initialize(PACKAGE,PACKAGE_VERSION,
-                                       FALSE, NULL);   
-       if (!osso_context) {
-               g_printerr ("modest: failed to acquire osso context\n");
-               return FALSE;
-       }
-       modest_maemo_utils_set_osso_context (osso_context);
+
+       osso_context = modest_maemo_utils_get_osso_context();
 
        if ((con = osso_get_dbus_connection (osso_context)) == NULL) {
                g_printerr ("modest: could not get dbus connection\n");
@@ -2599,7 +2594,6 @@ modest_platform_play_email_tone (void)
        gchar *mail_tone;
        gint mail_volume_int;
        int ret;
-       ca_context *ca_con = NULL;
        ca_proplist *pl = NULL;
 
 #ifdef MODEST_USE_PROFILE
@@ -2627,14 +2621,15 @@ modest_platform_play_email_tone (void)
 
        if (mail_volume_int > 0) {
 
-               if ((ret = ca_context_create(&ca_con)) != CA_SUCCESS) {
-                       g_warning("ca_context_create: %s\n", ca_strerror(ret));
-                       return;
+               if (ca_con == NULL) {
+                       if ((ret = ca_context_create (&ca_con)) != CA_SUCCESS) {
+                               g_warning("ca_context_create: %s\n", ca_strerror(ret));
+                               return;
+                       }
                }
 
                if ((ret = ca_context_open(ca_con)) != CA_SUCCESS) {
                        g_warning("ca_context_open: %s\n", ca_strerror(ret));
-                       ca_context_destroy(ca_con);
                        return;
                }
 
@@ -2646,7 +2641,6 @@ modest_platform_play_email_tone (void)
                g_debug("ca_context_play_full (vol %f): %s\n", (gfloat) mail_volume_int, ca_strerror(ret));
 
                ca_proplist_destroy(pl);
-               ca_context_destroy(ca_con);
        }
 
        g_free (mail_tone);
@@ -2955,7 +2949,14 @@ on_move_to_dialog_action_clicked (GtkButton *selection,
                selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
                if (selected) {
-                       gtk_dialog_response  (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+                       /* It's not possible to select root folders as
+                          targets unless they're the local account or
+                          the memory card account */
+                       if ((TNY_IS_FOLDER (selected) && !TNY_IS_MERGE_FOLDER (selected)) ||
+                           (TNY_IS_ACCOUNT (selected) &&
+                            (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (selected)) ||
+                             modest_tny_account_is_memory_card_account (TNY_ACCOUNT (selected)))))
+                               gtk_dialog_response  (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
                        g_object_unref (selected);
                }
        }