* forgot this one for previous fix
[modest] / src / maemo / modest-platform.c
index aa0ef8d..eddbaf2 100644 (file)
@@ -261,6 +261,26 @@ modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type,
 }
 
 
+static gboolean
+checked_hildon_uri_open (const gchar *uri, HildonURIAction *action)
+{
+       GError *err = NULL;
+       gboolean result;
+
+       g_return_val_if_fail (uri, FALSE);
+       
+       result = hildon_uri_open (uri, action, &err);
+       if (!result) {
+               g_printerr ("modest: hildon_uri_open ('%s', %p) failed: %s",
+                           uri, action,  err && err->message ? err->message : "unknown error");
+               if (err)
+                       g_error_free (err);
+       }
+       return result;
+}
+
+
+
 gboolean 
 modest_platform_activate_uri (const gchar *uri)
 {
@@ -278,23 +298,21 @@ modest_platform_activate_uri (const gchar *uri)
                action = (HildonURIAction*) iter->data;
                if (action && strcmp (hildon_uri_action_get_service (action),
                                      "com.nokia.modest") == 0) {
-                       GError *err = NULL;
-                       result = hildon_uri_open (uri, action, &err);
-                       if (!result && err) {
-                               g_printerr ("modest: modest_platform_activate_uri : %s",
-                                           err->message ? err->message : "unknown error");
-                               g_error_free (err);
-                       }
+                       result = checked_hildon_uri_open (uri, action);
                        break;
                }
        }
        
        /* if we could not open it with email, try something else */
        if (!result)
-               result = hildon_uri_open (uri, NULL, NULL);     
-               
-       if (!result)
-               hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link"));
+               result = checked_hildon_uri_open (uri, NULL);   
+
+       if (!result) {
+               ModestWindow *parent =
+                       modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE);
+               hildon_banner_show_information (parent ? GTK_WIDGET(parent): NULL, NULL,
+                                               _("mcen_ib_unsupported_link"));
+       }
        
        return result;
 }
@@ -368,7 +386,12 @@ activate_uri_popup_item (GtkMenuItem *menu_item,
        for (node = popup_info->actions; node != NULL; node = g_slist_next (node)) {
                HildonURIAction *action = (HildonURIAction *) node->data;
                if (strcmp (action_name, hildon_uri_action_get_name (action))==0) {
-                       hildon_uri_open (popup_info->uri, action, NULL);
+                       if (!checked_hildon_uri_open (popup_info->uri, action)) {
+                               ModestWindow *parent =
+                                       modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE);
+                               hildon_banner_show_information (parent ? GTK_WIDGET(parent): NULL, NULL,
+                                                               _("mcen_ib_unsupported_link"));
+                       }
                        break;
                }
        }
@@ -573,10 +596,11 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
        
        /* Add sorting keys */
        cols = modest_header_view_get_columns (header_view);
-       if (cols == NULL) return;
-       int sort_model_ids[6];
-       int sort_ids[6];
-
+       if (cols == NULL) 
+               return;
+#define SORT_ID_NUM 6
+       int sort_model_ids[SORT_ID_NUM];
+       int sort_ids[SORT_ID_NUM];
 
        outgoing = (GPOINTER_TO_INT (g_object_get_data(G_OBJECT(cols->data), MODEST_HEADER_VIEW_COLUMN))==
                    MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT);
@@ -703,7 +727,9 @@ on_response (GtkDialog *dialog,
 
        /* Look for another folder with the same name */
        if (modest_tny_folder_has_subfolder_with_name (parent, 
-                                                      gtk_entry_get_text (GTK_ENTRY (entry)))) {
+                                                      gtk_entry_get_text (GTK_ENTRY (entry)),
+                                                      TRUE)) {
+
                /* Show an error */
                hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (dialog)), 
                                                NULL, _CS("ckdg_ib_folder_already_exists"));
@@ -821,9 +847,9 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
                        else
                                real_suggested_name = g_strdup_printf (_("mcen_ia_default_folder_name_s"),
                                                                       num_str);
-
                        exists = modest_tny_folder_has_subfolder_with_name (parent_folder,
-                                                                           real_suggested_name);
+                                                                           real_suggested_name,
+                                                                           TRUE);
 
                        if (!exists)
                                break;
@@ -1179,8 +1205,8 @@ modest_platform_set_update_interval (guint minutes)
        /* Delete any existing alarm,
         * because we will replace it: */
        if (alarm_cookie) {
-               /* TODO: What does the alarm_event_del() return value mean? */
-               alarm_event_del(alarm_cookie);
+               if (alarm_event_del(alarm_cookie) != 1)
+                       g_warning ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie);
                alarm_cookie = 0;
                modest_conf_set_int (conf, MODEST_CONF_ALARM_ID, 0, NULL);
        }
@@ -1188,7 +1214,7 @@ modest_platform_set_update_interval (guint minutes)
        /* 0 means no updates: */
        if (minutes == 0)
                return TRUE;
-               
+       
      
        /* Register alarm: */
        
@@ -1495,17 +1521,14 @@ typedef struct
 #define NUMBER_OF_TRIES 10 /* Try approx every second, ten times. */
 
 static gboolean 
-on_timeout_check_account_is_online(gpointer user_data)
+on_timeout_check_account_is_online(CheckAccountIdleData* data)
 {
-       printf ("DEBUG: %s:\n", __FUNCTION__);
-       CheckAccountIdleData *data = (CheckAccountIdleData*)user_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));     
        
-       gboolean stop_trying = FALSE;
        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: */
@@ -1514,14 +1537,11 @@ on_timeout_check_account_is_online(gpointer user_data)
                data->is_online = TRUE;
                
                stop_trying = TRUE;
-       }
-       else {
+       } else {
                /* Give up if we have tried too many times: */
-               if (data->count_tries >= NUMBER_OF_TRIES)
-               {
+               if (data->count_tries >= NUMBER_OF_TRIES) {
                        stop_trying = TRUE;
-               }
-               else {
+               } else {
                        /* Wait for another timeout: */
                        ++(data->count_tries);
                }
@@ -1588,7 +1608,7 @@ modest_platform_check_and_wait_for_account_is_online(TnyAccount *account)
        GMainContext *context = NULL; /* g_main_context_new (); */
        data->loop = g_main_loop_new (context, FALSE /* not running */);
 
-       g_timeout_add (1000, on_timeout_check_account_is_online, data);
+       g_timeout_add (1000, (GSourceFunc)(on_timeout_check_account_is_online), data);
 
        /* This main loop will run until the idle handler has stopped it: */
        g_main_loop_run (data->loop);