Changeset 2097

Timestamp:

06/07/07 16:52:09

Author:

pvanhoof

Message:

tny_folder_poke_status improvements

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-folder.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-store.c (modified) (3 diffs)
• trunk/libtinymail-camel/camel-lite/camel/camel-store.h (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (2 diffs)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (4 diffs)

trunk/ChangeLog

@@ -14 +14 @@
-        * Fix for sergio, when removing folders the CamelFolderInfo iter was
-        still cached
-
+
+
+
-2007-06-06  Philip Van Hoof  <pvanhoof@gnome.org>
-

trunk/libtinymail-camel/camel-lite/camel/camel-folder.c

@@ -1773 +1773 @@
-        CamelFolder *folder = (CamelFolder *)obj;
-        CamelFolderChangeInfo *changed = event_data;
-        struct _CamelFolderChangeInfoPrivate *p = changed->priv;
-        CamelSession *session = ((CamelService *)folder->parent_store)->session;
-        CamelFilterDriver *driver = NULL;

trunk/libtinymail-camel/camel-lite/camel/camel-store.c

@@ -86 +86 @@
-static int store_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);
-
-GPtrArray* get_recent_messages (CamelStore *store, const char *folder_name, int *unseen, int *messages
+void get_folder_status_impl (CamelStore *store, const char *folder_name, int *unseen, int *messages, int *uidnext
-
-static void
@@ -113 +113 @@
-        camel_store_class->unsubscribe_folder = unsubscribe_folder;
-        camel_store_class->noop = noop;
-recent_messages = get_recent_messages
+folder_status = get_folder_status_impl
-        camel_store_class->delete_cache = delete_cache;
-
@@ -195 +195 @@
-}
-
-
-
-
-
-
-
+
+
+
+
-        CAMEL_STORE_LOCK(store, folder_lock);
-ret = CS_CLASS (store)->get_recent_messages (store, folder_name, unseen, messages
+CS_CLASS (store)->get_folder_status (store, folder_name, unseen, messages, uidnext
-        CAMEL_STORE_UNLOCK(store, folder_lock);
-
- ret
-
-
-GPtrArray*
-recent_messages (CamelStore *store, const char *folder_name, int *unseen, int *messages
+
+
+
+void
+folder_status_impl (CamelStore *store, const char *folder_name, int *unseen, int *messages, int *uidnext
-{
-        *unseen = 0;
-        *messages = 0;
-
+
+
+
-}
-

trunk/libtinymail-camel/camel-lite/camel/camel-store.h

@@ -188 +188 @@
-        void            (*noop)                     (CamelStore *store,
-                                                     CamelException *ex);
-GPtrArray*      (*get_recent_messages)
+void            (*get_folder_status)  
-                                                     const char *folder_name, 
-
+
+
-        void             (*delete_cache)              (CamelStore *store);
-
@@ -267 +268 @@
-                                                       int *unseen, int *messages);
-
+void            camel_store_get_folder_status        (CamelStore *store, 
+                                                      const char *folder_name, 
+                                                      int *unseen, int *messages, 
+                                                      int *uidnext);
+
-void             camel_store_delete_cache            (CamelStore *store);
-

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c

@@ -139 +139 @@
-static void imap_set_server_level (CamelImapStore *store);
-
-GPtrArray* imap_get_recent_messages (CamelStore *store, const char *folder_name, int *unseen, int *messages
+void imap_get_folder_status (CamelStore *store, const char *folder_name, int *unseen, int *messages, int *uidnext
-
-void
@@ -244 +244 @@
-        camel_store_class->get_trash = imap_get_trash;
-        camel_store_class->get_junk = imap_get_junk;
-recent_messages = imap_get_recent_message
+folder_status = imap_get_folder_statu
-
-        camel_disco_store_class->can_work_offline = can_work_offline;
@@ -2277 +2277 @@
-}
-
-
-
-
-
+
+
+
-        CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        CAMEL_SERVICE_REC_UNLOCK (imap_store, connect_lock);
-
- retval
+
-}
-

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

@@ -3350 +3350 @@
-        TnyFolder *self = data;
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-gu
+
-        gboolean set=FALSE;
-        TnyFolderChange *change;
+        CamelStore *store = priv->store;
-
-        if (priv->folder)
-        {
-                g_static_rec_mutex_lock (priv->folder_lock);
+
-                set=TRUE;
-                newurlen = camel_folder_get_unread_message_count (priv->folder);
-                newlen = camel_folder_get_message_count (priv->folder);
+
-                g_static_rec_mutex_unlock (priv->folder_lock);
-        } else if (priv->iter) {
+
-                g_static_rec_mutex_lock (priv->folder_lock);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                g_static_rec_mutex_unlock (priv->folder_lock);
-        }
@@ -3372 +3386 @@
-        {
-                change = tny_folder_change_new (self);
-
+(guint) 
-                tny_folder_change_set_new_all_count (change, priv->cached_length);
-
+(guint) 
-                tny_folder_change_set_new_unread_count (change, priv->unread_length);
-                notify_folder_observers_about (self, change);

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

@@ -93 +93 @@
-        TnyMsgView *msg_view;
-        guint accounts_reloaded_signal;
-
+, *poke_button
-        guint status_id;
-        gulong mailbox_select_sid;
@@ -277 +277 @@
-                g_object_unref (G_OBJECT (device));
-        }
+}
+
+static void
+recurse_poke (TnyFolderStore *f_store)
+{
+        TnyList *folders = tny_simple_list_new ();
+        TnyIterator *f_iter;
+
+        tny_folder_store_get_folders (TNY_FOLDER_STORE (f_store), folders, NULL, NULL);
+        f_iter = tny_list_create_iterator (folders);
+        while (!tny_iterator_is_done (f_iter))
+        {
+                TnyFolder *f_cur = TNY_FOLDER (tny_iterator_get_current (f_iter));
+
+                tny_folder_poke_status (f_cur);
+
+                if (TNY_IS_FOLDER_STORE (f_cur))
+                        recurse_poke (TNY_FOLDER_STORE (f_cur));
+
+                g_object_unref (f_cur);
+                tny_iterator_next (f_iter);
+        }
+        g_object_unref (f_iter);
+        g_object_unref (folders);
+}
+
+static void 
+poke_button_toggled (GtkToggleButton *togglebutton, gpointer user_data)
+{
+        TnySummaryView *self = user_data;
+        TnyDemouiSummaryViewPriv *priv = TNY_DEMOUI_SUMMARY_VIEW_GET_PRIVATE (self);
+        TnyList *accounts = tny_simple_list_new ();
+        TnyIterator *a_iter;
+
+        tny_account_store_get_accounts (priv->account_store, accounts, 
+                TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+
+        a_iter = tny_list_create_iterator (accounts);
+
+        while (!tny_iterator_is_done (a_iter))
+        {
+                TnyAccount *a_cur = TNY_ACCOUNT (tny_iterator_get_current (a_iter));
+
+                recurse_poke (TNY_FOLDER_STORE (a_cur));
+
+                g_object_unref (a_cur);
+                tny_iterator_next (a_iter);
+        }
+
+        g_object_unref (a_iter);
+        g_object_unref (accounts);
-}
-
@@ -1355 +1406 @@
-        priv->last_mailbox_correct_select_set = FALSE;
-        priv->online_button = gtk_toggle_button_new_with_label (GO_ONLINE_TXT);
+        priv->poke_button = gtk_button_new_with_label ("Poke status");
-        priv->current_accounts = NULL;
-
-        priv->online_button_signal = g_signal_connect (G_OBJECT (priv->online_button), "toggled", 
-                G_CALLBACK (online_button_toggled), self);
+
+        g_signal_connect (G_OBJECT (priv->poke_button), "clicked", 
+                G_CALLBACK (poke_button_toggled), self);
-
-#if PLATFORM==1
@@ -1386 +1441 @@
-        gtk_box_pack_start (GTK_BOX (priv->status), priv->progress, FALSE, FALSE, 0);
-        gtk_box_pack_start (GTK_BOX (priv->status), priv->online_button, FALSE, FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (priv->status), priv->poke_button, FALSE, FALSE, 0);
-
-        gtk_widget_show (priv->online_button);
+        gtk_widget_show (priv->poke_button);
-        gtk_widget_show (priv->status);
-        gtk_widget_show (GTK_WIDGET (vbox));