From: Vivek Sekar <viveksekar@gmail.com>
Date: Mon, 8 Sep 2008 07:59:52 +0000 (+0000)
Subject:   * Merged fix for 87412 from trunk, along with the fix in tinymail 3755
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=82eb8b5accf8762ab2359470f468a0a02260c344;p=modest

  * Merged fix for 87412 from trunk, along with the fix in tinymail 3755

pmo-diablo-r5484
---

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index 48ce5d7..5944fc3 100644
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -875,8 +875,6 @@ on_idle_send_receive(gpointer user_data)
 	return FALSE;
 }
 
-
-
 static gint 
 on_dbus_method_dump_send_queues (DBusConnection *con, DBusMessage *message)
 {
@@ -1068,20 +1066,11 @@ on_dbus_method_dump_accounts (DBusConnection *con, DBusMessage *message)
 	return OSSO_OK;
 }
 
-static void
-on_send_receive_performer(gboolean canceled, 
-			  GError *err,
-			  GtkWindow *parent_window,
-			  TnyAccount *account,
-			  gpointer user_data)
-{
+static gint 
+on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
+{ 	
 	ModestConnectedVia connect_when;
 
-	if (err || canceled) {
-		g_idle_add (notify_error_in_dbus_callback, NULL);
-		return;
-	}
-
 	connect_when = modest_conf_get_int (modest_runtime_get_conf (), 
 					    MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL);
 	
@@ -1095,18 +1084,6 @@ on_send_receive_performer(gboolean canceled,
 		/* We need this to allow modest to finish */
 		g_idle_add (notify_error_in_dbus_callback, NULL);
 	}
-}
-
-
-static gint 
-on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
-{ 	
-	TnyDevice *device = modest_runtime_get_device ();
-
-	if (!tny_device_is_online (device))
-		modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, NULL);
-	else
-		on_send_receive_performer (FALSE, NULL, NULL, NULL, NULL);
  	
  	return OSSO_OK;
 }