Changeset 2076

Timestamp:

06/05/07 16:29:19

Author:

pvanhoof

Message:

Deleting the cache

Files:

• trunk/ChangeLog (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/camel-string-utils.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-string-utils.h (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c (modified) (5 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/nntp/camel-nntp-store.c (modified) (3 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.c (modified) (5 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.h (modified) (1 diff)
• trunk/libtinymail/tny-store-account.c (modified) (1 diff)
• trunk/libtinymail/tny-store-account.h (modified) (2 diffs)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (6 diffs)

trunk/ChangeLog

@@ -3 +3 @@
-        * Bugfix for LOGINDISABLED on IMAP
-        * Bugfix when connecting (connection status problem)
+        * Added the tny_store_account_delete_cache API
+
+        * This was a major API change
-
-2007-06-03  Johannes Schmid  <johannes.schmid@openismus.com>

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

@@ -77 +77 @@
-
-static void noop (CamelStore *store, CamelException *ex);
+static void delete_cache (CamelStore *store);
-
-static void construct (CamelService *service, CamelSession *session,
@@ -113 +114 @@
-        camel_store_class->noop = noop;
-        camel_store_class->get_recent_messages = get_recent_messages;
+        camel_store_class->delete_cache = delete_cache;
-
-        /* virtual method overload */
@@ -181 +183 @@
-}
-
+
+static void 
+delete_cache (CamelStore *store)
+{
+}
+
+void 
+camel_store_delete_cache (CamelStore *store)
+{
+        CS_CLASS (store)->delete_cache (store);
+}
-
-GPtrArray* 

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

@@ -191 +191 @@
-                                                     const char *folder_name, 
-                                                     int *unseen, int *messages);
+        void             (*delete_cache)              (CamelStore *store);
-
-} CamelStoreClass;
@@ -266 +267 @@
-                                                       int *unseen, int *messages);
-
+void             camel_store_delete_cache            (CamelStore *store);
+
-
-typedef struct _CamelISubscribe CamelISubscribe;

trunk/libtinymail-camel/camel-lite/camel/camel-string-utils.c

@@ -30 +30 @@
-
-#include "camel-string-utils.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <dirent.h>
+
+
+static int
+isdir (char *name)
+{
+        struct stat st;
+        if (stat (name, &st))
+                return 0;
+        return S_ISDIR (st.st_mode);
+}
+
+static char *ignored_names[] = { ".", "..", NULL };
+static int ignorent (char *name)
+{
+        char **p;
+        for (p = ignored_names; *p; p++)
+                if (strcmp (name, *p) == 0)
+                        return 1;
+        return 0;
+}
+
+void camel_du (char *name, int *my_size)
+{
+        DIR *dir;
+        struct dirent *ent;
+
+        chdir (name);
+        dir = opendir (name);
+
+        if (!dir)
+                return;
+
+        while ((ent = readdir (dir)))
+        {
+                if (!ignorent (ent->d_name))
+                {
+                        char *p = g_strdup_printf ("%s/%s", name, ent->d_name);
+                        if (isdir (p))
+                                camel_du (p, my_size);
+                        else 
+                        {
+                                struct stat st;
+                                if (stat (p, &st) == 0)
+                                        *my_size += st.st_size;
+                        }
+                        g_free (p);
+                }
+        }
+
+        closedir (dir);
+}
+
+static char *ignored_dnames[] = { ".", "..", NULL };
+static int ignorentd (char *name)
+{
+        char **p;
+        for (p = ignored_dnames; *p; p++)
+                if (strcmp (name, *p) == 0)
+                        return 1;
+        return 0;
+}
+
+void 
+camel_rm (char *name)
+{
+        DIR *dir;
+        struct dirent *ent;
+
+        chdir (name);
+        dir = opendir (name);
+
+        if (!dir)
+                return;
+
+        while ((ent = readdir (dir)))
+        {
+                if (!ignorentd (ent->d_name))
+                {
+                        char *p = g_strdup_printf ("%s/%s", name, ent->d_name);
+                        if (isdir (p))
+                                camel_rm (p);
+                        else 
+                                remove (p);
+                        g_free (p);
+                }
+        }
+
+        closedir (dir);
+
+        remove (name);
+}
-
-int

trunk/libtinymail-camel/camel-lite/camel/camel-string-utils.h

@@ -29 +29 @@
-G_BEGIN_DECLS
-
+void camel_du (char *name, int *my_size);
+void camel_rm (char *name);
+
-int   camel_strcase_equal (gconstpointer a, gconstpointer b);
-guint camel_strcase_hash  (gconstpointer v);

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

@@ -46 +46 @@
-#include "camel/camel-folder.h"
-#include "camel/camel-net-utils.h"
+#include "camel/camel-string-utils.h"
-#include "camel/camel-private.h"
-#include "camel/camel-sasl.h"
@@ -140 +141 @@
-static GPtrArray* imap_get_recent_messages (CamelStore *store, const char *folder_name, int *unseen, int *messages);
-
-
+
+
+
+
+
+
+
+
+
+
+
-{
-        if (imap_store->idle_signal > 0) 
@@ -209 +220 @@
-        camel_service_class->query_auth_types = query_auth_types;
-        camel_service_class->get_name = imap_get_name;
-
+
+
-        camel_store_class->hash_folder_name = hash_folder_name;
-        camel_store_class->compare_folder_name = compare_folder_name;
@@ -3167 +3179 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-static void
@@ -3231 +3191 @@
-
-        g_free(storage_path);
-my
+camel
-
-        folder = camel_object_bag_peek(store->folders, fi->full_name);

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

@@ -47 +47 @@
-#include "camel/camel-tcp-stream-ssl.h"
-#include "camel/camel-url.h"
+#include "camel/camel-string-utils.h"
-
-#include "camel-nntp-summary.h"
@@ -77 +78 @@
-                            CamelException *ex);
-
+
+static void 
+nntp_delete_cache  (CamelStore *store)
+{
+        CamelNNTPStore *nntp_store = (CamelNNTPStore *) store;
+        gchar *folder_dir = nntp_store->storage_path;
+        camel_rm (folder_dir);
+}
-
-static gboolean
@@ -1015 +1024 @@
-        camel_service_class->query_auth_types = nntp_store_query_auth_types;
-        camel_service_class->get_name = nntp_store_get_name;
-
+
+
-        camel_disco_store_class->can_work_offline = nntp_can_work_offline;
-        camel_disco_store_class->connect_online = nntp_connect_online;

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

@@ -63 +63 @@
-#include "camel-tcp-stream.h"
-#include "camel-url.h"
+#include "camel/camel-string-utils.h"
-
-#ifdef HAVE_SSL
@@ -90 +91 @@
-static CamelFolder *get_trash  (CamelStore *store, CamelException *ex);
-
+
+
+static void 
+pop3_delete_cache  (CamelStore *store)
+{
+        CamelPOP3Store *pop3_store = (CamelPOP3Store *) store;
+        gchar *folder_dir = pop3_store->storage_path;
+        camel_rm (folder_dir);
+}
+
+
-static gboolean
-pop3_can_work_offline (CamelDiscoStore *disco_store)
@@ -145 +157 @@
-}
-
-
-
-static int
-isdir (char *name)
-{
-        struct stat st;
-        if (stat (name, &st))
-                return 0;
-        return S_ISDIR (st.st_mode);
-}
-
-static char *ignored_names[] = { ".", "..", NULL };
-
-int
-ignorent (char *name)
-{
-        char **p;
-        for (p = ignored_names; *p; p++)
-                if (strcmp (name, *p) == 0)
-                        return 1;
-        return 0;
-}
-
-
-void
-my_du (char *name, int *my_size)
-{
-        DIR *dir;
-        struct dirent *ent;
-
-        chdir (name);
-        dir = opendir (name);
-
-        if (!dir)
-                return;
-
-        while ((ent = readdir (dir)))
-        {
-                if (!ignorent (ent->d_name))
-                {
-                        char *p = g_strdup_printf ("%s/%s", name, ent->d_name);
-                        if (isdir (p))
-                                my_du (p, my_size);
-                        else 
-                        {
-                                struct stat st;
-                                if (stat (p, &st) == 0)
-                                        *my_size += st.st_size;
-                        }
-                        g_free (p);
-                }
-        }
-
-        closedir (dir);
-}
-
-static CamelFolderInfo *
@@ -217 +174 @@
-        fi->total = 0;
-
-my
+camel
-
-        spath = g_strdup_printf ("%s/summary.mmap", folder_dir);
@@ -861 +818 @@
-        camel_store_class->get_trash = get_trash;
-
+        camel_store_class->delete_cache = pop3_delete_cache;
+
-        camel_disco_store_class->can_work_offline = pop3_can_work_offline;
-        camel_disco_store_class->connect_online = pop3_connect_online;

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

@@ -93 +93 @@
-
-static void 
+tny_camel_store_account_delete_cache (TnyStoreAccount *self)
+{
+        TNY_CAMEL_STORE_ACCOUNT_GET_CLASS (self)->delete_cache_func (self);
+}
+
+static void 
+tny_camel_store_account_delete_cache_default (TnyStoreAccount *self)
+{
+        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
+        CamelStore *store = CAMEL_STORE (apriv->service);
+
+        camel_store_delete_cache (store);
+}
+
+static void 
-tny_camel_store_account_prepare (TnyCamelAccount *self)
-{
@@ -1138 +1153 @@
-        klass->unsubscribe_func = tny_camel_store_account_unsubscribe;
-        klass->find_folder_func = tny_camel_store_account_find_folder;
+        klass->delete_cache_func = tny_camel_store_account_delete_cache;
-
-        return;
@@ -1163 +1179 @@
-        class->remove_observer_func = tny_camel_store_account_remove_observer_default;
-        class->find_folder_func = tny_camel_store_account_find_folder_default;
+        class->delete_cache_func = tny_camel_store_account_delete_cache_default;
-
-        /* Protected default implementation */

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

@@ -58 +58 @@
-
-        TnyFolder * (*find_folder_func) (TnyStoreAccount *self, const gchar *url_string, GError **err);
+        void (*delete_cache_func) (TnyStoreAccount *self);
-
-        /* protected virtual methods*/

trunk/libtinymail/tny-store-account.c

@@ -29 +29 @@
-
-guint tny_store_account_signals [TNY_STORE_ACCOUNT_LAST_SIGNAL];
+
+
+/**
+ * tny_store_account_delete_cache:
+ * @self: a #TnyStoreAccount object
+ *
+ * Delete the cache of a store account
+ **/
+void 
+tny_store_account_delete_cache (TnyStoreAccount *self)
+{
+#ifdef DBC /* require */
+        g_assert (TNY_IS_STORE_ACCOUNT (self));
+        g_assert (TNY_STORE_ACCOUNT_GET_IFACE (self)->delete_cache_func != NULL);
+#endif
+
+        TNY_STORE_ACCOUNT_GET_IFACE (self)->delete_cache_func (self);
+
+        return;
+}
+
-
-/**

trunk/libtinymail/tny-store-account.h

@@ -60 +60 @@
-        void (*unsubscribe_func) (TnyStoreAccount *self, TnyFolder *folder);
-        TnyFolder * (*find_folder_func) (TnyStoreAccount *self, const gchar *url_string, GError **err);
+        void (*delete_cache_func) (TnyStoreAccount *self);
-};
-
@@ -67 +68 @@
-void tny_store_account_unsubscribe (TnyStoreAccount *self, TnyFolder *folder);
-TnyFolder* tny_store_account_find_folder (TnyStoreAccount *self, const gchar *url_string, GError **err);
-
+
-
-G_END_DECLS

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

@@ -998 +998 @@
-}
-
+
+static void 
+on_uncache_account_activate (GtkMenuItem *mitem, gpointer user_data)
+{
+        TnyDemouiSummaryView *self = user_data;
+        TnyDemouiSummaryViewPriv *priv = TNY_DEMOUI_SUMMARY_VIEW_GET_PRIVATE (self);
+        GtkTreeIter iter;
+        GtkTreeModel *model;
+
+        if (gtk_tree_selection_get_selected (priv->mailbox_select, &model, &iter))
+        {
+                gint type;
+
+                gtk_tree_model_get (model, &iter, 
+                        TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, 
+                        &type, -1);
+
+                if (type != TNY_FOLDER_TYPE_ROOT) 
+                { 
+                        TnyFolder *folder;
+                        TnyStoreAccount *acc;
+                        GtkWidget *dialog, *label;
+                        gint result;
+                        gchar *str = NULL;
+
+                        gtk_tree_model_get (model, &iter, 
+                                TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, 
+                                &folder, -1);
+
+                        dialog = gtk_dialog_new_with_buttons (_("Uncache an account"),
+                                  GTK_WINDOW (gtk_widget_get_parent (GTK_WIDGET (self))),
+                                  GTK_DIALOG_MODAL,
+                                  GTK_STOCK_OK,
+                                  GTK_RESPONSE_ACCEPT,
+                                  GTK_STOCK_CANCEL,
+                                  GTK_RESPONSE_REJECT,
+                                  NULL);
+
+                        acc = TNY_STORE_ACCOUNT (tny_folder_get_account (folder));
+
+                        str = g_strdup_printf (_("Are you sure you want to uncache the account %s?"),
+                                tny_account_get_name (TNY_ACCOUNT (acc)));
+                        label = gtk_label_new (str);
+                        g_free (str);
+
+                        gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), label);
+                        gtk_widget_show (label);
+
+                        result = gtk_dialog_run (GTK_DIALOG (dialog));
+
+                        switch (result)
+                        {
+                                case GTK_RESPONSE_ACCEPT: 
+                                        tny_store_account_delete_cache (acc);
+                                break;
+
+                                default:
+                                break;
+                        }
+
+                        g_object_unref (acc);
+
+                        if (dialog)
+                                gtk_widget_destroy (dialog);
+                        g_object_unref (folder);
+                }
+
+        }
+}
+
+
-static void 
-on_create_folder_activate (GtkMenuItem *mitem, gpointer user_data)
@@ -1157 +1228 @@
-        int button, event_time;
-        GtkSelectionMode mode;
-
+, *muncache
-#ifdef ASYNCWORKER
-        GtkWidget *fdown;
@@ -1167 +1238 @@
-        mcreate = gtk_menu_item_new_with_label (_("Create folder"));
-        mdelete = gtk_menu_item_new_with_label (_("Delete folder"));
+        muncache = gtk_menu_item_new_with_label (_("Uncache account of this folder"));
-
-#ifdef ASYNCWORKER
@@ -1179 +1251 @@
-                mmerge = gtk_menu_item_new_with_label (_("Select one folder mode"));
-
+        g_signal_connect (G_OBJECT (muncache), "activate",
+                G_CALLBACK (on_uncache_account_activate), user_data);
-        g_signal_connect (G_OBJECT (mrename), "activate",
-                G_CALLBACK (on_rename_folder_activate), user_data);
@@ -1195 +1269 @@
-        gtk_menu_prepend (menu, mcreate);
-        gtk_menu_prepend (menu, mdelete);
+        gtk_menu_prepend (menu, muncache);
-        gtk_menu_prepend (menu, mmerge);
-#ifdef ASYNCWORKER
@@ -1204 +1279 @@
-        gtk_widget_show (mcreate);
-        gtk_widget_show (mdelete);
+        gtk_widget_show (muncache);
-        gtk_widget_show (mmerge);
-