Changeset 578

Timestamp:

07/26/06 12:24:39

Author:

pvanhoof

Message:

Implemented an extremely simple non-gconf account store

Files:

• trunk/configure.ac (modified) (7 diffs)
• trunk/libtinymail-olpc/tny-account-store.c (modified) (13 diffs)

trunk/configure.ac

@@ -51 +51 @@
-AC_PROG_LIBTOOL
-
+dnl ### default value
+build_gnome=true
+
+dnl ### Select the platform library ##
+AC_ARG_WITH(platform,
+[  --with-platform=gnome-desktop                platform to compile [gnome-desktop]],
+[case "${with_platform}" in
+  gnome-desktop) PLATFORMDIR=libtinymail-gnome-desktop ;;
+  olpc)
+        PLATFORMDIR=libtinymail-olpc
+        build_gtkhtml=false
+        build_mozembed=false
+        build_gnome=false
+        with_html_component=none
+        ;;
+  maemo)
+        PLATFORMDIR=libtinymail-maemo
+        build_gtkhtml=false
+        build_mozembed=false
+        build_gnome=false
+        with_html_component=none
+        ;;
+  gpe) PLATFORMDIR=libtinymail-gpe ;;
+  *) PLATFORMDIR=${with_platform}
+esac], [PLATFORMDIR=libtinymail-gnome-desktop
+        with_platform=gnome-desktop])
+AC_SUBST(PLATFORMDIR)
+
-
-dnl ### Enable gnome features ##
@@ -59 +87 @@
-  no)  build_gnome=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-gnome) ;;
-tru
+$build_gnom
-AM_CONDITIONAL(BUILD_GNOME, test x$build_gnome = xtrue)
-
@@ -106 +134 @@
-AM_CONDITIONAL(BUILD_UNITTESTS, test x$build_unittests = xtrue)
-
-dnl ### Select the platform library ##
-AC_ARG_WITH(platform,
-[  --with-platform=gnome-desktop                platform to compile [gnome-desktop]],
-[case "${with_platform}" in
-  gnome-desktop) PLATFORMDIR=libtinymail-gnome-desktop ;;
-  olpc) PLATFORMDIR=libtinymail-olpc ;;
-  maemo) PLATFORMDIR=libtinymail-maemo ;;
-  gpe) PLATFORMDIR=libtinymail-gpe ;;
-  *) PLATFORMDIR=${with_platform}
-esac], [PLATFORMDIR=libtinymail-gnome-desktop
-        with_platform=gnome-desktop])
-AC_SUBST(PLATFORMDIR)
-
-dnl ### gtk-doc
-GTK_DOC_CHECK([1.0])
@@ -179 +194 @@
-dnl ### libtinymail-olpc, a platform library implementation for the One Laptop Per Child device ##
-if test x$PLATFORMDIR = xlibtinymail-olpc; then
-conf-2.0 glib-2.0 >= 2.8 gobject-2.0 gconf
+lib-2.0 >= 2.8 gobject
-else
- LIBTINYMAIL_OLPC_CFLAGS=
@@ -190 +205 @@
-dnl ### libtinymail-maemo, a platform library implementation for the maemo platform ##
-if test x$PLATFORMDIR = xlibtinymail-maemo; then
-conf-2.0 g
+
-else
- LIBTINYMAIL_MAEMO_CFLAGS=
@@ -200 +215 @@
-dnl ### libtinymail-gpe, a platform library implementation for the GPE platform ##
-if test x$PLATFORMDIR = xlibtinymail-gpe; then
-conf-2.0 g
+
-else
- LIBTINYMAIL_GPE_CFLAGS=
@@ -223 +238 @@
-
-dnl ### tinymail, the demo-ui ##
-
-
+
-AC_SUBST(TINYMAIL_CFLAGS)
-AC_SUBST(TINYMAIL_LIBS)

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

