X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=2b34ff8db1998634f084cb6919203357c701c92e;hp=a000bb3c426e39e36c106a17fdd1b99b487ac663;hb=7d6c4dab1828fcc8b67d34c881de362ddeea2e82;hpb=c49009539f6c6f6c409d2ccf971ac402636bc28e

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index a000bb3..2b34ff8 100644
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -38,6 +38,7 @@
 #include "modest-debug.h"
 #include "modest-search.h"
 #include "widgets/modest-msg-edit-window.h"
+#include "widgets/modest-window-mgr.h"
 #include "modest-tny-msg.h"
 #include "modest-platform.h"
 #include "modest-defs.h"
@@ -60,6 +61,7 @@
 #include <modest-accounts-window.h>
 #include <modest-folder-window.h>
 #include <modest-mailboxes-window.h>
+#include <modest-maemo-utils.h>
 #endif
 
 #include <tny-list.h>
@@ -259,7 +261,7 @@ on_mail_to(GArray * arguments, gpointer data, osso_rpc_t * retval)
  	
  	/* Note that we cannot report failures during sending, 
  	 * because that would be asynchronous. */
- 	return OSSO_OK;
+	return OSSO_OK;
 }
 
 
@@ -354,7 +356,7 @@ on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retval)
 	/* Use g_idle to context-switch into the application's thread: */
   	g_idle_add(on_idle_compose_mail, (gpointer)idle_data);
  	
- 	return OSSO_OK;
+	return OSSO_OK;
 }
 
 static TnyMsg *
@@ -544,7 +546,7 @@ find_msg_async_cb (TnyFolder *folder,
 				mail_op = modest_mail_operation_new (NULL);
 				modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
 								 mail_op);
-				modest_mail_operation_sync_folder (mail_op, folder, FALSE);
+				modest_mail_operation_sync_folder (mail_op, folder, FALSE, NULL, NULL);
 				g_object_unref (mail_op);
 			}
                         g_object_unref (header);
