X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=e551240c7b710d22ae9849396f228ed2d7330c1d;hp=8e4c04786c824c53b685e080f1531b122b0b285d;hb=7e1f298013c408f6e4c0623952d001f39f27381b;hpb=587841e2cb7a496338354f15385eea4deee3a3e1

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index 8e4c047..e551240 100644
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -34,6 +34,7 @@
 #include "modest-tny-account.h"
 #include "modest-tny-folder.h"
 #include "modest-ui-actions.h"
+#include "modest-utils.h"
 #include "modest-debug.h"
 #include "modest-search.h"
 #include "widgets/modest-msg-edit-window.h"
@@ -71,7 +72,6 @@ typedef struct
 
 
 static gboolean notify_error_in_dbus_callback (gpointer user_data);
-static gboolean notify_msg_not_found_in_idle (gpointer user_data);
 static gboolean on_idle_compose_mail(gpointer user_data);
 static gboolean on_idle_top_application (gpointer user_data);
 
@@ -448,15 +448,16 @@ find_msg_async_cb (TnyFolder *folder,
         OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) user_data;
 
         if (err || cancelled) {
-                g_idle_add (notify_msg_not_found_in_idle, NULL);
+		modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
+		g_idle_add (notify_error_in_dbus_callback, NULL);
                 goto end;
         }
 
         header = tny_msg_get_header (msg);
         if (header && (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)) {
                 g_object_unref (header);
-                g_object_unref (msg);
-                g_idle_add (notify_msg_not_found_in_idle, NULL);
+		modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
+		g_idle_add (notify_error_in_dbus_callback, NULL);
                 goto end;
         }
 
@@ -499,27 +500,12 @@ find_msg_async_cb (TnyFolder *folder,
 			}
                
 			from_header = tny_header_dup_from (header);
-			if (from_header) {
-				GSList *accounts = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE);
-				GSList *node = NULL;
-				for (node = accounts; node != NULL; node = g_slist_next (node)) {
-					gchar *from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr (), node->data);
-					
-					if (from && (strcmp (from_header, from) == 0)) {
-						g_free (modest_account_name);
-						modest_account_name = g_strdup (node->data);
-						g_free (from);
-						break;
-					}
-					g_free (from);
-                               }
-				g_slist_foreach (accounts, (GFunc) g_free, NULL);
-				g_slist_free (accounts);
-				g_free (from_header);
-			}
+			modest_account_name = modest_utils_get_account_name_from_recipient (from_header);
+			g_free (from_header);
 			
 			if (modest_account_name == NULL) {
-				modest_account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
+				ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
+				modest_account_name = modest_account_mgr_get_default_account (mgr);
 			}
                         msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE);
 			g_free (modest_account_name);
@@ -558,7 +544,6 @@ find_msg_async_cb (TnyFolder *folder,
 
 cleanup:
         g_object_unref (header);
-        g_object_unref (msg);
 
 end:
         on_find_msg_async_destroy (info);
@@ -577,7 +562,8 @@ on_open_message_performer (gboolean canceled,
 
 	info = (OpenMsgPerformerInfo *) user_data;
         if (canceled || err) {
-                g_idle_add (notify_msg_not_found_in_idle, NULL);
+		modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
+		g_idle_add (notify_error_in_dbus_callback, NULL);
                 on_find_msg_async_destroy (info);
                 return;
         }
@@ -596,7 +582,8 @@ on_open_message_performer (gboolean canceled,
                 folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), info->uri, NULL);
         }
         if (!folder) {
-                g_idle_add (notify_msg_not_found_in_idle, NULL);
+		modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
+		g_idle_add (notify_error_in_dbus_callback, NULL);
                 on_find_msg_async_destroy (info);
                 return;
         }
@@ -745,8 +732,8 @@ on_remove_msgs_finished (ModestMailOperation *mail_op,
 		modest_header_view_refilter (header_view);
 }
 
