Changeset 850

Timestamp:

08/31/06 12:00:12

Author:

pvanhoof

Message:

Refactored the TnyCamelStoreAccount type

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/Makefile.am (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-folder.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-imap-store-account.c (added)
• trunk/libtinymail-camel/tny-camel-imap-store-account.h (added)
• trunk/libtinymail-camel/tny-camel-nntp-store-account.c (added)
• trunk/libtinymail-camel/tny-camel-nntp-store-account.h (added)
• trunk/libtinymail-camel/tny-camel-pop-store-account.c (added)
• trunk/libtinymail-camel/tny-camel-pop-store-account.h (added)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.h (modified) (1 diff)
• trunk/libtinymail-gnome-desktop/tny-account-store.c (modified) (4 diffs)
• trunk/libtinymail-gpe/tny-account-store.c (modified) (2 diffs)
• trunk/libtinymail-maemo/tny-account-store.c (modified) (2 diffs)
• trunk/libtinymail-olpc/tny-account-store.c (modified) (2 diffs)

trunk/ChangeLog

@@ -4 +4 @@
-        and get_folders_async methods virtual ones that can be
-        overridden
+
+        * Refactored TnyCamelStoreAccount into three types:
+        TnyCamelIMAPStoreAccount, TnyCamelNNTPStoreAccount and
+        TnyCamelPOPStoreAccount (todo: the folders and implementing
+        custom get_folders and get_folders_async methods for NNTP
+        and POP)
+
+        * This was a major API change
-
-2006-08-30  Thomas Hisch <t.hisch@gmail.com>

trunk/libtinymail-camel/Makefile.am

@@ -13 +13 @@
-        tny-camel-account.h                     \
-        tny-camel-store-account.h               \
+        tny-camel-imap-store-account.h          \
+        tny-camel-nntp-store-account.h          \
+        tny-camel-pop-store-account.h           \
-        tny-camel-transport-account.h           \
-        tny-camel-stream.h                      \
@@ -36 +39 @@
-        tny-camel-account.c                     \
-        tny-camel-store-account.c               \
+        tny-camel-imap-store-account.c          \
+        tny-camel-nntp-store-account.c          \
+        tny-camel-pop-store-account.c           \
-        tny-camel-transport-account.c           \
-        tny-camel-stream.c                      \

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

@@ -893 +893 @@
-tny_camel_folder_remove_folder (TnyFolderStoreIface *self, TnyFolderIface *folder)
-{
+        TNY_CAMEL_FOLDER_GET_CLASS (self)->remove_folder_func (self, folder);
+}
+
+static void 
+tny_camel_folder_remove_folder_default (TnyFolderStoreIface *self, TnyFolderIface *folder)
+{
-        /* TODO */
-    
@@ -902 +908 @@
-static TnyFolderIface*
-tny_camel_folder_create_folder (TnyFolderStoreIface *self, const gchar *name)
+{
+        return TNY_CAMEL_FOLDER_GET_CLASS (self)->create_folder_func (self, name);
+}
+
+
+static TnyFolderIface*
+tny_camel_folder_create_folder_default (TnyFolderStoreIface *self, const gchar *name)
-{
-        /* TODO */
@@ -1138 +1151 @@
-        class->get_folders_async_func = tny_camel_folder_get_folders_async_default;
-        class->get_folders_func = tny_camel_folder_get_folders_default;
+        class->create_folder_func = tny_camel_folder_create_folder_default;
+        class->remove_folder_func = tny_camel_folder_remove_folder_default;
-    
-        g_type_class_add_private (object_class, sizeof (TnyCamelFolderPriv));

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

@@ -53 +53 @@
-        void (*get_folders_async_func) (TnyFolderStoreIface *self, TnyListIface *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data);
-        void (*get_folders_func) (TnyFolderStoreIface *self, TnyListIface *list, TnyFolderStoreQuery *query);
-
+
+
-};
-

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

@@ -285 +285 @@
-tny_camel_store_account_remove_folder (TnyFolderStoreIface *self, TnyFolderIface *folder)
-{
+        TNY_CAMEL_STORE_ACCOUNT_GET_CLASS (self)->remove_folder_func (self, folder);
+}
+
+static void 
+tny_camel_store_account_remove_folder_default (TnyFolderStoreIface *self, TnyFolderIface *folder)
+{
-        /* TODO */
-    
@@ -294 +300 @@
-static TnyFolderIface*
-tny_camel_store_account_create_folder (TnyFolderStoreIface *self, const gchar *name)
+{
+        return TNY_CAMEL_STORE_ACCOUNT_GET_CLASS (self)->create_folder_func (self, name);
+}
+
+
+static TnyFolderIface*
+tny_camel_store_account_create_folder_default (TnyFolderStoreIface *self, const gchar *name)
-{
-        /* TODO */
@@ -507 +520 @@
-        class->get_folders_async_func = tny_camel_store_account_get_folders_async_default;
-        class->get_folders_func = tny_camel_store_account_get_folders_default;
+        class->create_folder_func = tny_camel_store_account_create_folder_default;
+        class->remove_folder_func = tny_camel_store_account_remove_folder_default;
-    
-        g_type_class_add_private (object_class, sizeof (TnyCamelStoreAccountPriv));

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

@@ -51 +51 @@
-        void (*get_folders_async_func) (TnyFolderStoreIface *self, TnyListIface *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data);
-        void (*get_folders_func) (TnyFolderStoreIface *self, TnyListIface *list, TnyFolderStoreQuery *query);
-
+
+
-};
-

trunk/libtinymail-gnome-desktop/tny-account-store.c

@@ -40 +40 @@
-#include <tny-camel-account.h>
-#include <tny-camel-store-account.h>
+#include <tny-camel-imap-store-account.h>
+#include <tny-camel-nntp-store-account.h>
+#include <tny-camel-pop-store-account.h>
-#include <tny-camel-transport-account.h>
-#include <tny-device.h>
@@ -49 +52 @@
-#endif
-
-Camel" account
+libtinymail-camel" account-store
-
-static GObjectClass *parent_class = NULL;
@@ -363 +366 @@
-                g_free (key);
-
+            
-                key = g_strdup_printf ("/apps/tinymail/accounts/%d/type", i);
-                type = gconf_client_get_string (priv->client, 
-                        (const gchar*) key, NULL);
-                g_free (key);
-
+
+
+
+
+
+
+
-                if (type && G_LIKELY (!g_ascii_strncasecmp (type, "transport", 9)))
-                {
-                        if (types == TNY_ACCOUNT_STORE_IFACE_BOTH || types == TNY_ACCOUNT_STORE_IFACE_TRANSPORT_ACCOUNTS)
-                                account = TNY_ACCOUNT_IFACE (tny_camel_transport_account_new ());
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
-
@@ -384 +400 @@
-                {
-                        tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (account), priv->session);
-
-                        key = g_strdup_printf ("/apps/tinymail/accounts/%d/proto", i);
-                        proto = gconf_client_get_string (priv->client, 
-                                (const gchar*) key, NULL);
-                        g_free (key);
-                        tny_account_iface_set_proto (TNY_ACCOUNT_IFACE (account), proto);
-

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

@@ -253 +253 @@
-                g_free (key);
-
+                key = g_strdup_printf ("/apps/tinymail/accounts/%d/proto", i);
+                proto = gconf_client_get_string (priv->client, 
+                        (const gchar*) key, NULL);
+                g_free (key);
+            
+            
-                if (type && G_LIKELY (!g_ascii_strncasecmp (type, "transport", 9)))
-                {
-                        if (types == TNY_ACCOUNT_STORE_IFACE_BOTH || types == TNY_ACCOUNT_STORE_IFACE_TRANSPORT_ACCOUNTS)
-                                account = TNY_ACCOUNT_IFACE (tny_camel_transport_account_new ());
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
-
+
-                if (type)
-                        g_free (type);
@@ -269 +281 @@
-                {
-                        tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (account), priv->session);
-
-                        key = g_strdup_printf ("/apps/tinymail/accounts/%d/proto", i);
-                        proto = gconf_client_get_string (priv->client, 
-                                (const gchar*) key, NULL);
-                        g_free (key);
-                        tny_account_iface_set_proto (TNY_ACCOUNT_IFACE (account), proto);
-

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

@@ -254 +254 @@
-                g_free (key);
-
+                key = g_strdup_printf ("/apps/tinymail/accounts/%d/proto", i);
+                proto = gconf_client_get_string (priv->client, 
+                        (const gchar*) key, NULL);
+                g_free (key);
+            
+            
-                if (type && G_LIKELY (!g_ascii_strncasecmp (type, "transport", 9)))
-                {
-                        if (types == TNY_ACCOUNT_STORE_IFACE_BOTH || types == TNY_ACCOUNT_STORE_IFACE_TRANSPORT_ACCOUNTS)
-                                account = TNY_ACCOUNT_IFACE (tny_camel_transport_account_new ());
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
-                
@@ -270 +282 @@
-                {
-                        tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (account), priv->session);
-
-
-                        key = g_strdup_printf ("/apps/tinymail/accounts/%d/proto", i);
-                        proto = gconf_client_get_string (priv->client, 
-                                (const gchar*) key, NULL);
-                        g_free (key);
-                        tny_account_iface_set_proto (TNY_ACCOUNT_IFACE (account), proto);
-

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

@@ -211 +211 @@
-
-                type = g_key_file_get_value (keyfile, "tinymail", "type", NULL);
-
+
+
-                if (type && G_LIKELY (!g_ascii_strncasecmp (type, "transport", 9)))
-                {
-                        if (types == TNY_ACCOUNT_STORE_IFACE_BOTH || types == TNY_ACCOUNT_STORE_IFACE_TRANSPORT_ACCOUNTS)
-                                account = TNY_ACCOUNT_IFACE (tny_camel_transport_account_new ());
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
-
@@ -231 +238 @@
-
-                        tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (account), priv->session);
-
-                        proto = g_key_file_get_value (keyfile, "tinymail", "proto", NULL);
-                        tny_account_iface_set_proto (TNY_ACCOUNT_IFACE (account), proto);
-