@@ -577,10 +579,17 @@ on_open_message_performer (gboolean canceled,
 {
 	OpenMsgPerformerInfo *info;
 	TnyFolder *folder = NULL;
+	ModestTnyAccountStore *account_store;
+	ModestTnyLocalFoldersAccount *local_folders_account;
+ 
+	account_store = modest_runtime_get_account_store ();
+	local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
+		modest_tny_account_store_get_local_folders_account (account_store));
 
 	info = (OpenMsgPerformerInfo *) user_data;
         if (canceled || err) {
-		modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
+		if (!canceled)
+			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;
@@ -588,27 +597,14 @@ on_open_message_performer (gboolean canceled,
 
         /* Get folder */
         if (!account) {
-                ModestTnyAccountStore *account_store;
-                ModestTnyLocalFoldersAccount *local_folders_account;
- 
-                account_store = modest_runtime_get_account_store ();
-                local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
-                        modest_tny_account_store_get_local_folders_account (account_store));
                 folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
                 g_object_unref (local_folders_account);
-        } else if (TNY_IS_CAMEL_STORE_ACCOUNT (account)) {
-		folder = tny_camel_store_account_factor_folder (TNY_CAMEL_STORE_ACCOUNT (account), info->uri, NULL);
-	} else {
+        } else if (account == TNY_ACCOUNT (local_folders_account)) {
                 folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), info->uri, NULL);
-        }
-        if (!folder) {
-		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;
-        }
-
-        if (!(modest_tny_folder_is_local_folder (folder) &&
+        } else {
+		folder = NULL;
+	}
+        if (!(folder && modest_tny_folder_is_local_folder (folder) &&
 	      (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS))) {
 		ModestWindowMgr *win_mgr;
 		ModestWindow *msg_view;
@@ -618,9 +614,6 @@ on_open_message_performer (gboolean canceled,
 			gtk_window_present (GTK_WINDOW(msg_view));
 		} else {
 			const gchar *modest_account_name;
-			TnyAccount *account;
-
-			account = tny_folder_get_account (folder);
 			if (account) {
 				modest_account_name =
 					modest_tny_account_get_parent_modest_account_name_for_server_account (account);
@@ -636,7 +629,8 @@ on_open_message_performer (gboolean canceled,
 					gtk_widget_show_all (GTK_WIDGET (msg_view));
 				}
 			}
-			g_object_unref (account);
+			if (account)
+				g_object_unref (account);
 
 		}
 		on_find_msg_async_destroy (info);
@@ -698,6 +692,8 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval)
 	if (is_merge || account) {
 		OpenMsgPerformerInfo *info;
 		TnyFolder *folder = NULL;
+		ModestTnyAccountStore *account_store;
+		ModestTnyLocalFoldersAccount *local_folders_account;
 
 		info = g_slice_new0 (OpenMsgPerformerInfo);
 		if (account) 
@@ -707,36 +703,35 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval)
 		info->animation = NULL;
 		info->animation_timeout = 0;
 
+		account_store = modest_runtime_get_account_store ();
+		local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT 
+			(modest_tny_account_store_get_local_folders_account (account_store));
+
 		/* Try to get the message, if it's already downloaded
 		   we don't need to connect */
 		if (account) {
-			folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL);
-		} else {
-			ModestTnyAccountStore *account_store;
-			ModestTnyLocalFoldersAccount *local_folders_account;
+			TnyDevice *device;
+			gboolean device_online;
 
-			account_store = modest_runtime_get_account_store ();
-			local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
-				modest_tny_account_store_get_local_folders_account (account_store));
+			device = modest_runtime_get_device ();
+			device_online = tny_device_is_online (device);
+			if (!device_online || TNY_ACCOUNT (local_folders_account) == account) {
+				folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL);
+			} else {
+				folder = NULL;
+			}
+		} else {
 			folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
 			g_object_unref (local_folders_account);
+			info->connect = FALSE;
 		}
 		if (folder) {
-			TnyDevice *device;
-			gboolean device_online;
-
-			device = modest_runtime_get_device();
-			device_online = tny_device_is_online (device);
-			if (device_online) {
-				info->connect = TRUE;
+			TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL);
+			if (msg) {
+				info->connect = FALSE;
+				g_object_unref (msg);
 			} else {
-				TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL);
-				if (msg) {
-					info->connect = FALSE;
-					g_object_unref (msg);
-				} else {
-					info->connect = TRUE;
-				}
+				info->connect = TRUE;
 			}
 			g_object_unref (folder);
 		}
@@ -924,16 +919,31 @@ on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval)
 	/* Use g_idle to context-switch into the application's thread: */
  	g_idle_add(on_idle_delete_message, (gpointer)uri);
  	
- 	return OSSO_OK;
+	return OSSO_OK;
+}
+
+typedef struct _SendReceivePerformerData {
+	gchar *account_id;
+	gboolean manual;
+	ModestMailOperation *mail_op;
+} SendReceivePerformerData;
+
+static void send_receive_performer_data_free (SendReceivePerformerData *data)
+{
+	if (data->mail_op) {
+		g_object_unref (data->mail_op);
+	}
+	g_free (data->account_id);
+	g_slice_free (SendReceivePerformerData, data);
 }
 
 static gboolean
 on_idle_send_receive(gpointer user_data)
 {
 	gboolean auto_update;
-	ModestWindow *top_win = NULL;
-
-	top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr ());
+	SendReceivePerformerData *data = (SendReceivePerformerData *) user_data;
+	ModestConnectedVia connect_when;
+	gboolean right_connection = FALSE;
 
 	gdk_threads_enter (); /* CHECKED */
 
@@ -941,12 +951,37 @@ on_idle_send_receive(gpointer user_data)
 	auto_update = modest_conf_get_bool (modest_runtime_get_conf (), 
 					    MODEST_CONF_AUTO_UPDATE, NULL);
 
