Changeset 1822

Show
Ignore:
Timestamp:
04/22/07 17:22:01
Author:
pvanhoof
Message:

Made the queues virtual-aware and fixed a few search-n-replace bugs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1817 r1822  
    145145tny_generic_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err) 
    146146{ 
     147        TNY_GENERIC_SEND_QUEUE_GET_CLASS (self)->add_func (self, msg, err); 
     148        return; 
     149} 
     150 
     151static void 
     152tny_generic_send_queue_add_default (TnySendQueue *self, TnyMsg *msg, GError **err) 
     153{ 
    147154        TnyGenericSendQueuePriv *priv = TNY_GENERIC_SEND_QUEUE_GET_PRIVATE (self); 
    148155        TnyIterator *iter; 
    …… 
    229236tny_generic_send_queue_cancel (TnySendQueue *self, gboolean remove, GError **err) 
    230237{ 
     238        TNY_GENERIC_SEND_QUEUE_GET_CLASS (self)->cancel_func (self, remove, err); 
     239        return; 
     240} 
     241 
     242static void 
     243tny_generic_send_queue_cancel_default (TnySendQueue *self, gboolean remove, GError **err) 
     244{ 
    231245        TnyGenericSendQueuePriv *priv = TNY_GENERIC_SEND_QUEUE_GET_PRIVATE (self); 
    232246 
    …… 
    293307tny_generic_send_queue_get_sentbox (TnySendQueue *self) 
    294308{ 
     309        return TNY_GENERIC_SEND_QUEUE_GET_CLASS (self)->get_sentbox_func (self); 
     310} 
     311 
     312static TnyFolder* 
     313tny_generic_send_queue_get_sentbox_default (TnySendQueue *self) 
     314{ 
    295315        TnyGenericSendQueuePriv *priv = TNY_GENERIC_SEND_QUEUE_GET_PRIVATE (self); 
    296316        return TNY_FOLDER (g_object_ref (priv->sentbox)); 
    297317} 
    298  
    299318 
    300319static TnyFolder* 
    301320tny_generic_send_queue_get_outbox (TnySendQueue *self) 
     321{ 
     322        return TNY_GENERIC_SEND_QUEUE_GET_CLASS (self)->get_outbox_func (self); 
     323} 
     324 
     325static TnyFolder* 
     326tny_generic_send_queue_get_outbox_default (TnySendQueue *self) 
    302327{ 
    303328        TnyGenericSendQueuePriv *priv = TNY_GENERIC_SEND_QUEUE_GET_PRIVATE (self); 
    …… 
    375400        parent_class = g_type_class_peek_parent (klass); 
    376401        object_class = (GObjectClass*) klass; 
     402 
     403        klass->add_func = tny_generic_send_queue_add_default; 
     404        klass->get_sentbox_func = tny_generic_send_queue_get_sentbox_default; 
     405        klass->get_outbox_func = tny_generic_send_queue_get_outbox_default; 
     406        klass->cancel_func = tny_generic_send_queue_cancel_default; 
     407 
    377408        object_class->finalize = tny_generic_send_queue_finalize; 
    378409        g_type_class_add_private (object_class, sizeof (TnyGenericSendQueuePriv)); 

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

    r1816 r1822  
    3333#define TNY_IS_GENERIC_SEND_QUEUE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_GENERIC_SEND_QUEUE)) 
    3434#define TNY_IS_GENERIC_SEND_QUEUE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_GENERIC_SEND_QUEUE)) 
    35 #define TNY_GENERIC_SEND_QUEUE_GENERIC_CLASS(inst)  (G_TYPE_INSTANCE_GENERIC_CLASS ((inst), TNY_TYPE_GENERIC_SEND_QUEUE, TnyGenericSendQueueClass)) 
     35#define TNY_GENERIC_SEND_QUEUE_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_GENERIC_SEND_QUEUE, TnyGenericSendQueueClass)) 
    3636 
    3737typedef struct _TnyGenericSendQueue TnyGenericSendQueue; 
    …… 
    4646{ 
    4747        GObjectClass parent; 
     48 
     49        /* virtual methods */ 
     50        void (*add_func) (TnySendQueue *self, TnyMsg *msg, GError **err); 
     51        TnyFolder* (*get_sentbox_func) (TnySendQueue *self); 
     52        TnyFolder* (*get_outbox_func) (TnySendQueue *self); 
     53        void (*cancel_func) (TnySendQueue *self, gboolean remove, GError **err); 
    4854}; 
    4955 

  • trunk/libtinymail-queues/tny-get-msg-queue.c

    r1818 r1822  
    3333        TnyHeader *header; 
    3434        TnyGetMsgCallback callback; 
     35        TnyStatusCallback status_callback; 
    3536        gpointer user_data; 
    3637        GError *err; 
    …… 
    8586 * @header: a #TnyHeader object 
    8687 * @callback: The callback handler 
     88 * @status_callback: The status_callback handler 
    8789 * @user_data: user data for the callback 
    8890 * 
    …… 
    9193 **/ 
    9294void 
    93 tny_get_msg_queue_get_msg (TnyGetMsgQueue *self, TnyHeader *header, TnyGetMsgCallback callback, gpointer user_data) 
     95tny_get_msg_queue_get_msg (TnyGetMsgQueue *self, TnyHeader *header, TnyGetMsgCallback callback, TnyStatusCallback status_callback, gpointer user_data) 
     96{ 
     97        TNY_GET_MSG_QUEUE_GET_CLASS (self)->get_msg_func (self, header, callback, status_callback, user_data); 
     98        return; 
     99} 
     100 
     101static void 
     102tny_get_msg_queue_get_msg_default (TnyGetMsgQueue *self, TnyHeader *header, TnyGetMsgCallback callback, TnyStatusCallback status_callback, gpointer user_data) 
    94103{ 
    95104        TnyGetMsgQueuePriv *priv = TNY_GET_MSG_QUEUE_GET_PRIVATE (self); 
    …… 
    100109        info->header = TNY_HEADER (g_object_ref (header)); 
    101110        info->callback = callback; 
     111        info->status_callback = status_callback; 
    102112        info->user_data = user_data; 
    103113 
    …… 
    163173        parent_class = g_type_class_peek_parent (klass); 
    164174        object_class = (GObjectClass*) klass; 
     175 
     176        klass->get_msg_func = tny_get_msg_queue_get_msg_default; 
     177 
    165178        object_class->finalize = tny_get_msg_queue_finalize; 
    166179        g_type_class_add_private (object_class, sizeof (TnyGetMsgQueuePriv)); 

  • trunk/libtinymail-queues/tny-get-msg-queue.h

    r1816 r1822  
    4545{ 
    4646        GObjectClass parent; 
     47 
     48        /* virtual methods */ 
     49        void (*get_msg_func) (TnyGetMsgQueue *self, TnyHeader *header, TnyGetMsgCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    4750}; 
    4851 
    …… 
    5053TnyGetMsgQueue* tny_get_msg_queue_new (void); 
    5154 
    52 void tny_get_msg_queue_get_msg (TnyGetMsgQueue *self, TnyHeader *header, TnyGetMsgCallback callback, gpointer user_data); 
     55void tny_get_msg_queue_get_msg (TnyGetMsgQueue *self, TnyHeader *header, TnyGetMsgCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    5356 
    5457