@@ -24 +24 @@
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <gconf/gconf-client.h>
-
-#include <tny-platform-factory-iface.h>
@@ -52 +51 @@
-struct _TnyAccountStorePriv
-{
-        GConfClient *client;
-        gchar *cache_dir;
-        TnySessionCamel *session;
-        TnyDeviceIface *device;
@@ -78 +75 @@
-        if (G_UNLIKELY (!retval))
-        {
-                /* This crashes on subsequent calls (any gtk widget creation does) */
-                GtkDialog *dialog = GTK_DIALOG (tny_password_dialog_new ());
-        
@@ -168 +164 @@
-}
-
-static void
-gconf_listener_account_changed (GConfClient *client, guint cnxn_id,
-                        GConfEntry *entry, gpointer user_data)
-{
-        TnyAccountStoreIface *self = user_data;
-        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
-
-
-        gchar *key = g_strdup (entry->key);
-        gchar *ptr = strrchr (key, '/'); ptr++;
-
-        if (!strcmp (ptr, "count"))
-        {
-                g_signal_emit (self, 
-                        tny_account_store_iface_signals [TNY_ACCOUNT_STORE_IFACE_ACCOUNTS_RELOADED], 0);
-
-        }
-
-        g_free (key);
-
-        return;
-}
-
-
-static const gchar*
-tny_account_store_get_cache_dir (TnyAccountStoreIface *self)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -228 +177 @@
-        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
-        gint i=0, count;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                TnyAccountIface *account = NULL;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-                if (type && G_LIKELY (!g_ascii_strncasecmp (type, "transport", 9)))
@@ -275 +224 @@
-                        tny_account_iface_set_account_store (account, self);
-
-
-
-
-
-
-
-
+
-                        tny_account_iface_set_proto (TNY_ACCOUNT_IFACE (account), proto);
-
-
-
-
-
+
-                        tny_account_iface_set_name (TNY_ACCOUNT_IFACE (account), name);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                        {
-
-
-
-
-
-
-
+
+
-                        }
-
@@ -316 +248 @@
-
-                                /* TODO: Add other supported and tested providers here */
-
-
-
-
-
+
-                                tny_account_iface_set_user (TNY_ACCOUNT_IFACE (account), user);
-
-
-
-
-
+
+
-                                tny_account_iface_set_hostname (TNY_ACCOUNT_IFACE (account), 
-                                        hostname);
-                                
-                                g_free (hostname); g_free (proto); g_free (user);
-                        } else {
-                                gchar *url_string;
@@ -337 +262 @@
-                                /* Assuming there's a url_string in this case */
-
-
-
-
-
-
+
-                                tny_account_iface_set_url_string (TNY_ACCOUNT_IFACE (account), url_string);
-                                g_free (url_string);
-                        }
-
-
-
-
+
-
-                        /* 
@@ -363 +281 @@
-                        tny_list_iface_prepend (list, account);
-                }
+
+                fclose (file);
+          }
+        
+        }       
+        g_dir_close (dir);
+
+
+        tny_session_camel_set_current_accounts (priv->session, list);
+
+        return; 
+}
+
+
+
+static void
+tny_account_store_add_account (TnyAccountStoreIface *self, TnyAccountIface *account, const gchar *type)
+{
+        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+        gchar *filen = g_build_filename (g_get_home_dir(),  ".tinymail", 
+                tny_account_iface_get_name (account));
+        
+        FILE *file = fopen (filen, "w");
+
+        if (file)
+        {
+
+                fprintf (file, "type=%s", type);
+                fprintf (file, "proto=%s", tny_account_iface_get_proto (account));
+                fprintf (file, "name=%s", tny_account_iface_get_name (account));
+                fprintf (file, "options=");
+                fprintf (file, "user=%s", tny_account_iface_get_user (account));
+                fprintf (file, "hostname=%s", tny_account_iface_get_hostname (account));
+
+
+                fclose (file);
-        }
-
-        tny_session_camel_set_current_accounts (priv->session, list);
-
-        return; 
-}
-
-
-static void
-tny_account_store_notify_add (TnyAccountStoreIface *self)
-{
-        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
-        priv->notify = gconf_client_notify_add (priv->client, 
-                "/apps/tinymail/accounts", gconf_listener_account_changed,
-                self, NULL, NULL);
-        return;
-}
-
-static void
-tny_account_store_notify_remove (TnyAccountStoreIface *self)
-{
-        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
-        gconf_client_notify_remove (priv->client, priv->notify);
-        return;
-}
-
-/*
-        gconftool-2 -s /apps/tinymail/cache_dir -t string .tinymail
-
-        gconftool-2 -s /apps/tinymail/accounts/count -t int COUNT
-        gconftool-2 -s /apps/tinymail/accounts/0/proto -t string [smtp|imap|pop]
-        gconftool-2 -s /apps/tinymail/accounts/0/type -t string [transport|store]
-
-        gconftool-2 -s /apps/tinymail/accounts/0/user -t string username
-        gconftool-2 -s /apps/tinymail/accounts/0/hostname -t string mailserver
-or
-        gconftool-2 -s /apps/tinymail/accounts/0/url_string -t string url_string
-
-*/
-
-static void
-tny_account_store_add_account (TnyAccountStoreIface *self, TnyAccountIface *account, const gchar *type)
-{
-        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
-        gchar *key = NULL;
-        gint count = gconf_client_get_int (priv->client, "/apps/tinymail/accounts/count", NULL);
-
-        count++;
-
-        key = g_strdup_printf ("/apps/tinymail/accounts/%d/hostname", count);
-        gconf_client_set_string (priv->client, (const gchar*) key, 
-                tny_account_iface_get_hostname (account), NULL);
-        g_free (key); 
-
-        key = g_strdup_printf ("/apps/tinymail/accounts/%d/proto", count);
-        gconf_client_set_string (priv->client, (const gchar*) key, 
-                tny_account_iface_get_proto (account), NULL);
-        g_free (key); 
-
-        key = g_strdup_printf ("/apps/tinymail/accounts/%d/type", count);
-        gconf_client_set_string (priv->client, (const gchar*) key, type, NULL);
-        g_free (key); 
-
-        key = g_strdup_printf ("/apps/tinymail/accounts/%d/user", count);
-        gconf_client_set_string (priv->client, (const gchar*) key, 
-                tny_account_iface_get_user (account), NULL);
-        g_free (key); 
-
-        gconf_client_set_int (priv->client, "/apps/tinymail/accounts/count", 
-                count, NULL);
-
-        return;
-}
@@ -444 +329 @@
-        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
-
-        tny_account_store_notify_remove (self);
-        tny_account_store_add_account (self, TNY_ACCOUNT_IFACE (account), "store");
-        tny_account_store_notify_add (self);
-
-        g_signal_emit (self, tny_account_store_iface_signals [TNY_ACCOUNT_STORE_IFACE_ACCOUNT_INSERTED], 0, account);
@@ -458 +341 @@
-        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
-
-        tny_account_store_notify_remove (self);
-        tny_account_store_add_account (self, TNY_ACCOUNT_IFACE (account), "transport");
-        tny_account_store_notify_add (self);
-
-        g_signal_emit (self, tny_account_store_iface_signals [TNY_ACCOUNT_STORE_IFACE_ACCOUNT_INSERTED], 0, account);
@@ -503 +384 @@
-        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
-
-        priv->client = gconf_client_get_default ();
-
-        gconf_client_add_dir (priv->client, "/apps/tinymail", 
-                GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
-
-        tny_account_store_notify_add (TNY_ACCOUNT_STORE_IFACE (self));
-
-        return;
@@ -516 +391 @@
-static void
-tny_account_store_finalize (GObject *object)
-
-
-
-
-
-
-
-
-
-
+
-        (*parent_class->finalize) (object);
-