X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-utils.c;h=aceeafbc7b63fbb7d7e2da47567df32bec5edde2;hp=86e583009837d9f0e865e5371d7e9095faf036ec;hb=43146a5b6e3b25f94d8650f77b71eb046a611724;hpb=dd7289150ff197648959a5249da3d5f5d9b1c6a4 diff --git a/src/modest-utils.c b/src/modest-utils.c index 86e5830..aceeafb 100644 --- a/src/modest-utils.c +++ b/src/modest-utils.c @@ -43,7 +43,14 @@ #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" +#include "modest-widget-memory.h" +#include "widgets/modest-sort-criterium-view.h" GQuark modest_utils_get_supported_secure_authentication_error_quark (void) @@ -226,14 +233,23 @@ on_camel_account_get_supported_secure_authentication (TnyCamelAccount *self, gbo 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 (); + ModestPairList *pairs; + GList *result; + ModestProtocolRegistry *protocol_registry; + + 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: */ - GList *result = NULL; + 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; + 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); @@ -242,9 +258,12 @@ on_camel_account_get_supported_secure_authentication (TnyCamelAccount *self, gbo printf("DEBUG: %s: auth_name=%s\n", __FUNCTION__, auth_name); - 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)); + 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); } @@ -275,12 +294,38 @@ on_secure_auth_cancel(GtkWidget* dialog, int response, gpointer user_data) info->cancel = TRUE; } } +typedef struct { + GtkProgressBar *progress; + gboolean not_finished; +} KeepPulsing; + +static gboolean +keep_pulsing (gpointer user_data) +{ + KeepPulsing *info = (KeepPulsing *) user_data; + + gtk_progress_bar_pulse (info->progress); + + if (!info->not_finished) { + g_object_unref (info->progress); + g_slice_free (KeepPulsing, info); + return FALSE; + } + + return TRUE; +} 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)) @@ -292,22 +337,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__); @@ -318,7 +352,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 */ @@ -341,8 +375,11 @@ modest_utils_get_supported_secure_authentication_methods (ModestTransportStorePr 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"), + + /* 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, @@ -355,9 +392,16 @@ modest_utils_get_supported_secure_authentication_methods (ModestTransportStorePr gtk_label_new(_("emev_ni_checking_supported_auth_methods"))); 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)); + + KeepPulsing *pi = g_slice_new (KeepPulsing); + pi->progress = (GtkProgressBar *) g_object_ref (info->progress); + pi->not_finished = TRUE; + + /* 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, @@ -366,6 +410,9 @@ modest_utils_get_supported_secure_authentication_methods (ModestTransportStorePr gtk_dialog_run (GTK_DIALOG (info->dialog)); + pi->not_finished = FALSE; + /* pi is freed in the timeout itself to avoid a GCond here */ + gtk_widget_destroy(info->dialog); GList *result = info->result; @@ -467,7 +514,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; @@ -482,11 +529,278 @@ 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) +{ + gtk_widget_destroy (GTK_WIDGET(dialog)); + if (gtk_events_pending ()) + gtk_main_iteration (); +} + +static guint +checked_modest_sort_criterium_view_add_sort_key (ModestSortCriteriumView *view, const gchar* key, guint max) +{ + gint sort_key; + + g_return_val_if_fail (view && MODEST_IS_SORT_CRITERIUM_VIEW(view), 0); + g_return_val_if_fail (key, 0); + + sort_key = modest_sort_criterium_view_add_sort_key (view, key); + if (sort_key < 0 || sort_key >= max) { + g_warning ("%s: out of range (%d) for %s", __FUNCTION__, sort_key, key); + return 0; + } else + return (guint)sort_key; +} + +static void +launch_sort_headers_dialog (GtkWindow *parent_window, + GtkDialog *dialog) +{ + ModestHeaderView *header_view = NULL; + GList *cols = NULL; + GtkSortType sort_type; + gint sort_key; + gint default_key = 0; + gint result; + gboolean outgoing = FALSE; + gint current_sort_colid = -1; + GtkSortType current_sort_type; + gint attachments_sort_id; + gint priority_sort_id; + GtkTreeSortable *sortable; + + /* Get header window */ + if (MODEST_IS_MAIN_WINDOW (parent_window)) { + header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW)); + } + if (!header_view) + return; + + /* Add sorting keys */ + cols = modest_header_view_get_columns (header_view); + if (cols == NULL) + return; +#define SORT_ID_NUM 6 + int sort_model_ids[SORT_ID_NUM]; + int sort_ids[SORT_ID_NUM]; + + outgoing = (GPOINTER_TO_INT (g_object_get_data(G_OBJECT(cols->data), MODEST_HEADER_VIEW_COLUMN))== + MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT); + + sort_key = checked_modest_sort_criterium_view_add_sort_key (MODEST_SORT_CRITERIUM_VIEW (dialog), _("mcen_li_sort_sender_recipient"), + SORT_ID_NUM); + if (outgoing) { + sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN; + sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT; + } else { + sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN; + sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN; + } + + sort_key = checked_modest_sort_criterium_view_add_sort_key (MODEST_SORT_CRITERIUM_VIEW (dialog), _("mcen_li_sort_date"), + SORT_ID_NUM); + if (outgoing) { + sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN; + sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE; + } else { + sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN; + sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE; + } + default_key = sort_key; + + sort_key = checked_modest_sort_criterium_view_add_sort_key (MODEST_SORT_CRITERIUM_VIEW (dialog), _("mcen_li_sort_subject"), + SORT_ID_NUM); + sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN; + if (outgoing) + sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT; + else + sort_ids[sort_key] = MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN; + + sort_key = checked_modest_sort_criterium_view_add_sort_key (MODEST_SORT_CRITERIUM_VIEW (dialog), _("mcen_li_sort_attachment"), + SORT_ID_NUM); + sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN; + sort_ids[sort_key] = TNY_HEADER_FLAG_ATTACHMENTS; + attachments_sort_id = sort_key; + + sort_key = checked_modest_sort_criterium_view_add_sort_key (MODEST_SORT_CRITERIUM_VIEW (dialog), _("mcen_li_sort_size"), + SORT_ID_NUM); + sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN; + sort_ids[sort_key] = 0; + + sort_key = checked_modest_sort_criterium_view_add_sort_key (MODEST_SORT_CRITERIUM_VIEW (dialog), _("mcen_li_sort_priority"), + SORT_ID_NUM); + sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN; + sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK; + priority_sort_id = sort_key; + + sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model + (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))))); + /* Launch dialogs */ + if (!gtk_tree_sortable_get_sort_column_id (sortable, + ¤t_sort_colid, ¤t_sort_type)) { + modest_sort_criterium_view_set_sort_key (MODEST_SORT_CRITERIUM_VIEW (dialog), default_key); + modest_sort_criterium_view_set_sort_order (MODEST_SORT_CRITERIUM_VIEW (dialog), GTK_SORT_DESCENDING); + } else { + modest_sort_criterium_view_set_sort_order (MODEST_SORT_CRITERIUM_VIEW (dialog), current_sort_type); + if (current_sort_colid == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN) { + gpointer flags_sort_type_pointer; + flags_sort_type_pointer = g_object_get_data (G_OBJECT (cols->data), MODEST_HEADER_VIEW_FLAG_SORT); + if (GPOINTER_TO_INT (flags_sort_type_pointer) == TNY_HEADER_FLAG_PRIORITY_MASK) + modest_sort_criterium_view_set_sort_key (MODEST_SORT_CRITERIUM_VIEW (dialog), priority_sort_id); + else + 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) { + if (sort_model_ids[current_sort_keyid] == current_sort_colid) + break; + else + current_sort_keyid++; + } + modest_sort_criterium_view_set_sort_key (MODEST_SORT_CRITERIUM_VIEW (dialog), current_sort_keyid); + } + } + + result = gtk_dialog_run (GTK_DIALOG (dialog)); + if (result == GTK_RESPONSE_OK) { + sort_key = modest_sort_criterium_view_get_sort_key (MODEST_SORT_CRITERIUM_VIEW (dialog)); + if (sort_key < 0 || sort_key > SORT_ID_NUM -1) { + g_warning ("%s: out of range (%d)", __FUNCTION__, sort_key); + sort_key = 0; + } + + sort_type = modest_sort_criterium_view_get_sort_order (MODEST_SORT_CRITERIUM_VIEW (dialog)); + if (sort_model_ids[sort_key] == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN) { + g_object_set_data (G_OBJECT(cols->data), MODEST_HEADER_VIEW_FLAG_SORT, + GINT_TO_POINTER (sort_ids[sort_key])); + /* This is a hack to make it resort rows always when flag fields are + * selected. If we do not do this, changing sort field from priority to + * attachments does not work */ + modest_header_view_sort_by_column_id (header_view, 0, sort_type); + } else { + gtk_tree_view_column_set_sort_column_id (GTK_TREE_VIEW_COLUMN (cols->data), + sort_model_ids[sort_key]); + } + + modest_header_view_sort_by_column_id (header_view, sort_model_ids[sort_key], sort_type); + gtk_tree_sortable_sort_column_changed (sortable); + } + + modest_widget_memory_save (modest_runtime_get_conf (), + G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY); + + /* free */ + g_list_free(cols); +} + +void +modest_utils_run_sort_dialog (GtkWindow *parent_window, + ModestSortDialogType type) +{ + GtkWidget *dialog = NULL; + + /* Build dialog */ + dialog = modest_platform_create_sort_dialog (parent_window); + if (dialog == NULL) + return; + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + GTK_WINDOW (dialog), parent_window); + + /* Fill sort keys */ + switch (type) { + case MODEST_SORT_HEADERS: + launch_sort_headers_dialog (parent_window, + GTK_DIALOG(dialog)); + break; + } + + /* Free */ + on_destroy_dialog (GTK_DIALOG(dialog)); +} + + +gchar * +modest_images_cache_get_id (const gchar *account, const gchar *uri) +{ + GnomeVFSURI *vfs_uri; + gchar *result; + + vfs_uri = gnome_vfs_uri_new (uri); + if (vfs_uri == NULL) + return NULL; + + result = g_strdup_printf ("%s__%x", account, gnome_vfs_uri_hash (vfs_uri)); + gnome_vfs_uri_unref (vfs_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); +}