Changeset 76

Timestamp:

04/15/08 18:45:16

Author:

pvanhoof

Message:

• • • • Implemented simple account management
        
      • Implemented a new account store
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/src/tmut-account-editor.c (modified) (7 diffs)
• trunk/src/tmut-account-editor.h (modified) (1 diff)
• trunk/src/tmut-account-manager.c (modified) (10 diffs)
• trunk/src/tmut-account-store.c (modified) (14 diffs)
• trunk/src/tmut-account-store.h (modified) (3 diffs)
• trunk/src/tmut-folder-selector.c (modified) (6 diffs)
• trunk/src/tmut-menu-view.c (modified) (7 diffs)
• trunk/src/tmut-msg-creator.c (modified) (6 diffs)

trunk/ChangeLog

@@ -2 +2 @@
-
-        * Added the first signs of simple account management
+        * Implemented simple account management
+        * Implemented a new account store
-
-2008-03-26  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/src/tmut-account-editor.c

@@ -45 +45 @@
-
-        GtkWidget *name_entry, *hostname_entry, *enabled_checkbutton,
-
+, *options_entry
-};
-
@@ -55 +55 @@
-tmut_account_editor_get_enabled (TMutAccountEditor *self)
-{
-        //TMutAccountEditorPriv *priv = TMUT_ACCOUNT_EDITOR_GET_PRIVATE (self);
-        return TRUE;
-        //return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->enabled_checkbutton));
-}
-
@@ -95 +93 @@
-}
-
-const 
+
-tmut_account_editor_get_options (TMutAccountEditor *self)
-{
-
+
+
+
-}
-
@@ -140 +140 @@
-        g_signal_emit (G_OBJECT (self), 
-                tmut_account_editor_signals [TMUT_ACCOUNT_EDITOR_OK_CLICKED], 0);
+        tmut_shell_window_back (tmut_shell_child_get_window (TMUT_SHELL_CHILD (user_data)));
-        return;
-}
@@ -158 +159 @@
-        GtkWidget *ok_button, *cancel_button;
-        GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
-5
+6
-
-        gtk_widget_show (hbox);
@@ -207 +208 @@
-        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-
+        label = gtk_label_new (_("Options"));
+        gtk_widget_show (label);
+        gtk_table_attach (GTK_TABLE (table), label, 0, 1, 5, 6,
+        (GtkAttachOptions) (GTK_FILL),
+        (GtkAttachOptions) (0), 0, 0);
+        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+
-        priv->name_entry = gtk_entry_new ();
-        gtk_widget_show (priv->name_entry);
@@ -234 +242 @@
-        gtk_widget_show (priv->type_entry);
-        gtk_table_attach (GTK_TABLE (table), priv->type_entry, 1, 2, 4, 5,
+                (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                (GtkAttachOptions) (0), 0, 0);
+
+        priv->options_entry = gtk_entry_new ();
+        gtk_widget_show (priv->options_entry);
+        gtk_table_attach (GTK_TABLE (table), priv->options_entry, 1, 2, 5, 6,
-                (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                (GtkAttachOptions) (0), 0, 0);

trunk/src/tmut-account-editor.h

@@ -63 +63 @@
-const gchar* tmut_account_editor_get_account_type (TMutAccountEditor *self); 
-const gchar* tmut_account_editor_get_user (TMutAccountEditor *self);
-const 
+
-TnyAccount *tmut_account_editor_get_account (TMutAccountEditor *self);
-

trunk/src/tmut-account-manager.c

@@ -41 +41 @@
-        GtkComboBox *accounts_combo;
-        TMutShellWindow *shell;
+        TnyAccount *account;
-        TnyAccountStore *account_store;
-TnyAccount *account
+gint account_created_signal, account_deleted_signal
-};
-
@@ -69 +70 @@
-        OnEditOrNewInfo *info = (OnEditOrNewInfo *) user_data;
-        TMutAccountManagerPriv *priv = TMUT_ACCOUNT_MANAGER_GET_PRIVATE (info->self);
+        gchar **options = tmut_account_editor_get_options (editor);
-
-        tmut_account_store_create_account (TMUT_ACCOUNT_STORE (priv->account_store), 
@@ -77 +79 @@
-                tmut_account_editor_get_account_type (editor), 
-                tmut_account_editor_get_user (editor), 
-
+
+
+
+
-}
-
@@ -87 +92 @@
-        TMutAccountManagerPriv *priv = TMUT_ACCOUNT_MANAGER_GET_PRIVATE (info->self);
-        TnyAccount *account = tmut_account_editor_get_account (editor);
+        gchar **options = tmut_account_editor_get_options (editor);
-
-        tmut_account_store_edit_account (TMUT_ACCOUNT_STORE (priv->account_store), 
@@ -94 +100 @@
-                tmut_account_editor_get_hostname (editor), 
-                tmut_account_editor_get_proto (editor), 
-                tmut_account_editor_get_account_type (editor), 
-                tmut_account_editor_get_user (editor), 
-
+
+
+
+
-
-        g_object_unref (account);
@@ -156 +164 @@
-        g_object_unref (priv->account);
-        priv->account = NULL;
-
-        g_print ("Delete");
-
-        return;
@@ -248 +254 @@
-
-static void
+on_account_created (TMutAccountStore *store, TnyAccount *account, TMutAccountManager *self)
+{
+        TMutAccountManagerPriv *priv = TMUT_ACCOUNT_MANAGER_GET_PRIVATE (self);
+        TnyList *model = TNY_LIST (gtk_combo_box_get_model (priv->accounts_combo));
+        tny_list_prepend (model, (GObject *) account);
+}
+
+
+static void
+on_account_deleted (TMutAccountStore *store, TnyAccount *account, TMutAccountManager *self)
+{
+        TMutAccountManagerPriv *priv = TMUT_ACCOUNT_MANAGER_GET_PRIVATE (self);
+        gtk_combo_box_set_active (priv->accounts_combo, -1);
+        TnyList *model = TNY_LIST (gtk_combo_box_get_model (priv->accounts_combo));
+        tny_list_remove (model, (GObject *) account);
+}
+
+
+static void
+disconnect_account_store (TMutAccountManagerPriv *priv)
+{
+        g_signal_handler_disconnect (priv->account_store, priv->account_created_signal);
+        g_signal_handler_disconnect (priv->account_store, priv->account_deleted_signal);
+        g_object_unref (priv->account_store);
+        priv->account_store = NULL;
+}
+
+static void
-tmut_account_manager_set_account_store (TnyAccountStoreView *self, TnyAccountStore *account_store)
-{
@@ -259 +293 @@
-
-        if (priv->account_store)
-g_object_unref (priv->account_store
+disconnect_account_store (priv
-        priv->account_store = TNY_ACCOUNT_STORE (g_object_ref (account_store));
+
+        priv->account_created_signal = g_signal_connect (G_OBJECT (priv->account_store), "account_created",
+                G_CALLBACK (on_account_created), self);
+        priv->account_deleted_signal = g_signal_connect (G_OBJECT (priv->account_store), "account_deleted",
+                G_CALLBACK (on_account_deleted), self);
-
-        TMUT_ACCOUNT_MANAGER_GET_CLASS (self)->create_menu (TMUT_ACCOUNT_MANAGER (self));
@@ -275 +314 @@
-        GtkVBox *vbox = GTK_VBOX (self);
-        GtkCellRenderer *renderer;
-
+Account manager
-
-        priv->account_store = NULL;
+        priv->account_created_signal = -1;
+        priv->account_deleted_signal = -1;
+
-        priv->account = NULL;
-
@@ -308 +350 @@
-
-        if (priv->account_store)
-g_object_unref (priv->account_store
+disconnect_account_store (priv
-
-        (*parent_class->finalize) (object);

trunk/src/tmut-account-store.c

@@ -22 +22 @@
-#endif
-
+#include <string.h>
+#include <glib.h>
+#include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static GObjectClass *parent_class = NULL;
-
+typedef enum {
+        TMUT_ACCOUNT_STORE_ACCOUNT_DELETED,
+        TMUT_ACCOUNT_STORE_ACCOUNT_CREATED,
+        TMUT_ACCOUNT_STORE_ACCOUNT_EDITED,
+        TMUT_ACCOUNT_STORE_LAST_SIGNAL
+} TMutAccountStoreSignal;
+
+static guint tmut_account_store_signals [TMUT_ACCOUNT_STORE_LAST_SIGNAL];
+
-typedef struct _TMutAccountStorePriv TMutAccountStorePriv;
-
-struct _TMutAccountStorePriv
-{
-
+
+
+
+
+
-};
-
@@ -39 +73 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                gboolean enabled,
-                const gchar *name, 
@@ -46 +166 @@
-                const gchar *type,
-                const gchar *user,
+                const gchar *mech,
+                gint port,
-                const gchar **options)
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -61 +264 @@
-                const gchar *hostname, 
-                const gchar *proto,
-                const gchar *type,
-                const gchar *user,
+                const gchar *mech,
+                gint port,
-                const gchar **options)
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static void
@@ -72 +433 @@
-{
-        TMutAccountStorePriv *priv = TMUT_ACCOUNT_STORE_GET_PRIVATE (self);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -79 +461 @@
-{
-        TMutAccountStorePriv *priv = TMUT_ACCOUNT_STORE_GET_PRIVATE (self);
-
+
+
+
-}
-
@@ -86 +470 @@
-{
-        TMutAccountStorePriv *priv = TMUT_ACCOUNT_STORE_GET_PRIVATE (self);
-tny_account_store_get_device (priv->decorated
+g_object_ref (priv->device
-}
-
@@ -93 +477 @@
-{
-        TMutAccountStorePriv *priv = TMUT_ACCOUNT_STORE_GET_PRIVATE (self);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -100 +509 @@
-{
-        TMutAccountStorePriv *priv = TMUT_ACCOUNT_STORE_GET_PRIVATE (self);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -109 +536 @@
-        TMutAccountStorePriv *priv = TMUT_ACCOUNT_STORE_GET_PRIVATE (object);
-
-
-
+
+
+
+
+
+
-
-        parent_class->finalize (object);
@@ -121 +552 @@
-        TMutAccountStore *self = g_object_new (TMUT_TYPE_ACCOUNT_STORE, NULL);
-        TMutAccountStorePriv *priv = TMUT_ACCOUNT_STORE_GET_PRIVATE (self);
-
+
+
-        return TNY_ACCOUNT_STORE (self);
-}
@@ -129 +561 @@
-{
-        TMutAccountStorePriv *priv = TMUT_ACCOUNT_STORE_GET_PRIVATE (instance);
-
+
+
+
+
+
+
-        return;
-}
@@ -156 +593 @@
-
-}
+
+
+
+static void
+tmut_account_store_base_init (gpointer g_class)
+{
+        static gboolean tmut_account_store_initialized = FALSE;
+
+        if (!tmut_account_store_initialized) 
+        {
+                tmut_account_store_signals[TMUT_ACCOUNT_STORE_ACCOUNT_DELETED] =
+                   g_signal_new ("account_deleted",
+                        TMUT_TYPE_ACCOUNT_STORE,
+                        G_SIGNAL_RUN_FIRST,
+                        G_STRUCT_OFFSET (TMutAccountStoreClass, account_deleted),
+                        NULL, NULL,
+                        g_cclosure_marshal_VOID__OBJECT, 
+                        G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT);
+
+                tmut_account_store_signals[TMUT_ACCOUNT_STORE_ACCOUNT_EDITED] =
+                   g_signal_new ("account_edited",
+                        TMUT_TYPE_ACCOUNT_STORE,
+                        G_SIGNAL_RUN_FIRST,
+                        G_STRUCT_OFFSET (TMutAccountStoreClass, account_edited),
+                        NULL, NULL,
+                        g_cclosure_marshal_VOID__OBJECT, 
+                        G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT);
+
+                tmut_account_store_signals[TMUT_ACCOUNT_STORE_ACCOUNT_CREATED] =
+                   g_signal_new ("account_created",
+                        TMUT_TYPE_ACCOUNT_STORE,
+                        G_SIGNAL_RUN_FIRST,
+                        G_STRUCT_OFFSET (TMutAccountStoreClass, account_created),
+                        NULL, NULL,
+                        g_cclosure_marshal_VOID__OBJECT, 
+                        G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT);
+
+                tmut_account_store_initialized = TRUE;
+        }
+}
+
-
-GType
@@ -166 +644 @@
-                {
-                        sizeof (TMutAccountStoreClass),
-NULL
+tmut_account_store_base_init
-                        NULL,   /* base_finalize */
-                        (GClassInitFunc) tmut_account_store_class_init,   /* class_init */

trunk/src/tmut-account-store.h

@@ -43 +43 @@
-{
-        GObjectClass parent;
+
+        /* Signals */
+        void (*account_deleted) (TMutAccountStore *self, TnyAccount *account);
+        void (*account_created) (TMutAccountStore *self, TnyAccount *account);
+        void (*account_edited) (TMutAccountStore *self, TnyAccount *account);
-};
-
@@ -55 +60 @@
-                const gchar *type,
-                const gchar *user,
+                const gchar *mech,
+                gint port,
-                const gchar **options);
-
@@ -64 +71 @@
-                const gchar *hostname, 
-                const gchar *proto,
-                const gchar *type,
-                const gchar *user,
+                const gchar *mech,
+                gint port,
-                const gchar **options);
-

trunk/src/tmut-folder-selector.c

@@ -27 +27 @@
-#include "tmut-shell-window.h"
-#include "tmut-shell-child.h"
+#include "tmut-account-store.h"
-
-#include <tny-gtk-folder-store-tree-model.h>
@@ -39 +40 @@
-        TMutShellWindow *shell;
-        TnyFolderStore *current;
+        TnyAccountStore *account_store;
+        gint account_created_signal, account_deleted_signal;
-};
-
@@ -62 +65 @@
-}
-
+static void
+disconnect_account_store (TMutFolderSelectorPriv *priv)
+{
+        g_signal_handler_disconnect (priv->account_store, priv->account_created_signal);
+        g_signal_handler_disconnect (priv->account_store, priv->account_deleted_signal);
+        g_object_unref (priv->account_store);
+        priv->account_store = NULL;
+}
+
+static void
+on_account_created (TMutAccountStore *store, TnyAccount *account, TMutFolderSelector *self)
+{
+        TMutFolderSelectorPriv *priv = TMUT_FOLDER_SELECTOR_GET_PRIVATE (self);
+        TnyList *model = TNY_LIST (gtk_tree_view_get_model (priv->folders_treeview));
+        tny_list_prepend (model, (GObject *) account);
+}
+
+
+static void
+on_account_deleted (TMutAccountStore *store, TnyAccount *account, TMutFolderSelector *self)
+{
+        TMutFolderSelectorPriv *priv = TMUT_FOLDER_SELECTOR_GET_PRIVATE (self);
+        TnyList *model = TNY_LIST (gtk_tree_view_get_model (priv->folders_treeview));
+        tny_list_remove (model, (GObject *) account);
+}
-
-static void
@@ -75 +103 @@
-        model = tny_gtk_folder_store_tree_model_new (query);
-
-
+
+
+
+
+
-                TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+
+        priv->account_created_signal = g_signal_connect (G_OBJECT (priv->account_store), "account_created",
+                G_CALLBACK (on_account_created), self);
+        priv->account_deleted_signal = g_signal_connect (G_OBJECT (priv->account_store), "account_deleted",
+                G_CALLBACK (on_account_deleted), self);
-
-        gtk_tree_view_set_model (priv->folders_treeview, model);
@@ -137 +174 @@
-        GtkTreeSelection *select;
-        GtkWidget *sw;
+
+        priv->account_store = NULL;
+        priv->account_created_signal = -1;
+        priv->account_deleted_signal = -1;
-
-        priv->current = NULL;
@@ -172 +213 @@
-tmut_folder_selector_finalize (GObject *object)
-{
+        TMutFolderSelectorPriv *priv = TMUT_FOLDER_SELECTOR_GET_PRIVATE (object);
+
+        if (priv->account_store)
+                disconnect_account_store (priv);
-
-        (*parent_class->finalize) (object);

trunk/src/tmut-menu-view.c

@@ -24 +24 @@
-#include <glib/gi18n-lib.h>
-
+#include "tmut-account-store.h"
-#include "tmut-menu-view.h"
-#include "tmut-folder-view.h"
@@ -45 +46 @@
-        TMutShellWindow *shell;
-        TnyAccountStore *account_store;
+        TnyAccount *active_account;
+        gint account_created_signal, account_deleted_signal;
-};
-
@@ -606 +609 @@
-        gtk_tree_view_set_model (priv->folders_treeview, model);
-
+        if (priv->active_account)
+                g_object_unref (priv->active_account);
+        priv->active_account = g_object_ref (account);
+
-        g_object_unref (model);
-
@@ -635 +642 @@
-}
-
+static void
+on_account_created (TMutAccountStore *store, TnyAccount *account, TMutMenuView *self)
+{
+        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (self);
+