2007-06-22 Armin Burgmeier <armin@openismus.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 d45f1d8..1162573 100644 (file)
--- a/src/maemo/modest-maemo-utils.c
+++ b/src/maemo/modest-maemo-utils.c
@@ -258,7 +258,8 @@ typedef struct
        gboolean cancel;
        GList *result;
        GtkWidget* dialog;
-  GtkWidget* progress;
+       GtkWidget* progress;
+       GError* error;
 } ModestGetSupportedAuthInfo;
 
 static void on_camel_account_get_supported_secure_authentication_status (
@@ -276,7 +277,7 @@ on_camel_account_get_supported_secure_authentication (
                
        ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data;
        g_return_if_fail (info);
-       
+
        /* Free everything if the actual action was canceled */
        if (info->cancel)
        {
@@ -285,6 +286,14 @@ on_camel_account_get_supported_secure_authentication (
                return;
        }
 
+       /* Why is this a pointer to a pointer? We are not supposed to set it,
+        * are we? */
+       if(err != NULL && *err != NULL)
+       {
+               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. */
@@ -327,7 +336,7 @@ static void on_secure_auth_cancel(GtkWidget* dialog, int response, gpointer user
 }
 
 GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTransportStoreProtocol proto, 
-       const gchar* hostname, gint port, GtkWindow *parent_window)
+       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);
        
@@ -363,6 +372,10 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra
         /* TODO: Why isn't this done in account_new()? */
        tny_account_set_proto (tny_account,
                               modest_protocol_info_get_transport_store_protocol_name(proto));
+
+       tny_account_set_hostname (tny_account, hostname);
+       /* Required for POP, at least */
+       tny_account_set_user (tny_account, username);
                               
        /* Set the session for the account, so we can use it: */
        ModestTnyAccountStore *account_store = modest_runtime_get_account_store ();
@@ -371,8 +384,6 @@ 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);
        
-       tny_account_set_hostname (tny_account, hostname);
-       
        if(port > 0)
                tny_account_set_port (tny_account, port);
                
@@ -382,6 +393,7 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra
        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,
@@ -417,8 +429,47 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra
        GList *result = info->result;
        if (!info->cancel)
        {
+               if(info->error != NULL)
+                       g_propagate_error(error, info->error);
+
                g_slice_free (ModestGetSupportedAuthInfo, info);
                info = NULL;
        }
        return result;
 }
+
+void
+modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser)
+{
+       gchar *images_folder;
+       GtkFileFilter *file_filter;
+       GList *image_mimetypes_list;
+       GList *node;
+
+       g_return_if_fail (GTK_IS_FILE_CHOOSER (chooser));
+
+       /* Set the default folder to images folder */
+       images_folder = g_build_filename (g_get_home_dir (), 
+                                         MODEST_MAEMO_UTILS_MYDOCS_FOLDER,
+                                         MODEST_MAEMO_UTILS_DEFAULT_IMAGE_FOLDER, NULL);
+       gtk_file_chooser_set_current_folder (chooser, images_folder);
+       g_free (images_folder);
+
+       /* Set the images mime filter */
+       file_filter = gtk_file_filter_new ();
+#ifdef MODEST_HILDON_VERSION_0
+       image_mimetypes_list = osso_mime_get_mime_types_for_category (OSSO_MIME_CATEGORY_IMAGES);
+#else
+       image_mimetypes_list = hildon_mime_get_mime_types_for_category (HILDON_MIME_CATEGORY_IMAGES);
+#endif
+       for (node = image_mimetypes_list; node != NULL; node = g_list_next (node)) {
+               gtk_file_filter_add_mime_type (file_filter, node->data);
+       }
+       gtk_file_chooser_set_filter (chooser, file_filter);
+#ifdef MODEST_HILDON_VERSION_0
+       osso_mime_types_list_free (image_mimetypes_list);
+#else
+       hildon_mime_types_list_free (image_mimetypes_list);
+#endif
+
+}