Changeset 3281

Timestamp:

01/20/08 22:43:30

Author:

pvanhoof

Message:

Bugfixes about error reporting

Files:

• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (1 diff)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (2 diffs)

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c

@@ -4338 +4338 @@
-handle_freeup (CamelImapStore *store, gint nread, CamelException *ex)
-{
-
-
+
-                if (errno == EINTR)
-                        camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));
-
+ if (!camel_exception_is_set (ex))
-                        camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_LOST_CONNECTION,
-                                              _("Server unexpectedly disconnected: %s"),
-                                              g_strerror (errno));
-
-                camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-        }

trunk/libtinymail-camel/tny-camel-folder.c

@@ -566 +566 @@
-                        if (!priv->folder || camel_exception_is_set (&priv->load_ex) || !CAMEL_IS_FOLDER (priv->folder))
-                        {
-g_critical ("Can't load folder: %s", camel_exception_get_description (&priv->load_ex));
+/* g_critical ("Can't load folder: %s", camel_exception_get_description (&priv->load_ex)); */
-
-                                priv->folder = NULL;

trunk/libtinymail-camel/tny-camel-store-account.c

@@ -1948 +1948 @@
-        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-
+        if (!apriv->service) {
+                GError *err;
+                g_set_error (&err, TNY_SYSTEM_ERROR, TNY_SYSTEM_ERROR_MEMORY, 
+                        _("Internal error, account not ready"));
+                callback ((TnyCamelAccount *) self, TRUE, err, user_data);
+                g_error_free (err);
+                return;
+        }
+
-        /* Idle info for the callbacks */
-        info = g_slice_new0 (GoingOnlineInfo);

trunk/tests/c-demo/tny-demoui-summary-view.c

@@ -857 +857 @@
-
-
+static void 
+set_folder_cb (TnyFolder *self, gboolean cancelled, TnyList *headers, GError *err, gpointer user_data)
+{
+        if (err) {
+                TnySummaryView *self = user_data;
+                GtkWidget *edialog;
+                edialog = gtk_message_dialog_new (
+                                  GTK_WINDOW (gtk_widget_get_parent (GTK_WIDGET (self))),
+                                  GTK_DIALOG_DESTROY_WITH_PARENT,
+                                  GTK_MESSAGE_ERROR,
+                                  GTK_BUTTONS_CLOSE,
+                                  err->message);
+                g_signal_connect_swapped (edialog, "response",
+                        G_CALLBACK (gtk_widget_destroy), edialog);
+                gtk_widget_show_all (edialog);
+        }
+}
-
-static void
@@ -910 +927 @@
-                        hmodel = tny_gtk_header_list_model_new ();
-                        tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL (hmodel), 
-NULL
+set_folder_cb
-
-                        g_mutex_lock (priv->monitor_lock);