Changeset 1879

Show
Ignore:
Timestamp:
05/02/07 20:52:18
Author:
jfernandez
Message:

* Change API headers of async functions to pass a status callback
method to get progress information about task execution.

  • transfer_msgs_async_fun
        • get_folders_async_func

* Camel implementation functions have been changed, but NULL was assigned
to status_callback, for the moment.
* Changes into tny-gtk-folder-store were required too.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r1869 r1879  
     12007-05-02  Javier Fernandez Garcia-Boente  <jfernandez@igalia.com> 
     2 
     3        * Change API headers of async functions to pass a status callback 
     4        method to get progress information about task execution.  
     5                * transfer_msgs_async_fun 
     6                * get_folders_async_func 
     7        * Camel implementation functions have been changed, but NULL was assigned 
     8        to status_callback, for the moment.      
     9 
    1102007-04-30  Philip Van Hoof  <pvanhoof@gnome.org> 
    211 

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

    r1866 r1879  
    19871987 
    19881988static void 
    1989 tny_camel_folder_transfer_msgs_async (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, gpointer user_data) 
    1990 { 
    1991         TNY_CAMEL_FOLDER_GET_CLASS (self)->transfer_msgs_async_func (self, header_list, folder_dst, delete_originals, callback, user_data); 
    1992         return; 
    1993 } 
    1994  
    1995 static void 
    1996 tny_camel_folder_transfer_msgs_async_default (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, gpointer user_data) 
     1989tny_camel_folder_transfer_msgs_async (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, TnyStatusCallback status_callback, gpointer user_data) 
     1990{ 
     1991        TNY_CAMEL_FOLDER_GET_CLASS (self)->transfer_msgs_async_func (self, header_list, folder_dst, delete_originals, callback, status_callback, user_data); 
     1992        return; 
     1993} 
     1994 
     1995static void 
     1996tny_camel_folder_transfer_msgs_async_default (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, TnyStatusCallback status_callback, gpointer user_data) 
    19971997{ 
    19981998        TransferMsgsInfo *info; 
    …… 
    27212721 
    27222722static void  
    2723 tny_camel_folder_get_folders_async (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data) 
    2724 { 
    2725         TNY_CAMEL_FOLDER_GET_CLASS (self)->get_folders_async_func (self, list, callback, query, user_data); 
     2723tny_camel_folder_get_folders_async (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, TnyStatusCallback status_callback, gpointer user_data) 
     2724{ 
     2725        TNY_CAMEL_FOLDER_GET_CLASS (self)->get_folders_async_func (self, list, callback, query, status_callback, user_data); 
    27262726} 
    27272727 
    27282728static void  
    2729 tny_camel_folder_get_folders_async_default (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data) 
     2729tny_camel_folder_get_folders_async_default (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, TnyStatusCallback status_callback, gpointer user_data) 
    27302730{ 
    27312731        GetFoldersInfo *info; 

  • trunk/libtinymail-camel/tny-camel-folder.h

    r1820 r1879  
    7676        void (*refresh_func) (TnyFolder *self, GError **err); 
    7777        void (*transfer_msgs_func) (TnyFolder *self, TnyList *headers, TnyFolder *folder_dst, gboolean delete_originals, GError **err); 
    78         void (*transfer_msgs_async_func) (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, gpointer user_data); 
     78        void (*transfer_msgs_async_func) (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    7979        TnyFolder* (*copy_func) (TnyFolder *self, TnyFolderStore *into, const gchar *new_name, gboolean del, GError **err); 
    8080        void (*poke_status_func) (TnyFolder *self); 
    …… 
    8585        TnyFolderCaps (*get_caps_func) (TnyFolder *self); 
    8686 
    87         void (*get_folders_async_func) (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data); 
     87        void (*get_folders_async_func) (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, TnyStatusCallback status_callback, gpointer user_data); 
    8888        void (*get_folders_func) (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, GError **err); 
    8989        void (*remove_folder_func) (TnyFolderStore *self, TnyFolder *folder, GError **err); 

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

    r1866 r1879  
    813813 
    814814static void 
    815 tny_camel_store_account_get_folders_async (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data) 
    816 { 
    817         TNY_CAMEL_STORE_ACCOUNT_GET_CLASS (self)->get_folders_async_func (self, list, callback, query, user_data); 
     815tny_camel_store_account_get_folders_async (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, TnyStatusCallback status_callback, gpointer user_data) 
     816{ 
     817        TNY_CAMEL_STORE_ACCOUNT_GET_CLASS (self)->get_folders_async_func (self, list, callback, query, status_callback, user_data); 
    818818} 
    819819 
    820820static void  
    821 tny_camel_store_account_get_folders_async_default (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data) 
     821tny_camel_store_account_get_folders_async_default (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, TnyStatusCallback status_callback, gpointer user_data) 
    822822{ 
    823823        GetFoldersInfo *info; 

  • trunk/libtinymail-camel/tny-camel-store-account.h

    r1737 r1879  
    5050 
    5151        /* virtual methods */ 
    52         void (*get_folders_async_func) (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data); 
     52        void (*get_folders_async_func) (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, TnyStatusCallback status_callback, gpointer user_data); 
    5353        void (*get_folders_func) (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, GError **err); 
    5454        void (*remove_folder_func) (TnyFolderStore *self, TnyFolder *folder, GError **err); 

  • trunk/libtinymail/tny-combined-account.c

    r1877 r1879  
    300300 
    301301static void 
    302 tny_combined_account_get_folders_async (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data) 
    303 { 
    304         TnyCombinedAccountPriv *priv = TNY_COMBINED_ACCOUNT_GET_PRIVATE (self); 
    305  
    306         tny_folder_store_get_folders_async (TNY_FOLDER_STORE (priv->store_account), list, callback, query, user_data); 
     302tny_combined_account_get_folders_async (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, TnyStatusCallback status_callback, gpointer user_data) 
     303{ 
     304        TnyCombinedAccountPriv *priv = TNY_COMBINED_ACCOUNT_GET_PRIVATE (self); 
     305 
     306        tny_folder_store_get_folders_async (TNY_FOLDER_STORE (priv->store_account), list, callback, query, status_callback, user_data); 
    307307} 
    308308 

  • trunk/libtinymail/tny-folder-store.c

    r1856 r1879  
    296296 **/ 
    297297void  
    298 tny_folder_store_get_folders_async (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data) 
     298tny_folder_store_get_folders_async (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, TnyStatusCallback status_callback, gpointer user_data) 
    299299{ 
    300300#ifdef DBC /* require */ 
    …… 
    308308#endif 
    309309 
    310         TNY_FOLDER_STORE_GET_IFACE (self)->get_folders_async_func (self, list, callback, query, user_data); 
     310        TNY_FOLDER_STORE_GET_IFACE (self)->get_folders_async_func (self, list, callback, query, status_callback, user_data); 
    311311 
    312312#ifdef DBC /* ensure */ 

  • trunk/libtinymail/tny-folder-store.h

    r1636 r1879  
    4949   TnyFolder* (*create_folder_func) (TnyFolderStore *self, const gchar *name, GError **err); 
    5050   void (*get_folders_func) (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, GError **err); 
    51    void (*get_folders_async_func) (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data); 
     51       void (*get_folders_async_func) (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, TnyStatusCallback status_callback, gpointer user_data); 
    5252   void (*add_observer_func) (TnyFolderStore *self, TnyFolderStoreObserver *observer); 
    5353   void (*remove_observer_func) (TnyFolderStore *self, TnyFolderStoreObserver *observer); 
    …… 
    6060TnyFolder *tny_folder_store_create_folder (TnyFolderStore *self, const gchar *name, GError **err); 
    6161void tny_folder_store_get_folders (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, GError **err); 
    62 void tny_folder_store_get_folders_async (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data); 
     62void tny_folder_store_get_folders_async (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, TnyStatusCallback status_callback, gpointer user_data); 
    6363void tny_folder_store_add_observer (TnyFolderStore *self, TnyFolderStoreObserver *observer); 
    6464void tny_folder_store_remove_observer (TnyFolderStore *self, TnyFolderStoreObserver *observer); 

  • trunk/libtinymail/tny-folder.c

    r1866 r1879  
    762762 * @delete_originals: if TRUE then move msgs, else copy them 
    763763 * @callback: The callback handler 
     764 * @status_callback: the status callback handler 
    764765 * @user_data: user data for the callback 
    765766 *  
    …… 
    785786 **/ 
    786787void  
    787 tny_folder_transfer_msgs_async (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, gpointer user_data) 
     788tny_folder_transfer_msgs_async (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, TnyStatusCallback status_callback, gpointer user_data) 
    788789{ 
    789790#ifdef DBC /* require */ 
    …… 
    797798#endif 
    798799 
    799         TNY_FOLDER_GET_IFACE (self)->transfer_msgs_async_func (self, header_list, folder_dst, delete_originals, callback, user_data); 
     800        TNY_FOLDER_GET_IFACE (self)->transfer_msgs_async_func (self, header_list, folder_dst, delete_originals, callback, status_callback, user_data); 
    800801        return; 
    801802} 

  • trunk/libtinymail/tny-folder.h

    r1820 r1879  
    108108        void (*refresh_func) (TnyFolder *self, GError **err); 
    109109        void (*transfer_msgs_func) (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, GError **err); 
    110         void (*transfer_msgs_async_func) (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, gpointer user_data); 
     110        void (*transfer_msgs_async_func) (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    111111        TnyFolder* (*copy_func) (TnyFolder *self, TnyFolderStore *into, const gchar *new_name, gboolean del, GError **err); 
    112112        void (*poke_status_func) (TnyFolder *self); 
    …… 
    144144void tny_folder_refresh (TnyFolder *self, GError **err); 
    145145void tny_folder_transfer_msgs (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, GError **err); 
    146 void tny_folder_transfer_msgs_async (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, gpointer user_data); 
     146void tny_folder_transfer_msgs_async (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, TnyStatusCallback status_callback, gpointer user_data); 
    147147TnyFolder* tny_folder_copy (TnyFolder *self, TnyFolderStore *into, const gchar *new_name, gboolean del, GError **err); 
    148148void tny_folder_poke_status (TnyFolder *self); 

  • trunk/libtinymail/tny-merge-folder.c

    r1856 r1879  
    738738 
    739739static void 
    740 tny_merge_folder_transfer_msgs_async (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, gpointer user_data) 
     740tny_merge_folder_transfer_msgs_async (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, TnyStatusCallback status_callback, gpointer user_data) 
    741741{ 
    742742        TransferMsgsInfo *info; 

  • trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c

    r1866 r1879  
    116116        hlrp->parent_tree_iter = parent_tree_iter; 
    117117 
    118         tny_folder_store_get_folders_async (store, folders, recurse_get_folders_callback, self->query, hlrp); 
     118        tny_folder_store_get_folders_async (store, folders, recurse_get_folders_callback, NULL, self->query, hlrp); 
    119119} 
    120120