Changeset 2774
- Timestamp:
- 09/17/07 16:37:40
- Files:
-
- trunk/ChangeLog (modified) (1 diff)
- trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c (modified) (4 diffs)
- trunk/libtinymailui-gtk/tny-gtk-header-list-model.c (modified) (4 diffs)
- trunk/libtinymailui-gtk/tny-gtk-header-list-model.h (modified) (1 diff)
- trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ChangeLog
r2773 r2774 1 2007-09-17 Philip Van Hoof <pvanhoof@gnome.org> 2 3 * Added callback, status_callback and user_data to 4 tny_gtk_header_list_model_set_folder 5 6 * This was a major API change 7 1 8 2007-09-17 Mark Doffman <mark.doffman@codethink.co.uk> 2 9 trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c
r2720 r2774 729 729 CAMEL_SUMMARY_LOCK(s, io_lock); 730 730 731 camel_operation_start (NULL, "Opening summary of folder"); 732 731 733 if (!s->file) 732 734 { … … 766 768 g_static_rec_mutex_unlock (&global_lock); 767 769 770 camel_operation_progress (NULL, i , s->saved_count); 771 768 772 if (mi == NULL) 769 773 goto error; … … 790 794 } 791 795 796 camel_operation_end (NULL); 797 792 798 CAMEL_SUMMARY_UNLOCK(s, io_lock); 793 799 … … 798 804 799 805 error: 806 camel_operation_end (NULL); 807 800 808 if (errno != EINVAL) 801 809 g_warning ("Cannot load summary file: `%s': %s", s->summary_path, g_strerror (errno)); trunk/libtinymailui-gtk/tny-gtk-header-list-model.c
r2574 r2774 914 914 } 915 915 916 static void917 get_hdrs_callback (TnyFolder *self, gboolean cancelled, TnyList *headers, GError *err, gpointer user_data)918 {919 return;920 }921 922 static void923 get_hdrs_status_callback (GObject *self, TnyStatus *status, gpointer user_data)924 {925 return;926 }927 916 928 917 /** … … 931 920 * @folder: a #TnyFolder instance 932 921 * @refresh: refresh first 922 * @callback: a #TnyGetHeadersCallback 923 * @status_callback: a #TnyStatusCallback 924 * @user_data: user data for the callbacks 933 925 * 934 926 * Set the folder where the #TnyHeader instances are located … … 936 928 **/ 937 929 void 938 tny_gtk_header_list_model_set_folder (TnyGtkHeaderListModel *self, TnyFolder *folder, gboolean refresh )930 tny_gtk_header_list_model_set_folder (TnyGtkHeaderListModel *self, TnyFolder *folder, gboolean refresh, TnyGetHeadersCallback callback, TnyStatusCallback status_callback, gpointer user_data) 939 931 { 940 932 TnyGtkHeaderListModelPriv *priv = TNY_GTK_HEADER_LIST_MODEL_GET_PRIVATE (self); … … 968 960 /* Get a new list of headers */ 969 961 /* TODO add error handling and reporting here */ 970 tny_folder_get_headers_async (folder, TNY_LIST (self), refresh, get_hdrs_callback, get_hdrs_status_callback, NULL);962 tny_folder_get_headers_async (folder, TNY_LIST (self), refresh, callback, status_callback, user_data); 971 963 972 964 iter.stamp = priv->stamp; trunk/libtinymailui-gtk/tny-gtk-header-list-model.h
r1937 r2774 75 75 76 76 GtkTreeModel* tny_gtk_header_list_model_new (void); 77 void tny_gtk_header_list_model_set_folder (TnyGtkHeaderListModel *self, TnyFolder *folder, gboolean refresh );77 void tny_gtk_header_list_model_set_folder (TnyGtkHeaderListModel *self, TnyFolder *folder, gboolean refresh, TnyGetHeadersCallback callback, TnyStatusCallback status_callback, gpointer user_data); 78 78 gint tny_gtk_header_list_model_received_date_sort_func (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data); 79 79 gint tny_gtk_header_list_model_sent_date_sort_func (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data); trunk/tests/c-demo/tny-demoui-summary-view.c
r2672 r2774 909 909 910 910 hmodel = tny_gtk_header_list_model_new (); 911 tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL (hmodel), folder, FALSE); 911 tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL (hmodel), 912 folder, FALSE, NULL, status_update, self); 912 913 913 914 g_mutex_lock (priv->monitor_lock); … … 974 975 hmodel = tny_gtk_header_list_model_new (); 975 976 tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL (hmodel), 976 merge, FALSE );977 merge, FALSE, NULL, status_update, self); 977 978 978 979 g_mutex_lock (priv->monitor_lock);