-static gboolean
-on_idle_delete_message (gpointer user_data)
+static gpointer
+thread_prepare_delete_message (gpointer userdata)
 {
 	TnyList *headers = NULL, *tmp_headers = NULL;
 	TnyFolder *folder = NULL;
@@ -754,13 +741,13 @@ on_idle_delete_message (gpointer user_data)
 	TnyHeader *header = NULL, *msg_header = NULL;
 	TnyMsg *msg = NULL;
 	TnyAccount *account = NULL;
-	const char *uri = NULL;
+	char *uri;
 	gchar *uid = NULL;
 	ModestMailOperation *mail_op = NULL;
 	ModestWindow *main_win = NULL;
 
-	uri = (char *) user_data;
-	
+	uri = (char *) userdata;
+
 	msg = find_message_by_url (uri, &account);
 	if (account)
 		g_object_unref (account);
@@ -768,6 +755,7 @@ on_idle_delete_message (gpointer user_data)
 	if (!msg) {
 		g_warning ("%s: Could not find message '%s'", __FUNCTION__, uri);
 		g_idle_add (notify_error_in_dbus_callback, NULL);
+		g_free (uri);
 		return FALSE; 
 	}
 	
@@ -779,6 +767,7 @@ on_idle_delete_message (gpointer user_data)
 		g_warning ("%s: Could not find folder (uri:'%s')", __FUNCTION__, uri);
 		g_object_unref (msg);
 		g_idle_add (notify_error_in_dbus_callback, NULL);
+		g_free (uri);
 		return FALSE; 
 	}
 
@@ -821,6 +810,7 @@ on_idle_delete_message (gpointer user_data)
 		if (folder)
 			g_object_unref (folder);
 		g_idle_add (notify_error_in_dbus_callback, NULL);			
+		g_free (uri);
 		return FALSE;
 	}
 		
@@ -848,10 +838,24 @@ on_idle_delete_message (gpointer user_data)
 	/* Clean */
 	if (header)
 		g_object_unref (header);
+	g_free (uri);
 	
 	return FALSE;
 }
 
+static gboolean
+on_idle_delete_message (gpointer user_data)
+{
+	const char *uri = NULL;
+
+	uri = (char *) user_data;
+
+	g_thread_create (thread_prepare_delete_message, g_strdup (uri), FALSE, NULL);
+
+	return FALSE;
+	
+}
+
 
 
 
@@ -929,18 +933,21 @@ on_dbus_method_dump_send_queues (DBusConnection *con, DBusMessage *message)
 			modest_runtime_get_account_store(), accname,
 			TNY_ACCOUNT_TYPE_TRANSPORT);
 		if (TNY_IS_ACCOUNT(acc)) {
-			gchar *tmp, *url = tny_account_get_url_string (acc);
+			gchar *tmp = NULL, *url = tny_account_get_url_string (acc);
 			ModestTnySendQueue *sendqueue =
 				modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT(acc), TRUE);
-			gchar *queue_str = modest_tny_send_queue_to_string (sendqueue);
+
+			if (TNY_IS_SEND_QUEUE (sendqueue)) {
+				gchar *queue_str = modest_tny_send_queue_to_string (sendqueue);
 			
-			tmp = g_strdup_printf ("%s[%s]: '%s': %s\n%s",
-					       str, accname, tny_account_get_id (acc), url,
-					       queue_str);
-			g_free(queue_str);
+				tmp = g_strdup_printf ("%s[%s]: '%s': %s\n%s",
+						       str, accname, tny_account_get_id (acc), url,
+						       queue_str);
+				g_free(queue_str);
+				g_free (str);
+				str = tmp;
+			}
 			g_free (url);
-			g_free (str);
-			str = tmp;
 
 			g_object_unref (acc);
 		}
@@ -1131,46 +1138,10 @@ on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
  	return OSSO_OK;
 }
 
