Changeset 1713

Timestamp:

03/09/07 17:42:59

Author:

pvanhoof

Message:

A few major API changes

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-account.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-account.h (modified) (1 diff)
• trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c (modified) (20 diffs)
• trunk/libtinymail-gpe/tny-gpe-account-store.c (modified) (15 diffs)
• trunk/libtinymail-maemo/tny-maemo-account-store.c (modified) (17 diffs)
• trunk/libtinymail-olpc/tny-olpc-account-store.c (modified) (12 diffs)
• trunk/libtinymail/tny-account-store.c (modified) (1 diff)
• trunk/libtinymail/tny-account-store.h (modified) (2 diffs)
• trunk/libtinymail/tny-account.c (modified) (1 diff)
• trunk/libtinymail/tny-account.h (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-03-09  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Added the tny_account_store_find_account API. It's possible that in
+        future a set and get find strategy API will be added. For now, finding
+        using only the url-string will suffice (and adding the find strategy
+        later wont break the existing API, or at least doesn't have to as far
+        as I can see now -- I might laugh at this entry in future, we'll see)
+        
+        * Changes to the TnyAccountStore implementations, it's more typical 
+        now to let the account store store the instances internally, rather 
+        than letting it always return new instances. How else are you going 
+        to find the original TnyAccount instance with 
+        tny_account_store_find_account?
+
+        * Added the tny_account_matches_url_string API, to determine whether a
+        specific account instance matches a specific url_string.
+
+        * This was a major API change
+
-2007-03-06  Philip Van Hoof  <pvanhoof@gnome.org>
-

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

@@ -49 +49 @@
-
-static GObjectClass *parent_class = NULL;
+
+static gboolean 
+tny_camel_account_matches_url_string (TnyAccount *self, const gchar *url_string)
+{
+        return TNY_CAMEL_ACCOUNT_GET_CLASS (self)->matches_url_string_func (self, url_string);
+}
+
+static gboolean 
+tny_camel_account_matches_url_string_default (TnyAccount *self, const gchar *url_string)
+{
+        /* TODO implement */
+        return FALSE;
+}
-
-static TnyAccountType
@@ -922 +935 @@
-        klass->get_account_type_func = tny_camel_account_get_account_type;
-        klass->cancel_func = tny_camel_account_cancel;
+        klass->matches_url_string_func = tny_camel_account_matches_url_string;
-
-        return;
@@ -957 +971 @@
-        class->get_account_type_func = tny_camel_account_get_account_type_default;
-        class->cancel_func = tny_camel_account_cancel_default;
+        class->matches_url_string_func = tny_camel_account_matches_url_string_default;
-
-        class->add_option_func = tny_camel_account_add_option_default;

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

@@ -74 +74 @@
-        void (*try_connect_func) (TnyAccount *self, GError **err);
-        void (*cancel_func) (TnyAccount *self);
+        gboolean (*matches_url_string_func) (TnyAccount *self, const gchar *url_string);
-
-        void (*add_option_func) (TnyCamelAccount *self, const gchar *option);

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

@@ -67 +67 @@
-        TnyDevice *device;
-        guint notify;
+        GList *accounts;
-};
-
@@ -291 +292 @@
-}
-
+static void
+kill_stored_accounts (TnyGnomeAccountStorePriv *priv)
+{
+        if (priv->accounts)
+        {
+                g_list_foreach (priv->accounts, (GFunc) g_object_unref, NULL);
+                g_list_free (priv->accounts);
+                priv->accounts = NULL;
+        }
+
+        return;
+}
-
-static void
@@ -297 +310 @@
-{
-        TnyAccountStore *self = user_data;
+        TnyGnomeAccountStorePriv *priv = TNY_GNOME_ACCOUNT_STORE_GET_PRIVATE (self);
-
-        gchar *key = g_strdup (entry->key);
-        gchar *ptr = strrchr (key, '/'); ptr++;
-
+
-        if (!strcmp (ptr, "count"))
-        {
+                kill_stored_accounts (priv);
-                g_signal_emit (self, 
-                        tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNTS_RELOADED], 0);
-
-        }
-
@@ -313 +328 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-{
-        TnyGnomeAccountStorePriv *priv = TNY_GNOME_ACCOUNT_STORE_GET_PRIVATE (self);
-        gint i=0, count, port;
-
-        g_assert (TNY_IS_LIST (list));
-
-        count = gconf_client_get_int (priv->client, 
@@ -363 +344 @@
-
-                key = g_strdup_printf ("/apps/tinymail/accounts/%d", i);
-
+
-                if (!gconf_client_dir_exists (priv->client, (const gchar*)key, NULL))
-                {
@@ -371 +352 @@
-                g_free (key);
-
-            
-                key = g_strdup_printf ("/apps/tinymail/accounts/%d/disabled", i);
-                if (gconf_client_get_bool (priv->client, (const gchar*) key, NULL))
@@ -384 +364 @@
-                        (const gchar*) key, NULL);
-                g_free (key);
-
+
-                key = g_strdup_printf ("/apps/tinymail/accounts/%d/proto", i);
-                proto = gconf_client_get_string (priv->client, 
@@ -394 +374 @@
-                        (const gchar*) key, NULL);
-                g_free (key);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-                if (type)
@@ -423 +398 @@
-                                (const gchar*) key, NULL);
-                        g_free (key);
-
-
-                        if (name)
@@ -451 +425 @@
-                        }
-
-                        /* Because we only check for the n first bytes, the pops, imaps and smtps also work */
-                        if (!g_ascii_strncasecmp (proto, "pop", 3) ||
-                                !g_ascii_strncasecmp (proto, "imap", 4))
@@ -457 +430 @@
-                                gchar *user, *hostname;
-
-                                /* TODO: Add other supported and tested providers here */
-                                key = g_strdup_printf ("/apps/tinymail/accounts/%d/user", i);
-                                user = gconf_client_get_string (priv->client, 
@@ -499 +471 @@
-                        g_free (key);
-
-                        /* 
-                         * Setting the password function must happen after
-                         * setting the host, user and protocol.
-                         */
-
-                        tny_account_set_forget_pass_func (TNY_ACCOUNT (account),
-                                per_account_forget_pass_func);
@@ -510 +477 @@
-                                per_account_get_pass_func);
-
-
-
-
+
-                }
-
@@ -521 +486 @@
-                        g_free (proto);
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -586 +644 @@
-        g_free (key); 
-
-    
+
-
-        gconf_client_set_int (priv->client, "/apps/tinymail/accounts/count", 
@@ -643 +701 @@
-        tny_session_camel_set_ui_locker (priv->session, tny_gtk_lockable_new ());
-
-
-        return TNY_ACCOUNT_STORE (self);
-}
@@ -655 +712 @@
-        TnyPlatformFactory *platfact;
-
+        priv->accounts = NULL;
-        priv->client = gconf_client_get_default ();
-
@@ -663 +721 @@
-
-        platfact = TNY_PLATFORM_FACTORY (tny_gnome_platform_factory_get_instance ());
-
-
-
+
-
-        return;
@@ -679 +735 @@
-        tny_gnome_account_store_notify_remove (TNY_ACCOUNT_STORE (self));
-        g_object_unref (G_OBJECT (priv->client));
+
+        kill_stored_accounts (priv);
-
-        if (G_LIKELY (priv->cache_dir))
@@ -729 +787 @@
-        klass->get_device_func = tny_gnome_account_store_get_device;
-        klass->alert_func = tny_gnome_account_store_alert;
+        klass->find_account_func = tny_gnome_account_store_find_account;
-
-        return;

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

