Changeset 2204

Timestamp:

06/18/07 13:29:38

Author:

pvanhoof

Message:

API changes in the error-happened signal

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-send-queue.c (modified) (9 diffs)
• trunk/libtinymail/tny-header.c (modified) (1 diff)
• trunk/libtinymail/tny-send-queue.c (modified) (2 diffs)
• trunk/libtinymail/tny-signals-marshal.list (modified) (1 diff)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (4 diffs)

trunk/ChangeLog

@@ -3 +3 @@
-        * Fixed the From and the Error reporting when sending messages
-        * Fixed the support for Yahoo's SMTP
+        * Added some more information to the error-happened signal for
+        TnySendQueue
+
+        * This was a major API change
-
-2007-06-17  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/libtinymail-camel/tny-camel-send-queue.c

@@ -48 +48 @@
-typedef struct {
-        TnySendQueue *self;
-
+
+
-        GError *error;
-        gint i, total;
@@ -58 +59 @@
-        ErrorInfo *info = data;
-        g_signal_emit (info->self, tny_send_queue_signals [TNY_SEND_QUEUE_ERROR_HAPPENED], 
-
+header, info->
-        return FALSE;
-}
@@ -78 +79 @@
-
-static void
-
+Header *header, Tny
-{
-        ErrorInfo *info = g_slice_new0 (ErrorInfo);
@@ -88 +89 @@
-        if (msg)
-                info->msg = TNY_MSG (g_object_ref (G_OBJECT (msg)));
+        if (header)
+                info->header = TNY_HEADER (g_object_ref (G_OBJECT (header)));
-
-        info->i = i;
@@ -122 +125 @@
-                if (terror != NULL)
-                {
-
+NULL, 
-                        g_error_free (terror);
-                        g_object_unref (G_OBJECT (list));
@@ -155 +158 @@
-                        if (ferror != NULL)
-                        {
-msg
+NULL, NULL
-                                g_error_free (ferror);
-                                g_object_unref (G_OBJECT (headers));
@@ -191 +194 @@
-                        tny_list_prepend (hassent, G_OBJECT (header));
-                        msg = tny_folder_get_msg (outbox, header, &err);
-
+
+
+
-
-                        if (err == NULL) 
@@ -198 +203 @@
-
-                                if (err != NULL) {
-
+header, 
-                                        priv->do_continue = FALSE;
-                                }
-                        } else  {
-
+header, 
-                                priv->do_continue = FALSE;
-                        }
@@ -214 +219 @@
-                                        if (newerr != NULL) 
-                                        {
-
+header, 
-                                                priv->do_continue = FALSE;
-                                                g_error_free (newerr);

trunk/libtinymail/tny-header.c

@@ -553 +553 @@
-                type = g_type_register_static (G_TYPE_INTERFACE,
-                        "TnyHeader", &info, 0);
+                g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
+
-        }
-

trunk/libtinymail/tny-send-queue.c

@@ -163 +163 @@
- * TnySendQueue::error-happened
- * @self: the object on which the signal is emitted
-
-
-
+
+
+
+
- *
- *
@@ -176 +177 @@
-                        G_STRUCT_OFFSET (TnySendQueueIface, error_happened),
-                        NULL, NULL,
-
-2
+_POINTER
+3, TNY_TYPE_HEADER
-
-                initialized = TRUE;

trunk/libtinymail/tny-signals-marshal.list

@@ -1 @@
-
+,POINTER

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

@@ -192 +192 @@
-}
-
+
+typedef struct
+{
+        TnySummaryView *self;
+        TnyMsg *msg;
+        TnyHeader *header;
+} OnResponseInfo;
+
-static void
-on_response (GtkDialog *dialog, gint arg1, gpointer user_data)
-{
+        OnResponseInfo *info = (OnResponseInfo *) user_data;
+        TnySummaryView *self = info->self;
+        TnyDemouiSummaryViewPriv *priv = TNY_DEMOUI_SUMMARY_VIEW_GET_PRIVATE (self);
+        TnyHeader *header = info->header;
+        TnyMsg *msg = info->msg;
+
+        if (arg1 == GTK_RESPONSE_YES)
+        {
+                TnyFolder *outbox = tny_send_queue_get_outbox (priv->send_queue);
+                tny_folder_remove_msg (outbox, header, NULL);
+                tny_folder_sync (outbox, TRUE, NULL);
+                g_object_unref (outbox);
+        }
+
+        g_object_unref (msg);
+        g_object_unref (header);
+        g_object_unref (self);
+
-        gtk_widget_destroy (GTK_WIDGET (dialog));
+        g_slice_free (OnResponseInfo, info);
-}
-
-static void 
-
-
+
+
+
+
+
-        GtkWidget *dialog = gtk_message_dialog_new (NULL, 0,
-
-
+
+
+
+
+
+
+
-        gtk_widget_show_all (dialog);
-
-        return;
-}
-
-static void 
-
-
+
+
+
-        TnyAccountStore *account_store = priv->account_store;
-        GtkTreeModel *sortable, *maccounts, *mailbox_model;
@@ -267 +302 @@
-                priv->send_queue = tny_camel_send_queue_new ((TnyCamelTransportAccount *) tacc);
-                g_signal_connect (G_OBJECT (priv->send_queue), "error-happened",
-priv
+self
-                g_object_unref (tacc);
-                g_object_unref (iter);
@@ -289 +324 @@
-accounts_reloaded (TnyAccountStore *store, gpointer user_data)
-{
-
-
+
-        return;
-}
@@ -427 +461 @@
-        priv->accounts_reloaded_signal = g_signal_connect (
-                G_OBJECT (account_store), "accounts_reloaded",
-priv
-
-priv
+self
+
+(TnySummaryView *) self
-
-        g_object_unref (G_OBJECT (device));