-	if (auto_update)
-		/* Do send receive */
-		modest_ui_actions_do_send_receive_all (top_win, FALSE, FALSE, FALSE);
-	else
+	if (auto_update) {
+		/* Do send receive. Never set the current top window
+		   as we always assume that DBus send/receive requests
+		   are not user driven */
+
+		connect_when = modest_conf_get_int (modest_runtime_get_conf (), 
+						    MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL);
+		/* Perform a send and receive if the user selected to connect
+		   via any mean or if the current connection method is the
+		   same as the one specified by the user */
+		if (connect_when == MODEST_CONNECTED_VIA_ANY ||
+		    connect_when == modest_platform_get_current_connection ()) {
+			right_connection = TRUE;
+		}
+	} else {
 		/* Disable auto update */
 		modest_platform_set_update_interval (0);
+	}
+
+	if ((auto_update && right_connection) || data->manual) {
+		if (data->account_id) {
+			modest_ui_actions_do_send_receive (data->account_id, data->manual, FALSE, data->manual, NULL);
+		} else {
+			modest_ui_actions_do_send_receive_all (NULL, data->manual, FALSE, data->manual);
+		}
+	}
+
+	modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (),
+					    data->mail_op);
+
+	send_receive_performer_data_free (data);
 
 	gdk_threads_leave (); /* CHECKED */
 	
@@ -1153,25 +1188,23 @@ on_send_receive_performer(gboolean canceled,
 			  TnyAccount *account,
 			  gpointer user_data)
 {
-	ModestConnectedVia connect_when;
+	SendReceivePerformerData *data = (SendReceivePerformerData *) user_data;
 
-	if (err || canceled) {
+	if (err || canceled || data == NULL) {
 		g_idle_add (notify_error_in_dbus_callback, NULL);
+		if (data) {
+			send_receive_performer_data_free (data);
+		}
 		return;
 	}
 
-	connect_when = modest_conf_get_int (modest_runtime_get_conf (), 
-					    MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL);
-
-	/* Perform a send and receive if the user selected to connect
-	   via any mean or if the current connection method is the
-	   same as the one specified by the user */
-	if (connect_when == MODEST_CONNECTED_VIA_ANY ||
-	    connect_when == modest_platform_get_current_connection ()) {
-		g_idle_add (on_idle_send_receive, NULL);
+	data->mail_op = modest_mail_operation_new (NULL);
+	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+					 data->mail_op);
+	if (data->manual) {
+		g_idle_add (on_idle_send_receive, data);
 	} else {
-		/* We need this to allow modest to finish */
-		g_idle_add (notify_error_in_dbus_callback, NULL);
+		modest_heartbeat_add (on_idle_send_receive, data);
 	}
 }
 
@@ -1180,13 +1213,51 @@ static gint
 on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
 {
 	TnyDevice *device = modest_runtime_get_device ();
+	SendReceivePerformerData *srp_data;
+
+	srp_data = g_slice_new0 (SendReceivePerformerData);
+	srp_data->account_id = NULL;
+	srp_data->manual = FALSE;
+	srp_data->mail_op = NULL;
 
 	if (!tny_device_is_online (device))
-		modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, NULL);
+		modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, srp_data);
 	else
-		on_send_receive_performer (FALSE, NULL, NULL, NULL, NULL);
+		on_send_receive_performer (FALSE, NULL, NULL, NULL, srp_data);
 
