Changeset 1820
- Timestamp:
- 04/22/07 14:08:11
- Files:
-
- trunk/ChangeLog (modified) (1 diff)
- trunk/libtinymail-camel/tny-camel-folder.c (modified) (7 diffs)
- trunk/libtinymail-camel/tny-camel-folder.h (modified) (2 diffs)
- trunk/libtinymail/tny-folder.c (modified) (5 diffs)
- trunk/libtinymail/tny-folder.h (modified) (4 diffs)
- trunk/libtinymail/tny-merge-folder.c (modified) (5 diffs)
- trunk/libtinymail/tny-shared.h (modified) (2 diffs)
- trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ChangeLog
r1817 r1820 4 4 generic way (doesn't strictly depend on the libtinymail-camel impl 5 5 libraries like the TnyCamelSendQueue type) 6 * Added the status_callback to tny_folder_get_msg_async 7 * Renamed the TnyFolderRefreshStatusCallback to TnyStatusCallback 6 8 7 9 * This was a minor API change (new type added) 10 * This was a major API change for tny_folder_get_msg_async and 11 tny_folder_refresh_async (TnyStatusCallback added and renamed) 8 12 9 13 2007-04-21 Philip Van Hoof <pvanhoof@gnome.org> trunk/libtinymail-camel/tny-camel-folder.c
r1760 r1820 704 704 TnyFolder *self; 705 705 TnyRefreshFolderCallback callback; 706 Tny RefreshFolderStatusCallback status_callback;706 TnyStatusCallback status_callback; 707 707 gpointer user_data; 708 708 gboolean cancelled; … … 926 926 927 927 static void 928 tny_camel_folder_refresh_async (TnyFolder *self, TnyRefreshFolderCallback callback, Tny RefreshFolderStatusCallback status_callback, gpointer user_data)928 tny_camel_folder_refresh_async (TnyFolder *self, TnyRefreshFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data) 929 929 { 930 930 TNY_CAMEL_FOLDER_GET_CLASS (self)->refresh_async_func (self, callback, status_callback, user_data); … … 946 946 **/ 947 947 static void 948 tny_camel_folder_refresh_async_default (TnyFolder *self, TnyRefreshFolderCallback callback, Tny RefreshFolderStatusCallback status_callback, gpointer user_data)948 tny_camel_folder_refresh_async_default (TnyFolder *self, TnyRefreshFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data) 949 949 { 950 950 RefreshFolderInfo *info; … … 1184 1184 guint depth; 1185 1185 TnyGetMsgCallback callback; 1186 TnyStatusCallback status_callback; 1186 1187 TnySessionCamel *session; 1187 1188 } GetMsgInfo; … … 1257 1258 } 1258 1259 static void 1259 tny_camel_folder_get_msg_async (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, gpointer user_data)1260 { 1261 return TNY_CAMEL_FOLDER_GET_CLASS (self)->get_msg_async_func (self, header, callback, user_data);1260 tny_camel_folder_get_msg_async (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, TnyStatusCallback status_callback, gpointer user_data) 1261 { 1262 return TNY_CAMEL_FOLDER_GET_CLASS (self)->get_msg_async_func (self, header, callback, status_callback, user_data); 1262 1263 } 1263 1264 … … 1298 1299 1299 1300 static void 1300 tny_camel_folder_get_msg_async_default (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, gpointer user_data)1301 tny_camel_folder_get_msg_async_default (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, TnyStatusCallback status_callback, gpointer user_data) 1301 1302 { 1302 1303 GetMsgInfo *info; … … 1319 1320 info->header = header; 1320 1321 info->callback = callback; 1322 info->status_callback = status_callback; 1321 1323 info->user_data = user_data; 1322 1324 info->depth = g_main_depth (); trunk/libtinymail-camel/tny-camel-folder.h
r1737 r1820 63 63 TnyMsg* (*get_msg_func) (TnyFolder *self, TnyHeader *header, GError **err); 64 64 TnyMsg* (*find_msg_func) (TnyFolder *self, const gchar *url_string, GError **err); 65 void (*get_msg_async_func) (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, gpointer user_data);65 void (*get_msg_async_func) (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, TnyStatusCallback status_callback, gpointer user_data); 66 66 void (*get_headers_func) (TnyFolder *self, TnyList *headers, gboolean refresh, GError **err); 67 67 const gchar* (*get_name_func) (TnyFolder *self); … … 73 73 guint (*get_unread_count_func) (TnyFolder *self); 74 74 gboolean (*is_subscribed_func) (TnyFolder *self); 75 void (*refresh_async_func) (TnyFolder *self, TnyRefreshFolderCallback callback, Tny RefreshFolderStatusCallback status_callback, gpointer user_data);75 void (*refresh_async_func) (TnyFolder *self, TnyRefreshFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data); 76 76 void (*refresh_func) (TnyFolder *self, GError **err); 77 77 void (*transfer_msgs_func) (TnyFolder *self, TnyList *headers, TnyFolder *folder_dst, gboolean delete_originals, GError **err); trunk/libtinymail/tny-folder.c
r1810 r1820 580 580 **/ 581 581 void 582 tny_folder_refresh_async (TnyFolder *self, TnyRefreshFolderCallback callback, Tny RefreshFolderStatusCallback status_callback, gpointer user_data)582 tny_folder_refresh_async (TnyFolder *self, TnyRefreshFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data) 583 583 { 584 584 #ifdef DBC /* require */ … … 885 885 * @header: a #TnyHeader object 886 886 * @callback: The callback handler 887 * @status_callback: the status callback handler 887 888 * @user_data: user data for the callback 888 889 * … … 903 904 * Example: 904 905 * <informalexample><programlisting> 906 * static void 907 * status_cb (gpointer folder, const gchar *what, gint sofar, gint oftotal, gpointer user_data) 908 * { 909 * printf ("."); 910 * } 905 911 * static void 906 912 * folder_get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data) … … 912 918 * TnyFolder *folder = ...; TnyHeader *header = ...; 913 919 * tny_folder_get_msg_async (folder, header, 914 * folder_get_msg_cb, message_view);920 * folder_get_msg_cb, status_cb, message_view); 915 921 * </programlisting></informalexample> 916 922 **/ 917 923 void 918 tny_folder_get_msg_async (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, gpointer user_data)924 tny_folder_get_msg_async (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, TnyStatusCallback status_callback, gpointer user_data) 919 925 { 920 926 #ifdef DBC /* require */ … … 923 929 g_assert (TNY_IS_HEADER (header)); 924 930 g_assert (callback); 931 g_assert (status_callback); 925 932 g_assert (TNY_FOLDER_GET_IFACE (self)->get_msg_async_func != NULL); 926 933 #endif 927 934 928 TNY_FOLDER_GET_IFACE (self)->get_msg_async_func (self, header, callback, user_data);935 TNY_FOLDER_GET_IFACE (self)->get_msg_async_func (self, header, callback, status_callback, user_data); 929 936 930 937 return; trunk/libtinymail/tny-folder.h
r1786 r1820 95 95 TnyMsg* (*get_msg_func) (TnyFolder *self, TnyHeader *header, GError **err); 96 96 TnyMsg* (*find_msg_func) (TnyFolder *self, const gchar *url_string, GError **err); 97 void (*get_msg_async_func) (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, gpointer user_data);97 void (*get_msg_async_func) (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, TnyStatusCallback status_callback, gpointer user_data); 98 98 void (*get_headers_func) (TnyFolder *self, TnyList *headers, gboolean refresh, GError **err); 99 99 const gchar* (*get_name_func) (TnyFolder *self); … … 105 105 guint (*get_unread_count_func) (TnyFolder *self); 106 106 gboolean (*is_subscribed_func) (TnyFolder *self); 107 void (*refresh_async_func) (TnyFolder *self, TnyRefreshFolderCallback callback, Tny RefreshFolderStatusCallback status_callback, gpointer user_data);107 void (*refresh_async_func) (TnyFolder *self, TnyRefreshFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data); 108 108 void (*refresh_func) (TnyFolder *self, GError **err); 109 109 void (*transfer_msgs_func) (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, GError **err); … … 131 131 TnyMsg* tny_folder_get_msg (TnyFolder *self, TnyHeader *header, GError **err); 132 132 TnyMsg* tny_folder_find_msg (TnyFolder *self, const gchar *url_string, GError **err); 133 void tny_folder_get_msg_async (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, gpointer user_data);133 void tny_folder_get_msg_async (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, TnyStatusCallback status_callback, gpointer user_data); 134 134 void tny_folder_get_headers (TnyFolder *self, TnyList *headers, gboolean refresh, GError **err); 135 135 TnyAccount* tny_folder_get_account (TnyFolder *self); … … 141 141 guint tny_folder_get_unread_count (TnyFolder *self); 142 142 gboolean tny_folder_is_subscribed (TnyFolder *self); 143 void tny_folder_refresh_async (TnyFolder *self, TnyRefreshFolderCallback callback, Tny RefreshFolderStatusCallback status_callback, gpointer user_data);143 void tny_folder_refresh_async (TnyFolder *self, TnyRefreshFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data); 144 144 void tny_folder_refresh (TnyFolder *self, GError **err); 145 145 void tny_folder_transfer_msgs (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, GError **err); trunk/libtinymail/tny-merge-folder.c
r1806 r1820 208 208 guint depth; 209 209 TnyGetMsgCallback callback; 210 TnyStatusCallback status_callback; 210 211 } GetMsgInfo; 211 212 … … 278 279 279 280 static void 280 tny_merge_folder_get_msg_async (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, gpointer user_data)281 tny_merge_folder_get_msg_async (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, TnyStatusCallback status_callback, gpointer user_data) 281 282 { 282 283 GetMsgInfo *info; … … 288 289 info->header = header; 289 290 info->callback = callback; 291 info->status_callback = status_callback; 290 292 info->user_data = user_data; 291 293 info->depth = g_main_depth (); … … 494 496 TnyFolder *self; 495 497 TnyRefreshFolderCallback callback; 496 Tny RefreshFolderStatusCallback status_callback;498 TnyStatusCallback status_callback; 497 499 gpointer user_data; 498 500 gboolean cancelled; … … 600 602 601 603 static void 602 tny_merge_folder_refresh_async (TnyFolder *self, TnyRefreshFolderCallback callback, Tny RefreshFolderStatusCallback status_callback, gpointer user_data)604 tny_merge_folder_refresh_async (TnyFolder *self, TnyRefreshFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data) 603 605 { 604 606 RefreshFolderInfo *info; trunk/libtinymail/tny-shared.h
r1783 r1820 20 20 * Boston, MA 02111-1307, USA. 21 21 */ 22 23 #include <glib.h> 22 24 23 25 G_BEGIN_DECLS … … 52 54 typedef void (*TnyGetMsgCallback) (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data); 53 55 typedef void (*TnyTransferMsgsCallback) (TnyFolder *folder, GError **err, gpointer user_data); 54 typedef void (*Tny RefreshFolderStatusCallback) (TnyFolder *self, const gchar *what, gint sofar, gint oftotal, gpointer user_data);56 typedef void (*TnyStatusCallback) (gpointer self, const gchar *what, gint sofar, gint oftotal, gpointer user_data); 55 57 typedef enum _TnyHeaderFlags TnyHeaderFlags; 56 58 typedef enum _TnyAlertType TnyAlertType; trunk/tests/c-demo/tny-demoui-summary-view.c
r1810 r1820 464 464 465 465 static void 466 refresh_current_folder_status_update ( TnyFolder *folder, const gchar *what, gint sofar, gint oftotal, gpointer user_data)466 refresh_current_folder_status_update (gpointer folder, const gchar *what, gint sofar, gint oftotal, gpointer user_data) 467 467 { 468 468 gchar *new_what;
