X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=10892754c8d2ad177e9351fe775ee2e92266bf9a;hp=4146bf6eff3d9cb275fc830df65526c9a880a471;hb=aa9d45d56b19fdee314fc0610d6a510100650f87;hpb=de7faa156f48922a1acf26e3221eb48e1b208179 diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index 4146bf6..1089275 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -43,10 +43,14 @@ #include #include /* For alarm_event_add(), etc. */ #include +#include #include +#include +#include #include #include #include +#include #include @@ -55,7 +59,8 @@ static osso_context_t *osso_context = NULL; -static void folder_name_insensitive_press (GtkWidget *widget, ModestWindow *window); +static void folder_name_insensitive_press (GtkWidget *widget, + ModestWindow *window); static void on_modest_conf_update_interval_changed (ModestConf* self, const gchar *key, @@ -199,14 +204,11 @@ guess_mime_type_from_name (const gchar* name) gchar* modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type, - gchar **effective_mime_type) + gchar **effective_mime_type) { GString *mime_str = NULL; gchar *icon_name = NULL; gchar **icons, **cursor; - - - g_return_val_if_fail (name || mime_type, NULL); if (!mime_type || !g_ascii_strcasecmp (mime_type, "application/octet-stream")) mime_str = g_string_new (guess_mime_type_from_name(name)); @@ -348,20 +350,14 @@ modest_platform_activate_file (const gchar *path, const gchar *mime_type) con = osso_get_dbus_connection (osso_context); #ifdef MODEST_HAVE_OSSO_MIME result = osso_mime_open_file_with_mime_type (con, uri_path, mime_str->str); - g_string_free (mime_str, TRUE); - - if (result != 1) - hildon_banner_show_information (NULL, NULL, _("mcen_ni_noregistered_viewer")); - return result != 1; #else result = hildon_mime_open_file_with_mime_type (con, uri_path, mime_str->str); +#endif /*MODEST_HAVE_OSSO_MIME*/ g_string_free (mime_str, TRUE); if (result != 1) - hildon_banner_show_information (NULL, NULL, _("mcen_ni_noregistered_viewer")); + modest_platform_run_information_dialog (NULL, _("mcen_ni_noregistered_viewer")); return result != 1; -#endif /*MODEST_HAVE_OSSO_MIME*/ - } typedef struct { @@ -563,12 +559,12 @@ entry_insert_text (GtkEditable *editable, gint chars_length; chars = gtk_editable_get_chars (editable, 0, -1); - chars_length = strlen (chars); + chars_length = g_utf8_strlen (chars, -1); /* Show WID-INF036 */ - if (chars_length == 20) { + if (chars_length >= 20) { hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (data)), NULL, - dgettext("hildon-common-strings", "ckdg_ib_maximum_characters_reached")); + _CS("ckdg_ib_maximum_characters_reached")); } else { if (chars_length == 0) { /* A blank space is not valid as first character */ @@ -614,11 +610,9 @@ entry_changed (GtkEditable *editable, gtk_widget_set_sensitive (ok_button, FALSE); g_list_free (buttons); - } else if (strlen (chars) == 21) { + } else if (g_utf8_strlen (chars,-1) >= 21) hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (user_data)), NULL, - dgettext("hildon-common-strings", "ckdg_ib_maximum_characters_reached")); - } - + _CS("ckdg_ib_maximum_characters_reached")); /* Free */ g_free (chars); } @@ -747,6 +741,9 @@ launch_sort_headers_dialog (GtkWindow *parent_window, modest_widget_memory_save (modest_runtime_get_conf (), G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY); + while (gtk_events_pending ()) + gtk_main_iteration (); + /* free */ g_list_free(cols); } @@ -776,7 +773,9 @@ modest_platform_run_folder_name_dialog (GtkWindow *parent_window, /* Add accept button (with unsensitive handler) */ buttons = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area)); accept_btn = GTK_WIDGET (buttons->next->data); - g_signal_connect (G_OBJECT (accept_btn), "insensitive-press", G_CALLBACK (folder_name_insensitive_press), parent_window); + g_signal_connect (G_OBJECT (accept_btn), "insensitive-press", + G_CALLBACK (folder_name_insensitive_press), + parent_window); /* Create label and entry */ label = gtk_label_new (label_text); @@ -818,13 +817,16 @@ modest_platform_run_folder_name_dialog (GtkWindow *parent_window, gtk_widget_destroy (dialog); + while (gtk_events_pending ()) + gtk_main_iteration (); + return result; } static void folder_name_insensitive_press (GtkWidget *widget, ModestWindow *window) { - hildon_banner_show_information (NULL, NULL, _("(empty)")); + hildon_banner_show_information (NULL, NULL, _CS("ckdg_ib_enter_name")); } gint @@ -833,11 +835,62 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, gchar *suggested_name, gchar **folder_name) { - return modest_platform_run_folder_name_dialog (parent_window, - _("mcen_ti_new_folder"), - _("mcen_fi_new_folder_name"), - suggested_name, - folder_name); + gchar *real_suggested_name = NULL; + gint result; + + if(suggested_name == NULL) + { + const gchar *default_name = _("mcen_ia_default_folder_name"); + unsigned int i; + gchar num_str[3]; + + for(i = 0; i < 100; ++ i) + { + TnyList *list = tny_simple_list_new (); + TnyFolderStoreQuery *query = tny_folder_store_query_new (); + guint length; + + sprintf(num_str, "%.2u", i); + + if (i == 0) + real_suggested_name = g_strdup (default_name); + else + real_suggested_name = g_strdup_printf (_("mcen_ia_default_folder_name_s"), + num_str); + + tny_folder_store_query_add_item (query, real_suggested_name, + TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_NAME); + + tny_folder_store_get_folders (parent_folder, list, query, NULL); + + length = tny_list_get_length (list); + g_object_unref (query); + g_object_unref (list); + + if (length == 0) + break; + + g_free (real_suggested_name); + } + + /* Didn't find a free number */ + if (i == 100) + real_suggested_name = g_strdup (default_name); + } + else + { + real_suggested_name = suggested_name; + } + + result = modest_platform_run_folder_name_dialog (parent_window, + _("mcen_ti_new_folder"), + _("mcen_fi_new_folder_name"), + real_suggested_name, + folder_name); + if (suggested_name == NULL) + g_free(real_suggested_name); + + return result; } gint @@ -867,6 +920,32 @@ modest_platform_run_confirmation_dialog (GtkWindow *parent_window, gtk_widget_destroy (GTK_WIDGET (dialog)); + while (gtk_events_pending ()) + gtk_main_iteration (); + + return response; +} + +gint +modest_platform_run_yes_no_dialog (GtkWindow *parent_window, + const gchar *message) +{ + GtkWidget *dialog; + gint response; + + dialog = hildon_note_new_confirmation_add_buttons (parent_window, message, + _("mcen_bd_yes"), GTK_RESPONSE_YES, + _("mcen_bd_no"), GTK_RESPONSE_NO, + NULL); + gtk_window_set_modal (GTK_WINDOW(dialog), TRUE); + + response = gtk_dialog_run (GTK_DIALOG (dialog)); + + gtk_widget_destroy (GTK_WIDGET (dialog)); + + while (gtk_events_pending ()) + gtk_main_iteration (); + return response; } @@ -878,20 +957,190 @@ modest_platform_run_information_dialog (GtkWindow *parent_window, dialog = hildon_note_new_information (parent_window, message); - gtk_dialog_run (GTK_DIALOG (dialog)); + g_signal_connect_swapped (dialog, + "response", + G_CALLBACK (gtk_widget_destroy), + dialog); - gtk_widget_destroy (GTK_WIDGET (dialog)); + gtk_widget_show_all (dialog); } -gboolean modest_platform_connect_and_wait (GtkWindow *parent_window) + + +typedef struct { + GMainLoop* loop; +} UtilIdleData; + +static gboolean +on_idle_connect_and_wait(gpointer user_data) +{ + printf ("DEBUG: %s:\n", __FUNCTION__); TnyDevice *device = modest_runtime_get_device(); + if (!tny_device_is_online (device)) { + gdk_threads_enter(); + tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), NULL); + gdk_threads_leave(); + } + /* Allow the function that requested this idle callback to continue: */ + UtilIdleData *data = (UtilIdleData*)user_data; + if (data->loop) + g_main_loop_quit (data->loop); + + return FALSE; /* Don't call this again. */ +} + +static gboolean connect_request_in_progress = FALSE; + +/* This callback is used when connect_and_wait() is already queued as an idle callback. + * This can happen because the gtk_dialog_run() for the connection dialog + * (at least in the fake scratchbox version) allows idle handlers to keep running. + */ +static gboolean +on_idle_wait_for_previous_connect_to_finish(gpointer user_data) +{ + gboolean result = FALSE; + TnyDevice *device = modest_runtime_get_device(); if (tny_device_is_online (device)) + result = FALSE; /* Stop trying. */ + else { + /* Keep trying until connect_request_in_progress is FALSE. */ + if (connect_request_in_progress) + result = TRUE; /* Keep trying */ + else { + printf ("DEBUG: %s: other idle has finished.\n", __FUNCTION__); + + result = FALSE; /* Stop trying, now that a result should be available. */ + } + } + + if (result == FALSE) { + /* Allow the function that requested this idle callback to continue: */ + UtilIdleData *data = (UtilIdleData*)user_data; + if (data->loop) + g_main_loop_quit (data->loop); + } + + return result; +} + +static void +set_account_to_online (TnyAccount *account) +{ + /* TODO: This is necessary to prevent a cancel of the password dialog + * from making a restart necessary to be asked the password again, + * but it causes a hang: + */ + #if 0 + if (account && TNY_IS_CAMEL_STORE_ACCOUNT (account)) { + /* Make sure that store accounts are online too, + * because tinymail sets accounts to offline if + * a password dialog is ever cancelled. + * We don't do this for transport accounts because + * a) They fundamentally need network access, so they can't really be offline. + * b) That might cause a transport connection to happen too early. + */ + GError *error = NULL; + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), TRUE, &error); + if (error) { + g_warning ("%s: tny_camel_account_set_online() returned a GError:\n %s\n", + __FUNCTION__, error->message); + g_error_free (error); + } + } + #endif +} + +gboolean modest_platform_connect_and_wait (GtkWindow *parent_window, TnyAccount *account) +{ + if (connect_request_in_progress) + return FALSE; + + printf ("DEBUG: %s:\n", __FUNCTION__); + TnyDevice *device = modest_runtime_get_device(); + + if (tny_device_is_online (device)) { + printf ("DEBUG: %s: Already online.\n", __FUNCTION__); + set_account_to_online (account); return TRUE; + } else + { + printf ("DEBUG: %s: tny_device_is_online() returned FALSE\n", __FUNCTION__); + } /* This blocks on the result: */ - return tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (device), NULL); + UtilIdleData *data = g_slice_new0 (UtilIdleData); + + GMainContext *context = NULL; /* g_main_context_new (); */ + data->loop = g_main_loop_new (context, FALSE /* not running */); + + /* Cause the function to be run in an idle-handler, which is always + * in the main thread: + */ + if (!connect_request_in_progress) { + printf ("DEBUG: %s: First request\n", __FUNCTION__); + connect_request_in_progress = TRUE; + g_idle_add (&on_idle_connect_and_wait, data); + } + else { + printf ("DEBUG: %s: nth request\n", __FUNCTION__); + g_idle_add_full (G_PRIORITY_LOW, &on_idle_wait_for_previous_connect_to_finish, data, NULL); + } + + /* This main loop will run until the idle handler has stopped it: */ + printf ("DEBUG: %s: before g_main_loop_run()\n", __FUNCTION__); + GDK_THREADS_LEAVE(); + g_main_loop_run (data->loop); + GDK_THREADS_ENTER(); + printf ("DEBUG: %s: after g_main_loop_run()\n", __FUNCTION__); + connect_request_in_progress = FALSE; + printf ("DEBUG: %s: Finished\n", __FUNCTION__); + g_main_loop_unref (data->loop); + /* g_main_context_unref (context); */ + + g_slice_free (UtilIdleData, data); + + gboolean result = tny_device_is_online (device); + + if (result) + set_account_to_online (account); + + return result; +} + +gboolean modest_platform_connect_and_wait_if_network_account (GtkWindow *parent_window, TnyAccount *account) +{ + if (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE) { + if (!TNY_IS_CAMEL_POP_STORE_ACCOUNT (account) && + !TNY_IS_CAMEL_IMAP_STORE_ACCOUNT (account)) { + /* This must be a maildir account, which does not require a connection: */ + return TRUE; + } + } + + return modest_platform_connect_and_wait (parent_window, account); +} + +gboolean modest_platform_connect_and_wait_if_network_folderstore (GtkWindow *parent_window, TnyFolderStore *folder_store) +{ + if (!folder_store) + return TRUE; /* Maybe it is something local. */ + + gboolean result = TRUE; + if (TNY_IS_FOLDER (folder_store)) { + /* Get the folder's parent account: */ + TnyAccount *account = tny_folder_get_account(TNY_FOLDER (folder_store)); + if (account != NULL) { + result = modest_platform_connect_and_wait_if_network_account (NULL, account); + g_object_unref (account); + } + } else if (TNY_IS_ACCOUNT (folder_store)) { + /* Use the folder store as an account: */ + result = modest_platform_connect_and_wait_if_network_account (NULL, TNY_ACCOUNT (folder_store)); + } + + return result; } void @@ -941,17 +1190,13 @@ gboolean modest_platform_set_update_interval (guint minutes) /* Register alarm: */ - /* Get current time: */ - time_t time_now; - time (&time_now); - struct tm *st_time = localtime (&time_now); - - /* Add minutes to tm_min field: */ - st_time->tm_min += minutes; - - /* Set the time in alarm_event_t structure: */ + /* Set the interval in alarm_event_t structure: */ alarm_event_t *event = g_new0(alarm_event_t, 1); - event->alarm_time = mktime (st_time); + event->alarm_time = minutes * 60; /* seconds */ + + /* Set recurrence every few minutes: */ + event->recurrence = minutes; + event->recurrence_count = -1; /* Means infinite */ /* Specify what should happen when the alarm happens: * It should call this D-Bus method: */ @@ -1105,9 +1350,23 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query) } void -modest_platform_information_banner (GtkWidget *widget, +modest_platform_information_banner (GtkWidget *parent, const gchar *icon_name, const gchar *text) { - hildon_banner_show_information (widget, icon_name, text); + hildon_banner_show_information (parent, icon_name, text); +} + +GtkWidget * +modest_platform_animation_banner (GtkWidget *parent, + const gchar *animation_name, + const gchar *text) +{ + GtkWidget *inf_note = NULL; + + g_return_val_if_fail (text != NULL, NULL); + + inf_note = hildon_banner_show_animation (parent, animation_name, text); + + return inf_note; }