X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-utils.c;h=75e056cd48dd0589e6d38f7fab27482a86df675f;hp=d598b050bdea8a7ff187bdd27d9c1ee053b57c94;hb=81bb7fae864f7a1c81d2bccc082e11eaee1a7bd6;hpb=85dbfb5b2586e248ed9cef94d0e43f8e24865caf diff --git a/src/modest-utils.c b/src/modest-utils.c index d598b05..75e056c 100644 --- a/src/modest-utils.c +++ b/src/modest-utils.c @@ -43,6 +43,9 @@ #include #include "modest-utils.h" #include "modest-platform.h" +#include +#include "modest-account-mgr-helpers.h" +#include "modest-text-utils.h" #include #include "widgets/modest-header-view.h" #include "widgets/modest-main-window.h" @@ -66,13 +69,19 @@ modest_utils_folder_writable (const gchar *filename) if (g_strncasecmp (filename, "obex", 4) != 0) { GnomeVFSFileInfo *folder_info; gchar *folder; + GnomeVFSResult result; + folder = g_path_get_dirname (filename); folder_info = gnome_vfs_file_info_new (); - gnome_vfs_get_file_info (folder, folder_info, - GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS); + result = gnome_vfs_get_file_info (folder, folder_info, + GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS); g_free (folder); - if (!((folder_info->permissions & GNOME_VFS_PERM_ACCESS_WRITABLE) || - (folder_info->permissions & GNOME_VFS_PERM_USER_WRITE))) { + + if ((result != GNOME_VFS_OK) || + (!((folder_info->permissions & GNOME_VFS_PERM_ACCESS_WRITABLE) || + (folder_info->permissions & GNOME_VFS_PERM_USER_WRITE)))) { + + gnome_vfs_file_info_unref (folder_info); return FALSE; } gnome_vfs_file_info_unref (folder_info); @@ -199,71 +208,82 @@ static void on_camel_account_get_supported_secure_authentication (TnyCamelAccount *self, gboolean cancelled, TnyList *auth_types, GError *err, gpointer user_data) { + ModestPairList *pairs; + GList *result; + ModestProtocolRegistry *protocol_registry; + ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data; + TnyIterator* iter; + + g_return_if_fail (user_data); g_return_if_fail (TNY_IS_CAMEL_ACCOUNT(self)); g_return_if_fail (TNY_IS_LIST(auth_types)); - ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data; - g_return_if_fail (info); - + info = (ModestGetSupportedAuthInfo *) user_data; /* 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; + info->cancel = TRUE; + g_debug ("%s: operation canceled\n", __FUNCTION__); + goto close_dialog; } - else - { - if (err) { - if (info->error) { - g_error_free (info->error); - info->error = NULL; - } - - info->error = g_error_copy (err); - } - if (!auth_types) { - g_warning ("DEBUG: %s: auth_types is NULL.\n", __FUNCTION__); - } - else if (tny_list_get_length(auth_types) == 0) - g_warning ("DEBUG: %s: auth_types is an empty TnyList.\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)) { - TnyPair *pair = TNY_PAIR(tny_iterator_get_current(iter)); - const gchar *auth_name = NULL; - if (pair) { - auth_name = tny_pair_get_name(pair); - g_object_unref (pair); - pair = NULL; - } - - printf("DEBUG: %s: auth_name=%s\n", __FUNCTION__, auth_name); + if (err) { + if (info->error) { + g_error_free (info->error); + info->error = NULL; + } + info->error = g_error_copy (err); + goto close_dialog; + } - 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)); + if (!auth_types) { + g_debug ("%s: auth_types is NULL.\n", __FUNCTION__); + goto close_dialog; + } - tny_iterator_next(iter); - } - g_object_unref (iter); + if (tny_list_get_length(auth_types) == 0) { + g_debug ("%s: auth_types is an empty TnyList.\n", __FUNCTION__); + goto close_dialog; + } - modest_pair_list_free (pairs); - - info->result = result; + protocol_registry = modest_runtime_get_protocol_registry (); + pairs = modest_protocol_registry_get_pair_list_by_tag (protocol_registry, MODEST_PROTOCOL_REGISTRY_AUTH_PROTOCOLS); + + /* Get the enum value for the strings: */ + result = NULL; + iter = tny_list_create_iterator(auth_types); + while (!tny_iterator_is_done(iter)) { + TnyPair *pair; + const gchar *auth_name; + ModestProtocolType protocol_type; + + pair = TNY_PAIR(tny_iterator_get_current(iter)); + auth_name = NULL; + if (pair) { + auth_name = tny_pair_get_name(pair); + g_object_unref (pair); + pair = NULL; } - - printf("DEBUG: finished\n"); - - /* Close the dialog in a main thread */ - g_idle_add(on_idle_secure_auth_finished, info); + + g_debug ("%s: auth_name=%s\n", __FUNCTION__, auth_name); + + protocol_type = modest_protocol_get_type_id (modest_protocol_registry_get_protocol_by_name (protocol_registry, + MODEST_PROTOCOL_REGISTRY_AUTH_PROTOCOLS, + auth_name)); + + if (modest_protocol_registry_protocol_type_is_secure (protocol_registry, protocol_type)) + result = g_list_prepend(result, GINT_TO_POINTER(protocol_type)); + + tny_iterator_next(iter); } + g_object_unref (iter); + + modest_pair_list_free (pairs); + info->result = result; + + close_dialog: + /* Close the dialog in a main thread */ + g_idle_add(on_idle_secure_auth_finished, info); } static void @@ -301,10 +321,16 @@ keep_pulsing (gpointer user_data) } GList* -modest_utils_get_supported_secure_authentication_methods (ModestTransportStoreProtocol proto, +modest_utils_get_supported_secure_authentication_methods (ModestProtocolType protocol_type, 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); + TnyAccount * tny_account = NULL; + ModestProtocolRegistry *protocol_registry; + ModestProtocol *protocol; + + g_return_val_if_fail (protocol_type != MODEST_PROTOCOL_REGISTRY_TYPE_INVALID, NULL); + + protocol_registry = modest_runtime_get_protocol_registry (); /* We need a connection to get the capabilities; */ if (!modest_platform_connect_and_wait (GTK_WINDOW (parent_window), NULL)) @@ -316,22 +342,11 @@ modest_utils_get_supported_secure_authentication_methods (ModestTransportStorePr /* Create a TnyCamelAccount so we can use * tny_camel_account_get_supported_secure_authentication(): */ - TnyAccount * tny_account = NULL; - switch (proto) { - case MODEST_PROTOCOL_TRANSPORT_SENDMAIL: - case MODEST_PROTOCOL_TRANSPORT_SMTP: - tny_account = TNY_ACCOUNT(tny_camel_transport_account_new ()); break; - case MODEST_PROTOCOL_STORE_POP: - tny_account = TNY_ACCOUNT(tny_camel_pop_store_account_new ()); break; - case MODEST_PROTOCOL_STORE_IMAP: - tny_account = TNY_ACCOUNT(tny_camel_imap_store_account_new ()); break; - case MODEST_PROTOCOL_STORE_MAILDIR: - case MODEST_PROTOCOL_STORE_MBOX: - tny_account = TNY_ACCOUNT(tny_camel_store_account_new()); break; - default: - tny_account = NULL; + protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, protocol_type); + tny_account = NULL; + if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) { + tny_account = modest_account_protocol_create_account (MODEST_ACCOUNT_PROTOCOL (protocol)); } - if (!tny_account) { g_printerr ("%s could not create tny account.", __FUNCTION__); @@ -342,7 +357,7 @@ modest_utils_get_supported_secure_authentication_methods (ModestTransportStorePr * set_session(): */ /* TODO: Why isn't this done in account_new()? */ tny_account_set_proto (tny_account, - modest_protocol_info_get_transport_store_protocol_name(proto)); + modest_protocol_get_name (modest_protocol_registry_get_protocol_by_type (protocol_registry, protocol_type))); tny_account_set_hostname (tny_account, hostname); /* Required for POP, at least */ @@ -366,15 +381,11 @@ modest_utils_get_supported_secure_authentication_methods (ModestTransportStorePr info->error = NULL; info->progress = gtk_progress_bar_new(); - /* FIXME: the title (first arg) here is empty; there should be 'accountwizard_fi_authentication', - * but that does not exist yet; see bug #82487. so, for now, we simply leave it empty - */ info->dialog = gtk_dialog_new_with_buttons(" ", parent_window, GTK_DIALOG_MODAL, _("mcen_bd_dialog_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); @@ -390,8 +401,6 @@ modest_utils_get_supported_secure_authentication_methods (ModestTransportStorePr /* Starts the pulsing of the progressbar */ g_timeout_add (500, keep_pulsing, pi); - printf ("DEBUG: %s: STARTING.\n", __FUNCTION__); - tny_camel_account_get_supported_secure_authentication ( TNY_CAMEL_ACCOUNT (tny_account), on_camel_account_get_supported_secure_authentication, @@ -404,25 +413,20 @@ modest_utils_get_supported_secure_authentication_methods (ModestTransportStorePr /* pi is freed in the timeout itself to avoid a GCond here */ gtk_widget_destroy(info->dialog); + info->dialog = NULL; GList *result = info->result; - if (!info->cancel) - { + if (!info->cancel) { if (info->error) { gchar * debug_url_string = tny_account_get_url_string (tny_account); - g_warning ("DEBUG: %s:\n error: %s\n account url: %s", __FUNCTION__, info->error->message, - debug_url_string); + g_warning ("%s:\n error: %s\n account url: %s", __FUNCTION__, info->error->message, + debug_url_string); g_free (debug_url_string); g_propagate_error(error, info->error); info->error = NULL; } - - g_slice_free (ModestGetSupportedAuthInfo, info); - info = NULL; - } - else - { + } else { // Tell the caller that the operation was canceled so it can // make a difference g_set_error(error, @@ -431,6 +435,17 @@ modest_utils_get_supported_secure_authentication_methods (ModestTransportStorePr "User has canceled query"); } + /* Free the info */ + if (info->error) + g_free (info->error); + if (info->result) + g_list_free (info->result); + if (info->dialog) + gtk_widget_destroy (info->dialog); + if (info->progress) + gtk_widget_destroy (info->progress); + g_slice_free (ModestGetSupportedAuthInfo, info); + return result; } @@ -504,7 +519,7 @@ modest_list_index (TnyList *list, GObject *object) } guint64 -modest_folder_available_space (const gchar *maildir_path) +modest_utils_get_available_space (const gchar *maildir_path) { gchar *folder; gchar *uri_string; @@ -519,15 +534,14 @@ modest_folder_available_space (const gchar *maildir_path) if (uri) { if (gnome_vfs_get_volume_free_space (uri, &size) != GNOME_VFS_OK) - size = -1; + size = 0; gnome_vfs_uri_unref (uri); } else { - size = -1; + size = 0; } return (guint64) size; } - static void on_destroy_dialog (GtkDialog *dialog) { @@ -652,7 +666,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window, modest_sort_criterium_view_set_sort_key (MODEST_SORT_CRITERIUM_VIEW (dialog), attachments_sort_id); } else { gint current_sort_keyid = 0; - while (current_sort_keyid < 6) { + while (current_sort_keyid < SORT_ID_NUM) { if (sort_model_ids[current_sort_keyid] == current_sort_colid) break; else @@ -705,7 +719,7 @@ modest_utils_run_sort_dialog (GtkWindow *parent_window, if (dialog == NULL) return; modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), - GTK_WINDOW (dialog)); + GTK_WINDOW (dialog), parent_window); /* Fill sort keys */ switch (type) { @@ -735,3 +749,63 @@ modest_images_cache_get_id (const gchar *account, const gchar *uri) return result; } + +gchar * +modest_utils_get_account_name_from_recipient (const gchar *from_header) +{ + gchar *account_name = NULL; + ModestAccountMgr *mgr = NULL; + GSList *accounts = NULL, *node = NULL; + + g_return_val_if_fail (from_header, NULL); + + mgr = modest_runtime_get_account_mgr (); + accounts = modest_account_mgr_account_names (mgr, TRUE); + + for (node = accounts; node != NULL; node = g_slist_next (node)) { + gchar *from = + modest_account_mgr_get_from_string (mgr, node->data); + + if (from) { + gchar *from_email = + modest_text_utils_get_email_address (from); + gchar *from_header_email = + modest_text_utils_get_email_address (from_header); + + if (from_email && from_header_email) { + if (!modest_text_utils_utf8_strcmp (from_header_email, from_email, TRUE)) { + account_name = g_strdup (node->data); + g_free (from); + g_free (from_email); + break; + } + } + g_free (from_email); + g_free (from_header_email); + g_free (from); + } + } + g_slist_foreach (accounts, (GFunc) g_free, NULL); + g_slist_free (accounts); + + return account_name; +} + +void +modest_utils_on_entry_invalid_character (ModestValidatingEntry *self, + const gchar* character, + gpointer user_data) +{ + gchar *message = NULL; + const gchar *show_char = NULL; + + if (character) + show_char = character; + else { + show_char = "' '"; + } + + message = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), show_char); + modest_platform_information_banner (GTK_WIDGET (self), NULL, message); + g_free (message); +}