@@ -60 +60 @@
-        TnyDevice *device;
-        guint notify;
+        GList *accounts;
-};
-
@@ -170 +171 @@
-}
-
+
+static void
+kill_stored_accounts (TnyGpeAccountStorePriv *priv)
+{
+        if (priv->accounts)
+        {
+                g_list_foreach (priv->accounts, (GFunc) g_object_unref, NULL);
+                g_list_free (priv->accounts);
+                priv->accounts = NULL;
+        }
+
+        return;
+}
+
-static void
-gconf_listener_account_changed (GConfClient *client, guint cnxn_id,
@@ -177 +192 @@
-        TnyGpeAccountStorePriv *priv = TNY_GPE_ACCOUNT_STORE_GET_PRIVATE (self);
-
-
-        gchar *key = g_strdup (entry->key);
-        gchar *ptr = strrchr (key, '/'); ptr++;
@@ -183 +197 @@
-        if (!strcmp (ptr, "count"))
-        {
+                kill_stored_accounts (priv);
-                g_signal_emit (self, 
-                        tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNTS_RELOADED], 0);
-
-        }
-
@@ -193 +207 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        gint i=0, count, port;
-
-        g_assert (TNY_IS_LIST (list));
-
-        count = gconf_client_get_int (priv->client, 
-       
+
-
-        for (i=0; i < count; i++)
@@ -273 +254 @@
-                        (const gchar*) key, NULL);
-                g_free (key);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                if (type)
-                        g_free (type);
@@ -330 +305 @@
-                        }
-
-                        /* Because we only check for the n first bytes, the pops, imaps and smtps also work */
-                        if (!g_ascii_strncasecmp (proto, "pop", 3) ||
-                                !g_ascii_strncasecmp (proto, "imap", 4))
@@ -336 +310 @@
-                                gchar *user, *hostname;
-
-                                /* TODO: Add other supported and tested providers here */
-                                key = g_strdup_printf ("/apps/tinymail/accounts/%d/user", i);
-                                user = gconf_client_get_string (priv->client, 
@@ -378 +351 @@
-                        g_free (key);
-
-                        /* 
-                         * Setting the password function must happen after
-                         * setting the host, user and protocol.
-                         */
-
-                        tny_account_set_forget_pass_func (TNY_ACCOUNT (account),
-                                per_account_forget_pass_func);
@@ -389 +357 @@
-                                per_account_get_pass_func);
-
-
-
-
-
+
-                }
-
@@ -402 +367 @@
-
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -538 +596 @@
-        TnyGpeAccountStorePriv *priv = TNY_GPE_ACCOUNT_STORE_GET_PRIVATE (self);
-        TnyPlatformFactory *platfact;
-
+
+
-        priv->client = gconf_client_get_default ();
-
@@ -549 +608 @@
-
-        priv->device = tny_platform_factory_new_device (platfact);
-
-
+
-        return;
-}
@@ -563 +621 @@
-        tny_gpe_account_store_notify_remove (TNY_ACCOUNT_STORE (self));
-        g_object_unref (G_OBJECT (priv->client));
+
+        kill_stored_accounts (priv);
-
-        if (G_LIKELY (priv->cache_dir))
@@ -613 +673 @@
-        klass->get_device_func = tny_gpe_account_store_get_device;
-        klass->alert_func = tny_gpe_account_store_alert;
+        klass->find_account_func = tny_gpe_account_store_find_account;
-
-        return;

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

