X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-maemo-utils.c;h=3f5eff255e3b5bd4d92e37b24233d1a466028298;hp=150dbcfe8a0ce69d5a3f35b2039f135aa9ca610e;hb=434f59409e20ea0ae3a828422d1c9cc91fdde8fa;hpb=9047ba28c2aeacd7fa7c092044390b1c5912cdea diff --git a/src/maemo/modest-maemo-utils.c b/src/maemo/modest-maemo-utils.c index 150dbcf..3f5eff2 100644 --- a/src/maemo/modest-maemo-utils.c +++ b/src/maemo/modest-maemo-utils.c @@ -61,6 +61,10 @@ #define BTNAME_MATCH_RULE "type='signal',interface='" BTNAME_SIGNAL_IF \ "',member='" BTNAME_SIG_CHANGED "'" +GQuark modest_maemo_utils_get_supported_secure_authentication_error_quark (void) +{ + return g_quark_from_static_string("modest-maemo-utils-get-supported-secure-authentication-error-quark"); +} GtkWidget* modest_maemo_utils_menubar_to_menu (GtkUIManager *ui_manager) @@ -254,7 +258,6 @@ modest_maemo_utils_create_temp_stream (const gchar *extension, gchar **path) typedef struct { - gboolean finished; gboolean cancel; GList *result; GtkWidget* dialog; @@ -268,6 +271,18 @@ static void on_camel_account_get_supported_secure_authentication_status ( /*ModestGetSupportedAuthInfo* info = (ModestGetSupportedAuthInfo*) user_data;*/ } +static gboolean +on_idle_secure_auth_finished (gpointer user_data) +{ + ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data; + /* Operation has finished, close the dialog. Control continues after + * gtk_dialog_run in modest_maemo_utils_get_supported_secure_authentication_methods() */ + gdk_threads_enter(); + gtk_dialog_response (GTK_DIALOG (info->dialog), GTK_RESPONSE_ACCEPT); + gdk_threads_leave(); + return FALSE; +} + static void on_camel_account_get_supported_secure_authentication ( TnyCamelAccount *self, gboolean cancelled, @@ -278,61 +293,74 @@ on_camel_account_get_supported_secure_authentication ( ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data; g_return_if_fail (info); + gdk_threads_enter(); + /* Free everything if the actual action was canceled */ if (info->cancel) { + /* The operation was canceled and the ownership of the info given to us + * so that we could still check the cancel flag. */ g_slice_free (ModestGetSupportedAuthInfo, info); info = NULL; - return; } - - /* Why is this a pointer to a pointer? We are not supposed to set it, - * are we? */ - if(err != NULL && *err != NULL) + else { - printf("Err: %s\n", (*err)->message); - info->error = g_error_copy(*err); - } - - if (!auth_types) { - printf ("DEBUG: %s: auth_types is NULL.\n", __FUNCTION__); - info->finished = TRUE; /* We are blocking, waiting for this. */ - return; - } - - ModestPairList* pairs = modest_protocol_info_get_auth_protocol_pair_list (); + /* TODO: Why is this a pointer to a pointer? We are not supposed to + * set it, are we? */ + if(err != NULL && *err != NULL) + { + if(info->error != NULL) g_error_free(info->error); + info->error = g_error_copy(*err); + } + + if (!auth_types) { + printf ("DEBUG: %s: auth_types is NULL.\n", __FUNCTION__); + } + else + { + ModestPairList* pairs = modest_protocol_info_get_auth_protocol_pair_list (); - /* Get the enum value for the strings: */ - GList *result = NULL; - TnyIterator* iter = tny_list_create_iterator(auth_types); - while (!tny_iterator_is_done(iter)) { - const gchar *auth_name = tny_pair_get_name(TNY_PAIR(tny_iterator_get_current(iter))); - printf("DEBUG: %s: auth_name=%s\n", __FUNCTION__, auth_name); - ModestPair *matching = modest_pair_list_find_by_first_as_string (pairs, - auth_name); - if (matching) - { - result = g_list_append (result, GINT_TO_POINTER((ModestConnectionProtocol)matching->first)); - } - tny_iterator_next(iter); - } + /* Get the enum value for the strings: */ + GList *result = NULL; + TnyIterator* iter = tny_list_create_iterator(auth_types); + while (!tny_iterator_is_done(iter)) { + const gchar *auth_name = tny_pair_get_name(TNY_PAIR(tny_iterator_get_current(iter))); + printf("DEBUG: %s: auth_name=%s\n", __FUNCTION__, auth_name); + ModestPair *matching = modest_pair_list_find_by_first_as_string (pairs, + auth_name); + if (matching) + { + result = g_list_append (result, GINT_TO_POINTER((ModestConnectionProtocol)matching->first)); + } + tny_iterator_next(iter); + } - g_object_unref(auth_types); - - modest_pair_list_free (pairs); + g_object_unref(auth_types); + + modest_pair_list_free (pairs); - info->result = result; - printf("DEBUG: finished\n"); - info->finished = TRUE; /* We are blocking, waiting for this. */ + info->result = result; + } + + printf("DEBUG: finished\n"); + + /* Close the dialog in a main thread */ + g_idle_add(on_idle_secure_auth_finished, info); + } + + gdk_threads_leave(); } static void on_secure_auth_cancel(GtkWidget* dialog, int response, gpointer user_data) { - ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data; - g_return_if_fail(info); - /* We are blocking */ - info->result = NULL; - info->cancel = TRUE; + if(response == GTK_RESPONSE_REJECT || response == GTK_RESPONSE_DELETE_EVENT) + { + ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data; + g_return_if_fail(info); + /* This gives the ownership of the info to the worker thread. */ + info->result = NULL; + info->cancel = TRUE; + } } GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTransportStoreProtocol proto, @@ -361,6 +389,8 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra default: tny_account = NULL; } + + /* TODO: Handle connection requests. */ if (!tny_account) { g_printerr ("%s could not create tny account.", __FUNCTION__); @@ -390,25 +420,24 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra /* Ask camel to ask the server, asynchronously: */ ModestGetSupportedAuthInfo *info = g_slice_new (ModestGetSupportedAuthInfo); - info->finished = FALSE; info->result = NULL; info->cancel = FALSE; info->error = NULL; info->progress = gtk_progress_bar_new(); - info->dialog = gtk_dialog_new_with_buttons(_("Authentication"), - parent_window, GTK_DIALOG_MODAL, - GTK_STOCK_CANCEL, - GTK_RESPONSE_REJECT, - NULL); + info->dialog = gtk_dialog_new_with_buttons(_("Authentication"), + parent_window, GTK_DIALOG_MODAL, + GTK_STOCK_CANCEL, + GTK_RESPONSE_REJECT, + NULL); //gtk_window_set_default_size(GTK_WINDOW(info->dialog), 300, 100); g_signal_connect(G_OBJECT(info->dialog), "response", G_CALLBACK(on_secure_auth_cancel), info); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(info->dialog)->vbox), - gtk_label_new("Checking for supported authentication types...")); + gtk_label_new("Checking for supported authentication types...")); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(info->dialog)->vbox), info->progress); gtk_widget_show_all(info->dialog); - gtk_progress_bar_pulse(GTK_PROGRESS_BAR(info->progress)); + gtk_progress_bar_pulse(GTK_PROGRESS_BAR(info->progress)); printf ("DEBUG: %s: STARTING.\n", __FUNCTION__); tny_camel_account_get_supported_secure_authentication ( @@ -416,15 +445,10 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra on_camel_account_get_supported_secure_authentication, on_camel_account_get_supported_secure_authentication_status, info); - - /* Block until the callback has been called, - * driving the main context, so that the (idle handler) callback can be - * called, and so that our dialog is clickable: */ - while (!(info->finished) && !(info->cancel)) { - gtk_main_iteration_do(FALSE); - } + + gtk_dialog_run (GTK_DIALOG (info->dialog)); - gtk_widget_destroy(info->dialog); + gtk_widget_destroy(info->dialog); GList *result = info->result; if (!info->cancel) @@ -435,6 +459,16 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra g_slice_free (ModestGetSupportedAuthInfo, info); info = NULL; } + else + { + // Tell the caller that the operation was canceled so it can + // make a difference + g_set_error(error, + modest_maemo_utils_get_supported_secure_authentication_error_quark(), + MODEST_MAEMO_UTILS_GET_SUPPORTED_SECURE_AUTHENTICATION_ERROR_CANCELED, + "User has canceled query"); + } + return result; } @@ -473,3 +507,20 @@ modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser) #endif } + +static void +on_response (GtkDialog *dialog, gint response, gpointer user_data) +{ + /* Just destroy the dialog: */ + gtk_widget_destroy (GTK_WIDGET (dialog)); +} + +void modest_maemo_show_information_note_and_forget (GtkWindow *parent_window, const gchar* message) +{ + GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, message)); + + /* Destroy the dialog when it is closed: */ + g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (on_response), NULL); + gtk_widget_show (GTK_WIDGET (dialog)); +} +