* Added preferred edit format global setting

[modest] / src / modest-tny-account-store.c

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 0e786e2..8c7191d 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -56,7 +56,11 @@
 
 #ifdef MODEST_PLATFORM_MAEMO
 #include <tny-maemo-conic-device.h>
+#ifdef MODEST_HILDON_VERSION_0
 #include <hildon-widgets/hildon-note.h>
+#else
+#include <hildon/hildon-note.h>
+#endif
 #endif
 
 /* 'private'/'protected' functions */
@@ -227,8 +231,9 @@ on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean se
 
 
 static void
-on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean server_account,
-                   const gchar *key, gpointer user_data)
+on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account,
+                              const gchar *key, gboolean server_account, gpointer user_data)
+
 {
        ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
        ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
@@ -641,12 +646,14 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
        switch (error->code)
        {
                case TNY_ACCOUNT_ERROR_TRY_CONNECT:
-                       prompt = _("Modest account not yet fully configured");
-                       break;
-               case TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT:
-                       g_warning("%s: TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT: message=%s", 
-                               __FUNCTION__, error->message); 
-                       prompt = _("Unknown Tinymail error (TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT)");
+               /* The tinymail camel implementation just sends us this for almost 
+                * everything, so we have to guess at the cause.
+                * It could be a wrong password, or inability to resolve a hostname, 
+                * or lack of network, or something entirely different: */
+               case TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT: 
+                   g_debug ("%s: Handling GError domain=%d, code=%d, message=%s", 
+                               __FUNCTION__, error->domain, error->code, error->message);
+                       prompt = _("Modest account not yet fully configured.");
                        break;
                default:
                        g_warning ("%s: Unhandled GError code: %d, message=%s",