@@ -60 +60 @@
-        TnyDevice *device;
-        guint notify;
+        GList *accounts;
-};
-
@@ -120 +121 @@
-{
-        TnyGetPassFunc func;
-
+
-        if (G_LIKELY (passwords))
-        {
@@ -171 +172 @@
-}
-
+
+static void
+kill_stored_accounts (TnyMaemoAccountStorePriv *priv)
+{
+        if (priv->accounts)
+        {
+                g_list_foreach (priv->accounts, (GFunc) g_object_unref, NULL);
+                g_list_free (priv->accounts);
+                priv->accounts = NULL;
+        }
+
+        return;
+}
+
-static void
-gconf_listener_account_changed (GConfClient *client, guint cnxn_id,
@@ -178 +193 @@
-        TnyMaemoAccountStorePriv *priv = TNY_MAEMO_ACCOUNT_STORE_GET_PRIVATE (self);
-
-
-        gchar *key = g_strdup (entry->key);
-        gchar *ptr = strrchr (key, '/'); ptr++;
@@ -184 +198 @@
-        if (!strcmp (ptr, "count"))
-        {
+                kill_stored_accounts (priv);
-                g_signal_emit (self, 
-                        tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNTS_RELOADED], 0);
-
-        }
-
@@ -194 +208 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        gint i=0, count, port;
-
-        g_assert (TNY_IS_LIST (list));
-
-        count = gconf_client_get_int (priv->client, 
@@ -239 +220 @@
-        for (i=0; i < count; i++)
-        {
+
-                gchar *proto, *type, *key, *name, *mech;
-                TnyAccount *account = NULL;
@@ -274 +256 @@
-                        (const gchar*) key, NULL);
-                g_free (key);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                if (type)
-                        g_free (type);
@@ -330 +306 @@
-                        }
-
-                        /* Because we only check for the n first bytes, the pops, imaps and smtps also work */
-                        if (!g_ascii_strncasecmp (proto, "pop", 3) ||
-                                !g_ascii_strncasecmp (proto, "imap", 4))
@@ -336 +311 @@
-                                gchar *user, *hostname;
-
-                                /* TODO: Add other supported and tested providers here */
-                                key = g_strdup_printf ("/apps/tinymail/accounts/%d/user", i);
-                                user = gconf_client_get_string (priv->client, 
@@ -378 +352 @@
-                        g_free (key);
-
-                        /* 
-                         * Setting the password function must happen after
-                         * setting the host, user and protocol.
-                         */
-
-                        tny_account_set_forget_pass_func (TNY_ACCOUNT (account),
-                                per_account_forget_pass_func);
@@ -389 +358 @@
-                                per_account_get_pass_func);
-
-
-
-
+
-
-                }
@@ -401 +368 @@
-                        g_free (mech);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+