-static gboolean
-on_idle_open_default_inbox(gpointer user_data)
-{
-	ModestWindow *main_win;
-	GtkWidget *folder_view;
-	
-	if (!check_and_offer_account_creation ()) /* this has it's only lock already */
-		return FALSE;
-
-	/* This is a GDK lock because we are an idle callback and
-	 * the code below is or does Gtk+ code */
-	gdk_threads_enter (); /* CHECKED */
-
-	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
-						      TRUE); /* create if non-existent */
-	if (!main_win) {
-		g_warning ("%s: BUG: no main window", __FUNCTION__);
-		gdk_threads_leave (); /* CHECKED */
-		return FALSE; /* don't call me again */
-	}
-		
-	/* Get the folder view */
-	folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_win),
-							   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-	modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
-	
-	gdk_threads_leave (); /* CHECKED */
-	
-	/* This D-Bus method is obviously meant to result in the UI being visible,
-	 * so show it, by calling this idle handler directly: */
-	on_idle_top_application(user_data);
-	
-	return FALSE; /* Do not call this callback again. */
-}
-
 static gint 
 on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval)
 {
-	/* Use g_idle to context-switch into the application's thread: */
- 	g_idle_add(on_idle_open_default_inbox, NULL);
+ 	g_idle_add(on_idle_top_application, NULL);
  	
  	return OSSO_OK;
 }
@@ -1180,6 +1151,7 @@ static gboolean
 on_idle_top_application (gpointer user_data)
 {
 	ModestWindow *main_win;
+	gboolean new_window = FALSE;
 	
 	/* This is a GDK lock because we are an idle callback and
 	 * the code below is or does Gtk+ code */
@@ -1187,14 +1159,29 @@ on_idle_top_application (gpointer user_data)
 	gdk_threads_enter (); /* CHECKED */
 	
 	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
-						      TRUE); /* create if non-existent */
+						      FALSE);
+
+	if (!main_win) {
+		main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+							      TRUE);
+		new_window = TRUE;
+	}
+
 	if (main_win) {
 		/* Ideally, we would just use gtk_widget_show(), 
 		 * but this widget is not coded correctly to support that: */
 		gtk_widget_show_all (GTK_WIDGET (main_win));
 		gtk_window_present (GTK_WINDOW (main_win));
-	} else
-		g_warning ("%s: BUG: no main window", __FUNCTION__);
+
+		/* If we're showing an already existing window then
+		   reselect the INBOX */
+		if (!new_window) {
+			GtkWidget *folder_view;
+			folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_win),
+									   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+			modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
+		}
+	}
 
 	gdk_threads_leave (); /* CHECKED */
 	
@@ -1209,6 +1196,21 @@ on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval)
  	
  	return OSSO_OK;
 }
+
+static gboolean 
+on_idle_show_memory_low (gpointer user_data)
+{
+	ModestWindow *main_win = NULL;
+
+	gdk_threads_enter ();
+	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
+	modest_platform_run_information_dialog (GTK_WINDOW (main_win),
+						dgettext("ke-recv","memr_ib_operation_disabled"),
+						TRUE);
+	gdk_threads_leave ();
+	
+	return FALSE;
+}
                       
 /* Callback for normal D-BUS messages */
 gint 
@@ -1216,6 +1218,12 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method,
 			GArray * arguments, gpointer data,
 			osso_rpc_t * retval)
 {
+	/* Check memory low conditions */
+	if (modest_platform_check_memory_low (NULL, FALSE)) {
+		g_idle_add (on_idle_show_memory_low, NULL);
+		goto param_error;
+	}
+
 	if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_MAIL_TO) == 0) {
 		if (arguments->len != MODEST_DBUS_MAIL_TO_ARGS_COUNT)
 			goto param_error;
@@ -1904,13 +1912,3 @@ notify_error_in_dbus_callback (gpointer user_data)
 
 	return FALSE;
 }
-
-static gboolean
-notify_msg_not_found_in_idle (gpointer user_data)
-{
-	modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), FALSE);
-
-	g_idle_add (notify_error_in_dbus_callback, NULL);
-
-	return FALSE;
-}