Updated Modest to the latest Tinymail API

pmo-trunk-r3296

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index b8ff11f..d44ffb6 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -964,13 +964,9 @@ set_account_to_online (TnyAccount *account)
                 * a) They fundamentally need network access, so they can't really be offline.
                 * b) That might cause a transport connection to happen too early.
                 */
-               GError *error = NULL;
-               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), TRUE, &error);
-               if (error) {
-                       g_warning ("%s: tny_camel_account_set_online() returned a GError:\n  %s\n", 
-                               __FUNCTION__, error->message);
-                       g_error_free (error);   
-               }
+
+               /* The last argument is user_data, the NULL before that is the callback */
+               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), TRUE, NULL, NULL);
        }
        #endif
 }

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 177b1ba..af6375b 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -306,7 +306,7 @@ static void
 foreach_account_disconnect (gpointer data, 
                            gpointer user_data)
 {
-       tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(data), FALSE, NULL);
+       tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(data), FALSE, NULL, NULL);
 }
 
 
@@ -1062,6 +1062,7 @@ modest_tny_account_store_alert (TnyAccountStore *self,
        gchar *prompt = NULL;
        gboolean retval;
 
+
        g_return_val_if_fail (account, FALSE);
        g_return_val_if_fail (error, FALSE);