2007-07-05 Murray Cumming <murrayc@murrayc.com>

* src/modest-tny-account.c: (on_connection_status_changed):
Really do not use tny_device_force_offline() here. See the previous comment.

pmo-trunk-r2580

diff --git a/ChangeLog b/ChangeLog
index a4f76b7..acb6b92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1 @@
-2007-07-04  Murray Cumming,,,  <murrayc@murrayc-desktop>
-
-       reviewed by: <delete if not using a buddy>
-
-       * src/modest-tny-account.c: (on_connection_status_changed):
-

 * please check the svn log instead
 * please check the svn log instead

diff --git a/ChangeLog2 b/ChangeLog2
index 1e5b7ec..79484be 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,3 +1,8 @@
+2007-07-05  Murray Cumming <murrayc@murrayc.com>
+
+       * src/modest-tny-account.c: (on_connection_status_changed):
+       Really do not use tny_device_force_offline() here. See the previous comment.
+

 2007-07-04  Murray Cumming <murrayc@murrayc.com>
 
        * src/modest-tny-account.c: (on_connection_status_changed):
 2007-07-04  Murray Cumming <murrayc@murrayc.com>
 
        * src/modest-tny-account.c: (on_connection_status_changed):

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index 2ea2cb5..08f416b 100644 (file)
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -167,12 +167,10 @@ on_connection_status_changed (TnyAccount *account, TnyConnectionStatus status, g
                 * because tinymail does not guarantee that this signal handler will be called 
                 * in the main thread.
                 */
                 * because tinymail does not guarantee that this signal handler will be called 
                 * in the main thread.
                 */

-               /* TODO: Commented out (and setting offline instead), because this causes hangs, probably related to 
+               /* TODO: Commented out, because this causes hangs, probably related to 

                 * our use of mainloops:
                 * modest_platform_connect_and_wait (NULL);
                 */
                 * our use of mainloops:
                 * modest_platform_connect_and_wait (NULL);
                 */

-                TnyDevice *device = modest_runtime_get_device ();
-                tny_device_force_offline (device);

        } else if (status == TNY_CONNECTION_STATUS_CONNECTED_BROKEN) {
                printf ("DEBUG: %s: Connection broken. Forcing TnyDevice offline.\n", 
                        __FUNCTION__);
        } else if (status == TNY_CONNECTION_STATUS_CONNECTED_BROKEN) {
                printf ("DEBUG: %s: Connection broken. Forcing TnyDevice offline.\n", 
                        __FUNCTION__);