- 	return OSSO_OK;
+	return OSSO_OK;
+}
+
+static gint
+on_send_receive_full (GArray *arguments, gpointer data, osso_rpc_t * retval)
+{
+ 	osso_rpc_t val;
+	gchar *account_id;
+	gboolean manual;
+	TnyDevice *device;
+	SendReceivePerformerData *srp_data;
+
+	val = g_array_index (arguments, osso_rpc_t, MODEST_DBUS_SEND_RECEIVE_FULL_ARG_ACCOUNT_ID);
+	account_id = g_strdup (val.value.s);
+	val = g_array_index (arguments, osso_rpc_t, MODEST_DBUS_SEND_RECEIVE_FULL_ARG_MANUAL);
+	manual = val.value.b;
+
+	srp_data = g_slice_new0 (SendReceivePerformerData);
+	srp_data->manual = manual;
+	if (account_id && account_id[0] != '\0') {
+		srp_data->account_id = account_id;
+	} else {
+		srp_data->account_id = NULL;
+		g_free (account_id);
+	}
+	srp_data->mail_op = NULL;
+	device = modest_runtime_get_device ();
+	if (!tny_device_is_online (device))
+		modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, srp_data);
+	else
+		on_send_receive_performer (FALSE, NULL, NULL, NULL, srp_data);
+
+	return OSSO_OK;
 }
 
 static gint
@@ -1194,7 +1265,7 @@ on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval)
 {
  	g_idle_add(on_idle_top_application, NULL);
 
- 	return OSSO_OK;
+	return OSSO_OK;
 }
 
 
@@ -1215,32 +1286,30 @@ on_idle_open_account (gpointer user_data)
 		top = modest_window_mgr_show_initial_window (mgr);
 
 #ifdef MODEST_TOOLKIT_HILDON2
-	if (MODEST_IS_ACCOUNTS_WINDOW (top)) {
-		GtkWidget *new_window;
-		ModestProtocolType store_protocol;
-		gboolean mailboxes_protocol;
-
-		store_protocol = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), 
-									acc_name);
-		mailboxes_protocol = 
-			modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (),
-									store_protocol,
-									MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS);
-
-		if (mailboxes_protocol) {
-			new_window = GTK_WIDGET (modest_mailboxes_window_new (acc_name));
-		} else {
-			new_window = GTK_WIDGET (modest_folder_window_new (NULL));
-			modest_folder_window_set_account (MODEST_FOLDER_WINDOW (new_window),
-							  acc_name);
-		}
+	GtkWidget *new_window;
+	ModestProtocolType store_protocol;
+	gboolean mailboxes_protocol;
+
+	store_protocol = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), 
+								acc_name);
+	mailboxes_protocol = 
+		modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (),
+								store_protocol,
+								MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS);
+
+	if (mailboxes_protocol) {
+		new_window = GTK_WIDGET (modest_mailboxes_window_new (acc_name));
+	} else {
+		new_window = GTK_WIDGET (modest_folder_window_new (NULL));
+		modest_folder_window_set_account (MODEST_FOLDER_WINDOW (new_window),
+						  acc_name);
+	}
 
-		if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (new_window), NULL)) {
-			gtk_widget_show (new_window);
-		} else {
-			gtk_widget_destroy (new_window);
-			new_window = NULL;
-		}
+	if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (new_window), NULL)) {
+		gtk_widget_show (new_window);
+	} else {
+		gtk_widget_destroy (new_window);
+		new_window = NULL;
 	}
 #else
 	if (MODEST_IS_MAIN_WINDOW (top)) {
@@ -1355,13 +1424,67 @@ on_idle_top_application (gpointer user_data)
 }
 #endif
 
