X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-utils.c;h=33b5a049def867e02bbb09ccd20a96f367a821db;hp=c2a1e6e373a5c8c53fc9989a31b013a11589bb3e;hb=315d8bfd8df561b5e07646caf186ff65335ba5ef;hpb=c9035410a7f687d9f51e4f4b4535636fda6e29f1

diff --git a/src/modest-utils.c b/src/modest-utils.c
index c2a1e6e..33b5a04 100644
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -43,11 +43,17 @@
 #include <modest-defs.h>
 #include "modest-utils.h"
 #include "modest-platform.h"
+#include <modest-account-protocol.h>
+#include "modest-account-mgr-helpers.h"
+#include "modest-text-utils.h"
 #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)
@@ -55,24 +61,39 @@ 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);
@@ -80,14 +101,14 @@ modest_utils_folder_writable (const gchar *filename)
 	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);
@@ -112,13 +133,13 @@ modest_utils_create_temp_stream (const gchar *orig_name, const gchar *hash_base,
 			   __FUNCTION__, orig_name);
 		return NULL;
 	}
-	
+
 	if (g_strstr_len (orig_name, strlen(orig_name), "/") != NULL) {
 		g_warning ("%s: filename contains '/' character(s) (%s)",
 			   __FUNCTION__, orig_name);
 		return NULL;
 	}
-		
+
 	/* make a random subdir under /tmp or /var/tmp */
 	if (hash_base != NULL) {
 		hash_number = g_str_hash (hash_base);
@@ -134,6 +155,12 @@ modest_utils_create_temp_stream (const gchar *orig_name, const gchar *hash_base,
 	}
 
 	filepath = g_strconcat (tmpdir, "/", orig_name, NULL);
+
+	/* if file exists, first we try to remove it */
+	if (modest_utils_file_exists (filepath)) {
+		g_unlink (filepath);
+	}
+
 	/* don't overwrite if it already exists, even if it is writable */
 	if (modest_utils_file_exists (filepath)) {
 		if (path!=NULL) {
@@ -148,7 +175,7 @@ modest_utils_create_temp_stream (const gchar *orig_name, const gchar *hash_base,
 		fd = g_open (filepath, O_CREAT|O_WRONLY|O_TRUNC, 0644);
 		if (fd == -1) {
 			g_warning ("%s: failed to create '%s': %s",
-					__FUNCTION__, filepath, g_strerror(errno));			
+					__FUNCTION__, filepath, g_strerror(errno));
 			g_free (filepath);
 			g_free (tmpdir);
 			return NULL;
@@ -159,128 +186,116 @@ modest_utils_create_temp_stream (const gchar *orig_name, const gchar *hash_base,
 
 	if (path)
 		*path = filepath;
+	else
+		g_free (filepath);
 
 	return TNY_FS_STREAM (tny_fs_stream_new (fd));
 }
 
 typedef struct 
 {
-	gboolean cancel;
-	GList *result;
+	GList **result;
 	GtkWidget* dialog;
 	GtkWidget* progress;
-	GError* error;
 } ModestGetSupportedAuthInfo;
 
-static void on_camel_account_get_supported_secure_authentication_status (
-	GObject *self, TnyStatus *status, gpointer user_data)
-{
-	/*ModestGetSupportedAuthInfo* info = (ModestGetSupportedAuthInfo*) user_data;*/
-}
-
 static gboolean
 on_idle_secure_auth_finished (gpointer user_data)
 {
-	ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data;
 	/* Operation has finished, close the dialog. Control continues after
 	 * gtk_dialog_run in modest_utils_get_supported_secure_authentication_methods() */
-
-	/* This is a GDK lock because we are an idle callback and
-	 * the code below is or does Gtk+ code */
-
 	gdk_threads_enter(); /* CHECKED */
-	gtk_dialog_response (GTK_DIALOG (info->dialog), GTK_RESPONSE_ACCEPT);
+	gtk_dialog_response (GTK_DIALOG (user_data), GTK_RESPONSE_ACCEPT);
 	gdk_threads_leave(); /* CHECKED */
 
 	return FALSE;
 }
 
 static void
-on_camel_account_get_supported_secure_authentication (TnyCamelAccount *self, gboolean cancelled,
-	TnyList *auth_types, GError *err, gpointer user_data)
+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;
+	if (cancelled) {
+		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) {
+		g_debug ("%s: error getting the supported auth methods\n", __FUNCTION__);
+		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);
 
-static void
-on_secure_auth_cancel(GtkWidget* dialog, int response, gpointer user_data)
-{
-	g_return_if_fail (GTK_IS_WIDGET(dialog));
-	
-	if(response == GTK_RESPONSE_REJECT || response == GTK_RESPONSE_DELETE_EVENT) {
-		ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data;
-		g_return_if_fail(info);
-		/* This gives the ownership of the info to the worker thread. */
-		info->result = NULL;
-		info->cancel = TRUE;
+		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->dialog);
+
+	/* Free the info */
+	g_slice_free (ModestGetSupportedAuthInfo, info);
 }
+
 typedef struct {
-	GtkProgressBar *progress;
+	GtkWidget *progress;
 	gboolean not_finished;
 } KeepPulsing;
 
@@ -288,165 +303,129 @@ 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;
 	}
-	
+
+	gtk_progress_bar_pulse (GTK_PROGRESS_BAR (info->progress));
 	return TRUE;
 }
 
 GList*
-modest_utils_get_supported_secure_authentication_methods (ModestTransportStoreProtocol proto, 
-	const gchar* hostname, gint port, const gchar* username, GtkWindow *parent_window, GError** error)
+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;
+	GtkWidget *dialog;
+	gint retval;
+	ModestTnyAccountStore *account_store;
+	TnySessionCamel *session = NULL;
+	ModestProtocol *protocol = NULL;
+	GList *result = NULL;
+	GtkWidget *progress;
+
+	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))
 		return NULL;
