2007-08-31 Murray Cumming <murrayc@murrayc.com>

[modest] / src / maemo / modest-maemo-utils.c

diff --git a/src/maemo/modest-maemo-utils.c b/src/maemo/modest-maemo-utils.c
index 6b83f2b..3f05e5b 100644 (file)
--- a/src/maemo/modest-maemo-utils.c
+++ b/src/maemo/modest-maemo-utils.c
@@ -375,7 +375,31 @@ static void on_secure_auth_cancel(GtkWidget* dialog, int response, gpointer user
        }
 }
 
-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);
@@ -422,6 +446,9 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra
        /* 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 = 
@@ -429,10 +456,36 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra
        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;