Use the proper logical id for the "New" button in Move message dialog
[modest] / src / hildon2 / modest-platform.c
index b7c3df0..07ccda7 100644 (file)
@@ -41,7 +41,6 @@
 #include <modest-maemo-utils.h>
 #include <modest-utils.h>
 #include <dbus_api/modest-dbus-callbacks.h>
-#include <modest-osso-autosave-callbacks.h>
 #include <libosso.h>
 #include <tny-maemo-conic-device.h>
 #include <tny-camel-folder.h>
@@ -139,26 +138,21 @@ on_modest_conf_update_interval_changed (ModestConf* self,
 static gboolean
 check_required_files (void)
 {
-       FILE *mcc_file = modest_utils_open_mcc_mapping_file (FALSE, NULL);
+       FILE *mcc_file = modest_utils_open_mcc_mapping_file ();
+
        if (!mcc_file) {
                g_printerr ("modest: check for mcc file (for LANG) failed\n");
                return FALSE;
-       } else 
-               fclose (mcc_file);
-       
-       mcc_file = modest_utils_open_mcc_mapping_file (TRUE, NULL);
-       if (!mcc_file) {
-               g_printerr ("modest: check for mcc file (for LC_MESSAGES) failed\n");
-               return FALSE;
-       } else 
+       } else {
                fclose (mcc_file);
-       
+       }
+
        if (access(MODEST_PROVIDER_DATA_FILE, R_OK) != 0 &&
            access(MODEST_FALLBACK_PROVIDER_DATA_FILE, R_OK) != 0) {
                g_printerr ("modest: cannot find providers data\n");
                return FALSE;
        }
-       
+
        return TRUE;
 }
 
@@ -213,15 +207,6 @@ modest_platform_init (int argc, char *argv[])
        hw_state.shutdown_ind = TRUE;
        osso_hw_set_event_cb(osso_context, NULL, NULL, NULL);
 
-       /* Register osso auto-save callbacks: */
-       result = osso_application_set_autosave_cb (osso_context, 
-               modest_on_osso_application_autosave, NULL /* user_data */);
-       if (result != OSSO_OK) {
-               g_printerr ("modest: osso_application_set_autosave_cb() failed.\n");
-               return FALSE;
-       }
-       
-
        /* Make sure that the update interval is changed whenever its gconf key 
         * is changed */
        /* CAUTION: we're not using here the
@@ -434,16 +419,17 @@ activate_uri_popup_item (GtkMenuItem *menu_item,
        /* if it's a copy thingy, the uri will look like 'copy:http://slashdot.org' */
        if (g_str_has_prefix (action_name, URI_ACTION_COPY)) {
                GtkClipboard *clipboard = gtk_clipboard_get (GDK_NONE);
-               action_name += strlen(URI_ACTION_COPY); /* jump past the prefix */
+               const gchar *uri = (const gchar *) popup_info->uri;
 
-               if (g_str_has_prefix (action_name, "mailto:")) /* ignore mailto: prefixes */
-                       action_name += strlen ("mailto:");
-               
-               gtk_clipboard_set_text (clipboard, action_name, strlen (action_name));
+               /* Special case: ignore "mailto:" prefixes */
+               if (g_str_has_prefix (uri, "mailto:"))
+                       uri = popup_info->uri + strlen ("mailto:");
+
+               gtk_clipboard_set_text (clipboard, uri, strlen (uri));
                modest_platform_information_banner (NULL, NULL, _CS("ecoc_ib_edwin_copied"));
                return; /* we're done */
        }
-       
+
        /* now, the real uri-actions... */
        for (node = popup_info->actions; node != NULL; node = g_slist_next (node)) {
                HildonURIAction *action = (HildonURIAction *) node->data;
@@ -459,61 +445,67 @@ activate_uri_popup_item (GtkMenuItem *menu_item,
        }
 }
 
-gboolean 
+gboolean
 modest_platform_show_uri_popup (const gchar *uri)
 {
-       GSList *actions_list;
+       GSList *actions_list, *node;
+       GtkWidget *menu;
+       ModestPlatformPopupInfo *popup_info;
+       GtkWidget *menu_item;
 
        if (uri == NULL)
                return FALSE;
-       
-       actions_list = hildon_uri_get_actions_by_uri (uri, -1, NULL);
-       if (actions_list) {
-
-               GtkWidget *menu = gtk_menu_new ();
-               ModestPlatformPopupInfo *popup_info = g_new0 (ModestPlatformPopupInfo, 1);
-
-               /* don't add actions for file: uri's -- they might confuse the user,
-                * and/or might have security implications
-                * we still allow to copy the url though
-                */
-               if (!g_str_has_prefix (uri, "file:")) {
-
-                       GSList *node;
-                       popup_info->actions = actions_list;
-                       popup_info->uri = g_strdup (uri);
-
-                       for (node = actions_list; node != NULL; node = g_slist_next (node)) {
-                               GtkWidget *menu_item;
-                               const gchar *action_name;
-                               const gchar *translation_domain;
-                               HildonURIAction *action = (HildonURIAction *) node->data;
-                               action_name = hildon_uri_action_get_name (action);
-                               translation_domain = hildon_uri_action_get_translation_domain (action);
-                               menu_item = gtk_menu_item_new_with_label (dgettext(translation_domain, action_name));
-                               hildon_gtk_widget_set_theme_size (menu_item, MODEST_EDITABLE_SIZE);
-                               g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer)action_name);  /* hack */
-                               g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item),
-                                                 popup_info);
-
-                               if (hildon_uri_is_default_action (action, NULL)) {
-                                       gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item);
-                               } else {
-                                       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-                               }
-                               gtk_widget_show (menu_item);
-                       }
-               }
 
