#include <modest-defs.h>
#include "modest-utils.h"
#include "modest-platform.h"
-<<<<<<< .working
-#include "modest-account-mgr-helpers.h"
-#include "modest-text-utils.h"
-=======
#include <modest-account-protocol.h>
#include "modest-account-mgr-helpers.h"
#include "modest-text-utils.h"
->>>>>>> .merge-right.r5668
#include <modest-local-folder-info.h>
#include "widgets/modest-header-view.h"
#include "widgets/modest-main-window.h"
#include "modest-widget-memory.h"
#include "widgets/modest-sort-criterium-view.h"
+#ifdef MODEST_TOOLKIT_HILDON2
+#include "modest-header-window.h"
+#endif
GQuark
modest_utils_get_supported_secure_authentication_error_quark (void)
return g_quark_from_static_string("modest-utils-get-supported-secure-authentication-error-quark");
}
-gboolean
+gboolean
modest_utils_folder_writable (const gchar *filename)
{
g_return_val_if_fail (filename, FALSE);
if (!filename)
return FALSE;
-
+
if (g_strncasecmp (filename, "obex", 4) != 0) {
- GnomeVFSFileInfo *folder_info;
- gchar *folder;
- 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);
- g_free (folder);
- if (!((folder_info->permissions & GNOME_VFS_PERM_ACCESS_WRITABLE) ||
- (folder_info->permissions & GNOME_VFS_PERM_USER_WRITE))) {
+ GnomeVFSFileInfo *folder_info = NULL;
+ GnomeVFSResult result = GNOME_VFS_OK;
+ GnomeVFSURI *uri = NULL;
+ GnomeVFSURI *folder_uri = NULL;
+
+ uri = gnome_vfs_uri_new (filename);
+ folder_uri = gnome_vfs_uri_get_parent (uri);
+
+ if (folder_uri != NULL) {
+ folder_info = gnome_vfs_file_info_new ();
+ result = gnome_vfs_get_file_info_uri (folder_uri, folder_info,
+ GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS);
+ gnome_vfs_uri_unref (folder_uri);
+ }
+ gnome_vfs_uri_unref (uri);
+
+ if (folder_uri == NULL)
+ return FALSE;
+
+ 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);
return TRUE;
}
-gboolean
+gboolean
modest_utils_file_exists (const gchar *filename)
{
GnomeVFSURI *uri = NULL;
gboolean result = FALSE;
g_return_val_if_fail (filename, FALSE);
-
+
uri = gnome_vfs_uri_new (filename);
if (uri) {
result = gnome_vfs_uri_exists (uri);
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;
- 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: */
- result = NULL;
- TnyIterator* 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: %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 (err) {
+ if (info->error) {
+ g_error_free (info->error);
+ info->error = NULL;
+ }
+ info->error = g_error_copy (err);
+ goto close_dialog;
+ }
- if(modest_protocol_registry_protocol_type_is_secure (protocol_registry, protocol_type))
- result = g_list_prepend(result, GINT_TO_POINTER(protocol_type));
+ 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
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);
/* 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,
/* 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,
"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;
}
return (guint64) size;
}
-<<<<<<< .working
-
static void
on_destroy_dialog (GtkDialog *dialog)
{
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));
-
- /* 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;
+#ifdef MODEST_TOOLKIT_HILDON2
+ } else if (MODEST_IS_HEADER_WINDOW (parent_window)) {
+ header_view = MODEST_HEADER_VIEW (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (parent_window)));
+#endif
- 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);
-
- if (from_email) {
- if (!modest_text_utils_utf8_strcmp (from_header, from_email, TRUE)) {
- account_name = g_strdup (node->data);
- g_free (from);
- g_free (from_email);
- break;
- }
- g_free (from_email);
- }
- g_free (from);
- }
- }
- g_slist_foreach (accounts, (GFunc) g_free, NULL);
- g_slist_free (accounts);
-
- return account_name;
-}
-=======
-
-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;
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
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) {
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) {
- if (!modest_text_utils_utf8_strcmp (from_header, from_email, TRUE)) {
+ 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_email);
+ g_free (from_header_email);
g_free (from);
}
}
modest_platform_information_banner (GTK_WIDGET (self), NULL, message);
g_free (message);
}
->>>>>>> .merge-right.r5668
projects / modest / blobdiff