Changeset 1712

Timestamp:

03/08/07 02:48:04

Author:

pvanhoof

Message:

Making it work

Files:

• trunk/libtinymail-camel/tny-camel-account.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (2 diffs)
• trunk/tests/functional/folder-lister.c (modified) (2 diffs)
• trunk/tests/memory/memory-test.c (modified) (6 diffs)

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

@@ -216 +216 @@
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-        GThread *thread;
+        GError *err = NULL;
-
-        g_mutex_lock (priv->cancel_lock);
@@ -221 +222 @@
-        /* I know this isn't polite. But it works ;-) */
-        /* camel_operation_cancel (NULL); */
-
-
+
+
+
+
+
-
-        if (priv->cancel)
@@ -781 +785 @@
-                        camel_disco_store_set_status (CAMEL_DISCO_STORE (priv->service),
-                                                                                  CAMEL_DISCO_STORE_ONLINE, &ex);
+                        if (!camel_exception_is_set (&ex))
+                                camel_service_connect (CAMEL_SERVICE (priv->service), &ex);
+
-                        goto done;
-                } else if (camel_disco_store_can_work_offline (CAMEL_DISCO_STORE (priv->service))) {

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

@@ -970 +970 @@
-        }
-
-
-
+/*
+ */
-
-        oldlen = priv->cached_length;
@@ -980 +980 @@
-        priv->want_changes = TRUE;
-
-_tny_camel_account_stop_camel_operation (TNY_CAMEL_ACCOUNT (priv->account));
+/* _tny_camel_account_stop_camel_operation (TNY_CAMEL_ACCOUNT (priv->account)); */
-
-        priv->cached_length = camel_folder_get_message_count (priv->folder);    

trunk/tests/functional/folder-lister.c

@@ -86 +86 @@
-        TnyStoreAccount *account;
-        TnyIterator *iter;
-
+
+
-        free (malloc (10));
-
+
-        g_type_init ();
-
-    
+
-        g_option_context_add_main_entries (context, options, "tinymail");
-    
+
-
-        account_store = tny_test_account_store_new (online, cachedir);
@@ -101 +102 @@
-
-        g_option_context_free (context);
-    
-        accounts = tny_simple_list_new ();
-
-        tny_account_store_get_accounts (account_store, accounts, 
-      
+       
-        g_object_unref (G_OBJECT (account_store));
-    
-        iter = tny_list_create_iterator (accounts);
-        account = (TnyStoreAccount*) tny_iterator_get_current (iter);
-
-
-
-
+
+
+
+
-        g_object_unref (G_OBJECT (account));
-        g_object_unref (G_OBJECT (iter));
-        g_object_unref (G_OBJECT (accounts));
-
+
-        return 0;
-}

trunk/tests/memory/memory-test.c

@@ -34 +34 @@
-#include <tny-camel-header-priv.h>
-
-
+
+
+
+
-
-static void
-do_get_folder (TnyFolder *folder)
-   
+
-        g_print ("Getting headers of %s ...\n", tny_folder_get_id (folder));
-        tny_folder_refresh (folder, NULL);
@@ -50 +53 @@
-        gint length, bytes;
-        gdouble kbytes, mbytes;
-
+
-        g_print ("Loading headers for %s ...\n", tny_folder_get_id (folder));
-        tny_folder_get_headers (folder, headers, FALSE, NULL);
-        length=tny_list_get_length (headers);
-        
-    
+
-                 sizeof (CamelMessageInfoBase) + 
-                 sizeof (CamelMessageContentInfo));
-
+
-        kbytes = ((gdouble)bytes) / 1024;
-    
-
+
+
-        g_print ("Loaded %d headers\n\n", length);
-
-    
+
-        g_print ("\tsizeof (CamelMessageInfo) = %d - accounts for %d bytes (~%.2lfK)\n", sizeof (CamelMessageInfo), length * sizeof (CamelMessageInfo), ((gdouble)length * sizeof (CamelMessageInfo))/1024);
-        g_print ("\tsizeof (CamelMessageInfoBase) = %d - accounts for %d bytes (~%.2lfK)\n", sizeof (CamelMessageInfoBase), length * sizeof (CamelMessageInfoBase), ((gdouble)length * sizeof (CamelMessageInfoBase))/1024);
@@ -71 +74 @@
-        g_print ("\nThis means that (at least) %d bytes or ~%.2lfK or ~%.2lfM are needed for this folder\n", bytes, kbytes, mbytes);
-
-    
+
-        sleep (5);
-        g_print ("Unloading headers ...\n");
-        g_object_unref (G_OBJECT (headers));
-       
+       
-        sleep (5);
-}
-
-
-static void
-recurse_folders (TnyFolderStore *store, TnyFolderStoreQuery *query, const gchar *folname, performer func)
-{
-        TnyIterator *iter;
-        TnyList *folders = tny_simple_list_new ();
-
-        tny_folder_store_get_folders (store, folders, query, NULL);
-        iter = tny_list_create_iterator (folders);
-
-        while (!tny_iterator_is_done (iter))
-        {
-                TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter);
-printf ("%s\n", folname);
-                if (!strcmp (tny_folder_get_id (TNY_FOLDER (folder)), folname))
-                        func (TNY_FOLDER (folder));
-            
-                recurse_folders (folder, query, folname, func);
-            
-                g_object_unref (G_OBJECT (folder));
-
-                tny_iterator_next (iter);           
-        }
-
-         g_object_unref (G_OBJECT (iter));
-         g_object_unref (G_OBJECT (folders));
-}
-
-
-static gchar *cachedir=NULL;
-static gboolean online=FALSE;
-
-static const GOptionEntry options[] = 
@@ -116 +87 @@
-                "Cache directory", NULL },
-        { "online", 'o', 0, G_OPTION_ARG_NONE, &online,
-
+
+
+
+
-        { NULL }
-};
@@ -126 +100 @@
-        TnyAccountStore *account_store;
-        TnyList *accounts;
+        TnyFolderStoreQuery *query;
-        TnyStoreAccount *account;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        g_type_init ();
-
-memory
+functional
-        g_option_context_add_main_entries (context, options, "tinymail");
-
-    
-        g_option_context_parse (context, &argc, &argv, NULL);
-
@@ -151 +119 @@
-
-        g_option_context_free (context);
+        accounts = tny_simple_list_new ();
-
-        accounts = tny_simple_list_new ();
-            
-        tny_account_store_get_accounts (account_store, accounts, 
-                TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+        g_object_unref (G_OBJECT (account_store));
+        iter = tny_list_create_iterator (accounts);
+        account = (TnyStoreAccount*) tny_iterator_get_current (iter);
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        g_object_unref (G_OBJECT (account));
-        g_object_unref (G_OBJECT (aiter));
-        g_object_unref (G_OBJECT (accounts));
-
+
-        return 0;
-}
-
+