Changeset 2301
- Timestamp:
- 06/29/07 10:24:46
- Files:
-
- trunk/ChangeLog (modified) (1 diff)
- trunk/libtinymail-camel/tny-camel-account.c (modified) (2 diffs)
- trunk/libtinymail-camel/tny-camel-store-account.c (modified) (2 diffs)
- trunk/libtinymail/tny-account.h (modified) (1 diff)
- trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ChangeLog
r2298 r2301 1 2007-06-29 Philip Van Hoof <pvanhoof@gnome.org> 2 3 * Various connectivity bugfixes 4 * Fixed a locking problem when connectivity changes 5 1 6 2007-06-28 Philip Van Hoof <pvanhoof@gnome.org> 2 7 trunk/libtinymail-camel/tny-camel-account.c
r2298 r2301 137 137 goto fail; 138 138 139 apriv->service->reconnecting = TRUE; 140 141 if (apriv->service->reconnecter) 142 apriv->service->reconnecter (apriv->service, FALSE, apriv->service->data); 143 139 144 camel_service_disconnect (apriv->service, FALSE, &ex); 140 145 if (camel_exception_is_set (&ex)) 141 146 camel_exception_clear (&ex); 142 147 camel_service_connect (apriv->service, &ex); 148 149 150 if (apriv->service->reconnection) 151 apriv->service->reconnection (apriv->service, TRUE, apriv->service->data); 152 else 153 apriv->service->reconnection (apriv->service, FALSE, apriv->service->data); 154 155 apriv->service->reconnecting = FALSE; 156 143 157 } 144 158 … … 1065 1079 priv->url_string = NULL; 1066 1080 priv->chooks = NULL; 1067 priv->status = TNY_CONNECTION_STATUS_ DISCONNECTED;1081 priv->status = TNY_CONNECTION_STATUS_INIT; 1068 1082 1069 1083 priv->ex = camel_exception_new (); trunk/libtinymail-camel/tny-camel-store-account.c
r2298 r2301 199 199 #endif 200 200 201 } else 202 emit = FALSE; 201 } 203 202 204 203 … … 243 242 #endif 244 243 244 245 245 if (suc) { 246 246 /* Preparing the offline cache succeeded */ 247 248 if (apriv->status != TNY_CONNECTION_STATUS_DISCONNECTED)247 emit = FALSE; /* Let disconnection handle it */ 248 /*if (apriv->status != TNY_CONNECTION_STATUS_DISCONNECTED) 249 249 emit = TRUE; 250 apriv->status = TNY_CONNECTION_STATUS_DISCONNECTED; 250 apriv->status = TNY_CONNECTION_STATUS_DISCONNECTED;*/ 251 251 } else { 252 252 trunk/libtinymail/tny-account.h
r2225 r2301 49 49 TNY_CONNECTION_STATUS_CONNECTED_BROKEN, 50 50 TNY_CONNECTION_STATUS_CONNECTED, 51 TNY_CONNECTION_STATUS_RECONNECTING 51 TNY_CONNECTION_STATUS_RECONNECTING, 52 TNY_CONNECTION_STATUS_INIT 52 53 }; 53 54 trunk/tests/c-demo/tny-demoui-summary-view.c
r2298 r2301 256 256 if (status == TNY_CONNECTION_STATUS_CONNECTED_BROKEN) 257 257 { 258 tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (a), FALSE, NULL);258 /* tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (a), FALSE, NULL); */ 259 259 str = "con broken"; 260 260 }
