Changeset 2206

Show
Ignore:
Timestamp:
06/18/07 13:48:15
Author:
pvanhoof
Message:

SendQueue? error reporting

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2204 r2206  
    177177                        G_STRUCT_OFFSET (TnySendQueueIface, error_happened), 
    178178                        NULL, NULL, 
    179                         tny_marshal_VOID__POINTER_POINTER_POINTER, 
     179                        tny_marshal_VOID__OBJECT_OBJECT_POINTER, 
    180180                        G_TYPE_NONE, 3, TNY_TYPE_HEADER, TNY_TYPE_MSG, G_TYPE_POINTER); 
    181181 

  • trunk/libtinymail/tny-send-queue.h

    r2200 r2206  
    5454         
    5555        /* Signals */ 
    56         void (*msg_sent) (TnySendQueue *self, TnyMsg *msg, guint nth, guint total, gpointer user_data); 
    57         void (*error_happened) (TnySendQueue *self, TnyMsg *msg, GError *err, gpointer user_data); 
     56        void (*msg_sent) (TnySendQueue *self, TnyMsg *msg, gpointer user_data); 
     57        void (*error_happened) (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, gpointer user_data); 
    5858 
    5959        /* methods */ 

  • trunk/libtinymail/tny-signals-marshal.list

    r2204 r2206  
    1 VOID:POINTER,POINTER,POINTER 
     1VOID:OBJECT,OBJECT,POINTER 

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

    r2204 r2206  
    196196{ 
    197197        TnySummaryView *self; 
    198         TnyMsg *msg; 
    199198        TnyHeader *header; 
    200199} OnResponseInfo; 
    …… 
    207206        TnyDemouiSummaryViewPriv *priv = TNY_DEMOUI_SUMMARY_VIEW_GET_PRIVATE (self); 
    208207        TnyHeader *header = info->header; 
    209         TnyMsg *msg = info->msg; 
     208 
    210209 
    211210        if (arg1 == GTK_RESPONSE_YES) 
    …… 
    217216        } 
    218217 
    219         g_object_unref (msg); 
    220218        g_object_unref (header); 
    221219        g_object_unref (self); 
    …… 
    228226on_send_queue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, gpointer user_data) 
    229227{ 
    230         gchar *str = g_strdup_printf ("%s. Do you want to remove the message (%s)?", 
    231                 err->message, tny_header_get_subject (header)); 
    232         OnResponseInfo *info = g_slice_new (OnResponseInfo); 
    233         GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, 
    234                 GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO, str); 
    235         g_free (str); 
    236         info->self = g_object_ref (user_data); 
    237         info->msg = g_object_ref (msg); 
    238         info->header = g_object_ref (header); 
    239         g_signal_connect (G_OBJECT (dialog), "response", 
    240                 G_CALLBACK (on_response), info); 
    241         gtk_widget_show_all (dialog); 
     228        if (header) 
     229        { 
     230                gchar *str = g_strdup_printf ("%s. Do you want to remove the message (%s)?", 
     231                        err->message, tny_header_get_subject (header)); 
     232                OnResponseInfo *info = g_slice_new (OnResponseInfo); 
     233                GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, 
     234                        GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO, str); 
     235                g_free (str); 
     236                info->self = g_object_ref (user_data); 
     237                info->header = g_object_ref (header); 
     238                g_signal_connect (G_OBJECT (dialog), "response", 
     239                        G_CALLBACK (on_response), info); 
     240                gtk_widget_show_all (dialog); 
     241        } 
    242242        return; 
    243243}