-	 
-	/*
-	result = g_list_append (result, GINT_TO_POINTER (MODEST_PROTOCOL_AUTH_CRAMMD5));
-	*/
-	
+
 	/* 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__);
 		return NULL;
 	}
-	
-	/* Set proto, so that the prepare_func() vfunc will work when we call 
-	 * 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));
 
+	/* Set proto, so that the prepare_func() vfunc will work when
+	 * we call set_session(): */
+	protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, protocol_type);
+	tny_account_set_id (tny_account, "temp_account");
+	tny_account_set_proto (tny_account, modest_protocol_get_name (protocol));
 	tny_account_set_hostname (tny_account, hostname);
-	/* 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 = 
-		modest_tny_account_store_get_session (TNY_ACCOUNT_STORE (account_store));
+	account_store = modest_runtime_get_account_store ();
+	session = modest_tny_account_store_get_session (TNY_ACCOUNT_STORE (account_store));
 	g_return_val_if_fail (session, NULL);
 	tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), session);
-	
-	
+
+	dialog = gtk_dialog_new_with_buttons(" ",
+					     parent_window,
+					     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+					     _("mcen_bd_dialog_cancel"),
+					     GTK_RESPONSE_REJECT,
+					     NULL);
+
 	/* Ask camel to ask the server, asynchronously: */
 	ModestGetSupportedAuthInfo *info = g_slice_new (ModestGetSupportedAuthInfo);
-	info->result = NULL;
-	info->cancel = FALSE;
-	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);
-	
+	info->result = &result;
+	info->dialog = dialog;
+
 	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(info->dialog)->vbox),
 	                  gtk_label_new(_("emev_ni_checking_supported_auth_methods")));
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(info->dialog)->vbox), info->progress);
+	progress = gtk_progress_bar_new();
+	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(info->dialog)->vbox), progress);
 	gtk_widget_show_all(info->dialog);
 
 	KeepPulsing *pi = g_slice_new (KeepPulsing);
-	pi->progress = (GtkProgressBar *) g_object_ref (info->progress);
+	pi->progress = 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,
-		on_camel_account_get_supported_secure_authentication_status,
-		info);
 
-	gtk_dialog_run (GTK_DIALOG (info->dialog));
-	
+	tny_camel_account_get_supported_secure_authentication (TNY_CAMEL_ACCOUNT (tny_account),
+							       on_camel_account_get_supported_secure_authentication,
+							       NULL,
+							       info);
+
+	retval = 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;
-	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_free (debug_url_string);
-			
-			g_propagate_error(error, info->error);
-			info->error = NULL;
-		}
 
-		g_slice_free (ModestGetSupportedAuthInfo, info);
-		info = NULL;
-	}
-	else
-	{
-		// Tell the caller that the operation was canceled so it can
-		// make a difference
-		g_set_error(error,
-		            modest_utils_get_supported_secure_authentication_error_quark(),
-		            MODEST_UTILS_GET_SUPPORTED_SECURE_AUTHENTICATION_ERROR_CANCELED,
-			    "User has canceled query");
-	}
+	gtk_widget_destroy(dialog);
+
+	/* Frees */
+	tny_account_cancel (tny_account);
+	g_object_unref (tny_account);
 
 	return result;
 }
 
-void 
-modest_utils_show_dialog_and_forget (GtkWindow *parent_window, 
+void
+modest_utils_show_dialog_and_forget (GtkWindow *parent_window,
 				     GtkDialog *dialog)
 {
 	g_return_if_fail (GTK_IS_WINDOW(parent_window));
 	g_return_if_fail (GTK_IS_DIALOG(dialog));
 
 	gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window);
-	
+
 	/* Destroy the dialog when it is closed: */
-	g_signal_connect_swapped (dialog, 
-				  "response", 
-				  G_CALLBACK (gtk_widget_destroy), 
+	g_signal_connect_swapped (dialog,
+				  "response",
+				  G_CALLBACK (gtk_widget_destroy),
 				  dialog);
 
 	gtk_widget_show (GTK_WIDGET (dialog));
@@ -504,7 +483,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 +498,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)
 {
@@ -573,6 +551,11 @@ launch_sort_headers_dialog (GtkWindow *parent_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));
+#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
+
 	}
 	if (!header_view)
 		return;
@@ -652,7 +635,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 
@@ -696,7 +679,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
 
 void
 modest_utils_run_sort_dialog (GtkWindow *parent_window,
-				 ModestSortDialogType type)
+			      ModestSortDialogType type)
 {
 	GtkWidget *dialog = NULL;
 
@@ -705,7 +688,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) {
@@ -719,3 +702,79 @@ modest_utils_run_sort_dialog (GtkWindow *parent_window,
 	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);
+}