-static gint 
+static gint
 on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval)
 {
 	/* Use g_idle to context-switch into the application's thread: */
  	g_idle_add(on_idle_top_application, NULL);
- 	
- 	return OSSO_OK;
+
+	return OSSO_OK;
+}
+
+static gboolean
+on_idle_open_edit_accounts_dialog (gpointer user_data)
+{
+	ModestWindow *top;
+	ModestWindowMgr *mgr;
+	gboolean closed;
+
+	/* This is a GDK lock because we are an idle callback and
+	 * the code below is or does Gtk+ code */
+
+	gdk_threads_enter (); /* CHECKED */
+
+	mgr = modest_runtime_get_window_mgr ();
+	closed = modest_window_mgr_close_all_but_initial (mgr);
+	top = modest_window_mgr_get_current_top (mgr);
+
+	if (closed) {
+		/* Show edit accounts dialog */
+		modest_ui_actions_on_accounts (NULL, top);
+	} else {
+		gboolean has_accounts;
+
+		has_accounts = modest_account_mgr_has_accounts (modest_runtime_get_account_mgr (),
+								TRUE);
+
+		/* Present the current top window */
+		gdk_threads_leave ();
+		on_idle_top_application (NULL);
+		gdk_threads_enter ();
+
+		/* Show edit accounts dialog if we're launching the
+		   program and there is no account (if there is at
+		   least one account then on_idle_top_application will
+		   show the accounts wizard */
+		if (!top && has_accounts) {
+			top = modest_window_mgr_get_current_top (mgr);
+			modest_ui_actions_on_accounts (NULL, top);
+		}
+	}
+
+	gdk_threads_leave (); /* CHECKED */
+
+	return FALSE; /* Do not call this callback again. */
+}
+
+static gint
+on_open_edit_accounts_dialog (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_edit_accounts_dialog, NULL);
+
+	return OSSO_OK;
 }
 
 static gboolean 
@@ -1379,18 +1502,38 @@ on_idle_show_memory_low (gpointer user_data)
 	return FALSE;
 }
 
+static gboolean
+on_idle_present_modal (gpointer user_data)
+{
+	gdk_threads_enter ();
+	gtk_window_present (user_data);
+	gdk_threads_leave ();
+
+	return FALSE;
+}
+
+
 /* Callback for normal D-BUS messages */
 gint
 modest_dbus_req_handler(const gchar * interface, const gchar * method,
 			GArray * arguments, gpointer data,
 			osso_rpc_t * retval)
 {
+	GtkWindow *dialog;
+
 	/* Check memory low conditions */
 	if (modest_platform_check_memory_low (NULL, FALSE)) {
 		g_idle_add (on_idle_show_memory_low, NULL);
 		goto param_error;
 	}
 
+	/* Check if there is already a dialog or note open */
+	dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr());
+	if (dialog) {
+		g_idle_add (on_idle_present_modal, dialog);
+		return OSSO_OK;
+	}
+
 	if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_MAIL_TO) == 0) {
 		if (arguments->len != MODEST_DBUS_MAIL_TO_ARGS_COUNT)
 			goto param_error;
@@ -1410,6 +1553,10 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method,
 		if (arguments->len != 0)
 			goto param_error;
 		return on_send_receive (arguments, data, retval);
+	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_SEND_RECEIVE_FULL) == 0) {
+		if (arguments->len != MODEST_DBUS_SEND_RECEIVE_FULL_ARGS_COUNT)
+			goto param_error;
+		return on_send_receive_full (arguments, data, retval);
 	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_COMPOSE_MAIL) == 0) {
 		if (arguments->len != MODEST_DBUS_COMPOSE_MAIL_ARGS_COUNT)
 			goto param_error;
@@ -1428,8 +1575,13 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method,
 		if (arguments->len != 0)
 			goto param_error;
 		modest_runtime_set_allow_shutdown (TRUE);
-		return on_top_application (arguments, data, retval); 
-	} else { 
+		return on_top_application (arguments, data, retval);
+	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_EDIT_ACCOUNTS_DIALOG) == 0) {
+		if (arguments->len != 0)
+			goto param_error;
+		modest_runtime_set_allow_shutdown (TRUE);
+		return on_open_edit_accounts_dialog (arguments, data, retval);
+	} else {
 		/* We need to return INVALID here so
 		 * libosso will return DBUS_HANDLER_RESULT_NOT_YET_HANDLED,
 		 * so that our modest_dbus_req_filter will then be tried instead.
@@ -1441,7 +1593,7 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method,
 	g_idle_add (notify_error_in_dbus_callback, NULL);
 	return OSSO_ERROR;
 }
-					 
+
 /* A complex D-Bus type (like a struct),
  * used to return various information about a search hit.
  */