+       /* Create menu */
+       menu = gtk_menu_new ();
+       popup_info = g_new0 (ModestPlatformPopupInfo, 1);
+       popup_info->uri = g_strdup (uri);
 
-               /* and what to do when the link is deleted */
-               g_signal_connect (G_OBJECT (menu), "delete-event", G_CALLBACK (delete_uri_popup), popup_info);
-               gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, gtk_get_current_event_time ());
+       /* don't add actions for file: uri's -- they might confuse the user,
+        * and/or might have security implications
+        * we still allow to copy the url though
+        */
+       if (g_str_has_prefix (uri, "file:"))
+               goto add_copy_link;
 
-       } else {
-               hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link"));
+       actions_list = hildon_uri_get_actions_by_uri (uri, -1, NULL);
+       if (!actions_list)
+               goto add_copy_link;
+
+       popup_info->actions = actions_list;
+       for (node = actions_list; node != NULL; node = g_slist_next (node)) {
+               const gchar *action_name;
+               const gchar *translation_domain;
+               HildonURIAction *action = (HildonURIAction *) node->data;
+               action_name = hildon_uri_action_get_name (action);
+               translation_domain = hildon_uri_action_get_translation_domain (action);
+               menu_item = gtk_menu_item_new_with_label (dgettext(translation_domain, action_name));
+               hildon_gtk_widget_set_theme_size (menu_item, MODEST_EDITABLE_SIZE);
+               g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer)action_name);  /* hack */
+               g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item),
+                                 popup_info);
+
+               if (hildon_uri_is_default_action (action, NULL)) {
+                       gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item);
+               } else {
+                       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+               }
+               gtk_widget_show (menu_item);
        }
 
+ add_copy_link:
+       /* Add the "Copy link" menu option */
+       menu_item = gtk_menu_item_new_with_label (_UR("uri_link_copy_link_location"));
+       hildon_gtk_widget_set_theme_size (menu_item, MODEST_EDITABLE_SIZE);
+       g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer) URI_ACTION_COPY);
+       g_signal_connect (G_OBJECT (menu_item), "activate", (GCallback) activate_uri_popup_item, popup_info);
+       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+       gtk_widget_show (menu_item);
+
+       /* and what to do when the link is deleted */
+       g_signal_connect (G_OBJECT (menu), "delete-event", G_CALLBACK (delete_uri_popup), popup_info);
+       gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, gtk_get_current_event_time ());
+
        return TRUE;
 }
 
@@ -700,7 +692,7 @@ folder_chooser_dialog_run (ModestFolderView *original,
        GtkWidget *pannable;
        const gchar *visible_id = NULL;
 
-       userdata.dialog = hildon_dialog_new ();
+       userdata.dialog = gtk_dialog_new ();
        pannable = hildon_pannable_area_new ();
        folder_view = modest_platform_create_folder_view (NULL);
 
@@ -1546,7 +1538,7 @@ modest_platform_set_update_interval (guint minutes)
         * (The old maemo email-client did this, though it isn't specified in the UI spec.)
         * ALARM_EVENT_CONNECTED will prevent the alarm from being called in case that the device is offline
          */
-       event->flags = ALARM_EVENT_CONNECTED;
+       event->flags = ALARM_EVENT_CONNECTED | ALARM_EVENT_RUN_DELAYED;
 
        alarm_cookie = alarmd_event_add (event);
 
@@ -1672,8 +1664,6 @@ modest_platform_on_new_headers_received (GList *URI_list,
                g_object_unref (account);
        }
 
-       /* Play sound */
-       modest_platform_play_email_tone ();
        if (notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL)) {
                GSList *notifications_list = NULL;
 
@@ -1927,17 +1917,14 @@ on_timeout_check_account_is_online(CheckAccountIdleData* data)
 {
        gboolean stop_trying = FALSE;
        g_return_val_if_fail (data && data->account, FALSE);
-       
-       printf ("DEBUG: %s: tny_account_get_connection_status()==%d\n", __FUNCTION__,
-               tny_account_get_connection_status (data->account));     
-       
+
        if (data && data->account && 
                /* We want to wait until TNY_CONNECTION_STATUS_INIT has changed to something else,
                 * after which the account is likely to be usable, or never likely to be usable soon: */
                (tny_account_get_connection_status (data->account) != TNY_CONNECTION_STATUS_INIT) )
        {
                data->is_online = TRUE;
-               
+
                stop_trying = TRUE;
        } else {
                /* Give up if we have tried too many times: */
@@ -1948,15 +1935,15 @@ on_timeout_check_account_is_online(CheckAccountIdleData* data)
                        ++(data->count_tries);
                }
        }
-       
+
        if (stop_trying) {
                /* Allow the function that requested this idle callback to continue: */
                if (data->loop)
                        g_main_loop_quit (data->loop);
-                       
+
                if (data->account)
                        g_object_unref (data->account);
-               
+
                return FALSE; /* Don't call this again. */
        } else {
                return TRUE; /* Call this timeout callback again. */
@@ -3038,7 +3025,8 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
                                              GTK_WINDOW (parent_window),
                                              GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR |
                                              GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             _HL("wdgt_bd_new"), MODEST_GTK_RESPONSE_NEW_FOLDER,
+                                             _FM ("ckdg_bd_change_folder_new_folder"),
+                                             MODEST_GTK_RESPONSE_NEW_FOLDER,
                                              NULL);
 
        align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);