#include "modest-hildon-includes.h"
#include "modest-maemo-utils.h"
+#include "modest-platform.h"
/*
* For getting and tracking the Bluetooth name
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();
+
+ /* This is a GDK lock because we are an idle callback and
+ * the code below is or does Gtk+ code */
+
+ gdk_threads_enter(); /* CHECKED */
gtk_dialog_response (GTK_DIALOG (info->dialog), GTK_RESPONSE_ACCEPT);
- gdk_threads_leave();
+ gdk_threads_leave(); /* CHECKED */
+
return FALSE;
}
ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data;
g_return_if_fail (info);
- gdk_threads_enter();
-
/* Free everything if the actual action was canceled */
if (info->cancel)
{
}
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));
- }
+
+ ModestAuthProtocol proto = modest_protocol_info_get_auth_protocol (auth_name);
+ if(proto != MODEST_PROTOCOL_AUTH_NONE)
+ result = g_list_prepend(result, GINT_TO_POINTER(proto));
+
tny_iterator_next(iter);
}
-
- g_object_unref(auth_types);
+ g_object_unref (iter);
modest_pair_list_free (pairs);
/* 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)
}
}
-GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTransportStoreProtocol proto,
+
+typedef struct
+{
+ GMainLoop* loop;
+} UserData;
+
+static UserData *user_data = NULL;
+
+static void
+on_account_online (TnyCamelAccount *account, GError *err)
+{
+ printf ("DEBUGa1: %s\n", __FUNCTION__);
+
+ if (err) {
+ printf("DEBUG: %s: error=\n %s\n", __FUNCTION__, err->message);
+ }
+
+ /* Allow the function that requested this callback to continue: */
+ /* TODO: Tinymail should really give us user_data with this callback. */
+ if (user_data && user_data->loop)
+ g_main_loop_quit (user_data->loop);
+}
+
+GList*
+modest_maemo_utils_get_supported_secure_authentication_methods (ModestTransportStoreProtocol proto,
const gchar* hostname, gint port, const gchar* username, GtkWindow *parent_window, GError** error)
{
g_return_val_if_fail (proto != MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN, NULL);
+ /* We need a connection to get the capabilities; */
+ if (!modest_platform_connect_and_wait (GTK_WINDOW (parent_window), NULL))
+ return NULL;
+
/*
result = g_list_append (result, GINT_TO_POINTER (MODEST_PROTOCOL_AUTH_CRAMMD5));
*/
tny_account = NULL;
}
- /* TODO: Handle connection requests. */
if (!tny_account) {
g_printerr ("%s could not create tny account.", __FUNCTION__);
/* Required for POP, at least */
tny_account_set_user (tny_account, username);
+ if(port > 0)
+ tny_account_set_port (tny_account, port);
+
/* Set the session for the account, so we can use it: */
ModestTnyAccountStore *account_store = modest_runtime_get_account_store ();
TnySessionCamel *session =
g_return_val_if_fail (session, NULL);
tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), session);
- if(port > 0)
- tny_account_set_port (tny_account, port);
-
-
+
+ /* This blocks on the result: */
+ /* TODO: Fix tinymail to take user_data for the callback instead of using one static instance: */
+ if (user_data) {
+ g_slice_free (UserData, user_data);
+ user_data = NULL;
+ }
+
+ user_data = g_slice_new0 (UserData);
+ user_data->loop = g_main_loop_new (NULL, FALSE /* not running */);
+
+ /* We get a warning if we don't do use tny_camel_account_set_online():
+ * GLIB CRITICAL ** camel-lite - camel_service_query_auth_types: assertion `service != NULL' failed.
+ */
+ tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (tny_account), TRUE, &on_account_online);
+ printf ("DEBUGa2: %s\n", __FUNCTION__);
+
+ /* 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 (user_data->loop);
+ GDK_THREADS_ENTER();
+ printf ("DEBUG: %s: after g_main_loop_run()\n", __FUNCTION__);
+ g_main_loop_unref (user_data->loop);
+ /* g_main_context_unref (context); */
+
+ g_slice_free (UserData, user_data);
+ user_data = NULL;
+
+
/* Ask camel to ask the server, asynchronously: */
ModestGetSupportedAuthInfo *info = g_slice_new (ModestGetSupportedAuthInfo);
info->result = NULL;
info->cancel = FALSE;
info->error = NULL;
info->progress = gtk_progress_bar_new();
+ /* TODO: Need logical_ID for the title: */
info->dialog = gtk_dialog_new_with_buttons(_("Authentication"),
parent_window, GTK_DIALOG_MODAL,
- GTK_STOCK_CANCEL,
+ _("mcen_bd_dialog_cancel"),
GTK_RESPONSE_REJECT,
NULL);
//gtk_window_set_default_size(GTK_WINDOW(info->dialog), 300, 100);
}
#endif
+#if 0 /* Not used now. */
/* user_data for the idle callback: */
typedef struct
{
g_idle_add (on_idle_show_information, info);
}
+#endif
void modest_maemo_show_dialog_and_forget (GtkWindow *parent_window, GtkDialog *dialog)
{
projects / modest / blobdiff