Changeset 1649

Timestamp:

02/16/07 19:14:06

Author:

pvanhoof

Message:

observer stuff

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (8 diffs)
• trunk/libtinymail/tny-folder-change.c (modified) (5 diffs)
• trunk/libtinymail/tny-folder-change.h (modified) (2 diffs)
• trunk/libtinymail/tny-folder-store-change.c (modified) (8 diffs)
• trunk/libtinymail/tny-folder-store-change.h (modified) (2 diffs)
• trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c (modified) (11 diffs)
• trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.h (modified) (1 diff)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (7 diffs)

trunk/ChangeLog

@@ -4 +4 @@
-        * TnyFolderStoreObserver notifications
-        * Implementation for poke() in tnycamelfolder
+        * Lot's of fixes to the TnyFolderStoreObserver infrastructure
+        * First pieces of letting TnyGtkFolderStoreTreeModel become a
+        self-responsible TnyFolderStoreObserver and TnyFolderObserver (letting
+        it act on changes)
-
-2007-02-16  Sergio Villar Senin  <svillar@igalia.com>

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

@@ -77 +77 @@
-        TnyIterator *iter;
-
+        if (!priv->sobservers)
+                return;
+
-        iter = tny_list_create_iterator (priv->sobservers);
-        while (!tny_iterator_is_done (iter))
@@ -93 +96 @@
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-        TnyIterator *iter;
+
+        if (!priv->observers)
+                return;
-
-        iter = tny_list_create_iterator (priv->observers);
@@ -607 +613 @@
-_tny_camel_folder_set_all_count (TnyCamelFolder *self, guint len)
-{
-
-
-
-
-
-
-
-
-
-
+
+
-
-        return;
@@ -1976 +1974 @@
-        } else if (priv->cached_name)
-        {
+                TnyFolderChange *change;
+
+                change = tny_folder_change_new (self);
+                tny_folder_change_set_rename (change, name);
+                notify_folder_observers_about (self, change);
+                g_object_unref (G_OBJECT (change));
+
-                g_free (priv->cached_name);
-                priv->cached_name = g_strdup (name);
@@ -2623 +2628 @@
-        g_assert (TNY_IS_FOLDER_OBSERVER (observer));
-
+        /* TNY TODO: locking */
+
+        if (!priv->observers)
+                priv->observers = tny_simple_list_new ();
+
-        tny_list_prepend (priv->observers, G_OBJECT (observer));
-
@@ -2665 +2675 @@
-
-        g_assert (TNY_IS_FOLDER_STORE_OBSERVER (observer));
+
+        /* TNY TODO: locking */
+
+        if (!priv->sobservers)
+                priv->sobservers = tny_simple_list_new ();
-
-        tny_list_prepend (priv->sobservers, G_OBJECT (observer));
@@ -2720 +2735 @@
-        priv->dont_fkill = FALSE;
-
-
+
+
+
+
-
-        if (priv->account && TNY_IS_CAMEL_STORE_ACCOUNT (priv->account))
@@ -2886 +2904 @@
-        priv->unread_sync = 0;
-        priv->dont_fkill = FALSE;
-
+
+
-        priv->iter = NULL;
-        priv->iter_parented = FALSE;

trunk/libtinymail/tny-folder-change.c

@@ -34 +34 @@
-        GMutex *lock;
-        TnyFolder *folder;
+        gchar *oldname, *newname;
-        TnyFolderChangeChanged changed;
-};
@@ -278 +279 @@
-}
-
+/**
+ * tny_folder_change_get_rename:
+ * @self: a #TnyFolderChange instance
+ * @oldname: a pointer to a string
+ *
+ * Get the new name of the folder in case of a rename. This will return NULL
+ * of nu rename happened. You can pass a pointer if you need the old folder
+ * name too.
+ *
+ * You must not free the return value nor the @oldname pointer. It's handled
+ * internally in the TnyFolderChange type.
+ **/
+const gchar *
+tny_folder_change_get_rename (TnyFolderChange *self, const gchar **oldname)
+{
+        const gchar *retval = NULL;
+        TnyFolderChangePriv *priv = TNY_FOLDER_CHANGE_GET_PRIVATE (self);
+
+        g_mutex_lock (priv->lock);
+
+        if (priv->changed & TNY_FOLDER_CHANGE_CHANGED_FOLDER_RENAME)
+        {
+                retval = priv->newname;
+                if (oldname)
+                        *oldname = priv->oldname;
+        }
+
+        g_mutex_unlock (priv->lock);
+
+        return retval;
+}
+
+/**
+ * tny_folder_change_set_rename:
+ * @self: a #TnyFolderChange instance
+ * @newname: the new name of the folder
+ *
+ * Mark the change in such a way that the user can know that a rename has 
+ * happened. The TnyFolderChange will copy your @newname internally, so you
+ * can do whatever you want with what you passed afterwards.
+ **/
+void 
+tny_folder_change_set_rename (TnyFolderChange *self, const gchar *newname)
+{
+        TnyFolderChangePriv *priv = TNY_FOLDER_CHANGE_GET_PRIVATE (self);
+
+        g_mutex_lock (priv->lock);
+        priv->changed |= TNY_FOLDER_CHANGE_CHANGED_FOLDER_RENAME;
+        if (priv->newname)
+                g_free (priv->newname);
+        priv->newname = g_strdup (newname);
+        g_mutex_unlock (priv->lock);
+}
+
-
-/**
@@ -294 +349 @@
-
-        priv->folder = TNY_FOLDER (g_object_ref (G_OBJECT (folder)));
+        priv->oldname = g_strdup (tny_folder_get_name (folder));
-
-        return self;
@@ -338 +394 @@
-        priv->removed = NULL;
-        priv->folder = NULL;
+        priv->oldname = NULL;
+        priv->newname = NULL;
-
-        g_mutex_unlock (priv->lock);
@@ -358 +416 @@
-        priv->added = NULL;
-        priv->removed = NULL;
+
+        if (priv->oldname)
+                g_free (priv->oldname);
+        if (priv->newname)
+                g_free (priv->newname);
-
-        if (priv->folder)

trunk/libtinymail/tny-folder-change.h

@@ -46 +46 @@
-        TNY_FOLDER_CHANGE_CHANGED_UNREAD_COUNT,
-        TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS,
-
+
+
-};
-
@@ -62 +63 @@
-TnyFolderChange* tny_folder_change_new (TnyFolder *folder);
-
+const gchar *tny_folder_change_get_rename (TnyFolderChange *self, const gchar **oldname);
+void tny_folder_change_set_rename (TnyFolderChange *self, const gchar *newname);
-void tny_folder_change_set_new_all_count (TnyFolderChange *self, guint new_all_count);
-void tny_folder_change_set_new_unread_count (TnyFolderChange *self, guint new_unread_count);

trunk/libtinymail/tny-folder-store-change.c

@@ -29 +29 @@
-struct _TnyFolderStoreChangePriv
-{
-, *renamed
+
-        GMutex *lock;
-        TnyFolderStore *folderstore;
@@ -80 +80 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
- * @self: a #TnyFolderStoreChange instance
- * @folder: the folder to add to the changeset
@@ -170 +147 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-{
-        TnyFolderStoreChangePriv *priv = TNY_FOLDER_STORE_CHANGE_GET_PRIVATE (self);
@@ -187 +165 @@
-        g_mutex_lock (priv->lock);
-
-creat
+remov
-        {
-                g_mutex_unlock (priv->lock);
@@ -193 +171 @@
-        }
-
-nam
+mov
-
-        while (!tny_iterator_is_done (iter))
@@ -210 +188 @@
-}
-
-
-/**
- * tny_folder_store_change_get_removed_folders:
- * @self: a #TnyFolderStoreChange instance
- * @folders: the #TnyList where the removed folders will be put it
- *
- * Get the removed folders in this changeset
- **/
-void 
-tny_folder_store_change_get_removed_folders (TnyFolderStoreChange *self, TnyList *folders)
-{
-        TnyFolderStoreChangePriv *priv = TNY_FOLDER_STORE_CHANGE_GET_PRIVATE (self);
-        TnyIterator *iter;
-
-        g_assert (TNY_IS_LIST (folders));
-
-        g_mutex_lock (priv->lock);
-
-        if (!priv->removed)
-        {
-                g_mutex_unlock (priv->lock);
-                return;
-        }
-
-        iter = tny_list_create_iterator (priv->removed);
-
-        while (!tny_iterator_is_done (iter))
-        {
-                GObject *folder = tny_iterator_get_current (iter);
-                tny_list_prepend (folders, folder);
-                g_object_unref (folder);
-                tny_iterator_next (iter);
-        }
-
-        g_object_unref (G_OBJECT (iter));
-
-        g_mutex_unlock (priv->lock);
-
-        return;
-}
-
-/**
- * tny_folder_store_change_reset:
@@ -265 +202 @@
-
-        priv->changed = 0;
-        if (priv->created)
-                g_object_unref (G_OBJECT (priv->created));
-        if (priv->removed)
-                g_object_unref (G_OBJECT (priv->removed));
-        if (priv->renamed)
-                g_object_unref (G_OBJECT (priv->removed));
-        priv->created = NULL;
-        priv->removed = NULL;
-        priv->renamed = NULL;
-
-        g_mutex_unlock (priv->lock);
-}
-
-
-/**
- * tny_folder_store_change_new:
- * @folderstore: a #TnyFolderStore instance
- *
- * Creates a changeset for @folderstore
- *
- * Return value: a new #TnyFolderStoreChange instance
- **/
-TnyFolderStoreChange*
-tny_folder_store_change_new (TnyFolderStore *folderstore)
-{
-        TnyFolderStoreChange *self = g_object_new (TNY_TYPE_FOLDER_STORE_CHANGE, NULL);
-        TnyFolderStoreChangePriv *priv = TNY_FOLDER_STORE_CHANGE_GET_PRIVATE (self);
-
-        priv->folderstore = TNY_FOLDER_STORE (g_object_ref (G_OBJECT (folderstore)));
-
-        return self;
-}
-
-/**
- * tny_folder_store_change_get_folder_store:
- * @self: a #TnyFolderStoreChange instance
- *
- * Get the folderstore of @self. The return value of this method must be unreferenced 
- * after use
- *
- * Return value: the #TnyFolderStore instance related to this changeset
- **/
-TnyFolderStore* 
-tny_folder_store_change_get_folder_store (TnyFolderStoreChange *self)
-{
-        TnyFolderStoreChangePriv *priv = TNY_FOLDER_STORE_CHANGE_GET_PRIVATE (self);
-        TnyFolderStore *retval = NULL;
-
-        g_mutex_lock (priv->lock);
-        if (priv->folderstore)
-                retval = TNY_FOLDER_STORE (g_object_ref (G_OBJECT (priv->folderstore)));
-        g_mutex_unlock (priv->lock);
-
-        return retval;
-}
-
-
-static void
-tny_folder_store_change_instance_init (GTypeInstance *instance, gpointer g_class)
-{
-        TnyFolderStoreChange *self = (TnyFolderStoreChange *)instance;
-        TnyFolderStoreChangePriv *priv = TNY_FOLDER_STORE_CHANGE_GET_PRIVATE (self);
-
-        priv->lock = g_mutex_new ();
-
-        g_mutex_lock (priv->lock);
-
-        priv->changed = 0;
-        priv->created = NULL;
-        priv->removed = NULL;
-        priv->renamed = NULL;
-        priv->folderstore = NULL;
-
-        g_mutex_unlock (priv->lock);
-
-        return;
-}
-
-static void
-tny_folder_store_change_finalize (GObject *object)
-{
-        TnyFolderStoreChange *self = (TnyFolderStoreChange *)object;    
-        TnyFolderStoreChangePriv *priv = TNY_FOLDER_STORE_CHANGE_GET_PRIVATE (self);
-
-        g_mutex_lock (priv->lock);
-
-        if (priv->renamed)
-                g_object_unref (G_OBJECT (priv->renamed));
-        if (priv->created)
-                g_object_unref (G_OBJECT (priv->created));
@@ -359 +208 @@
-        priv->created = NULL;
-        priv->removed = NULL;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if (priv->folderstore)

trunk/libtinymail/tny-folder-store-change.h

@@ -44 +44 @@
-{
-        TNY_FOLDER_STORE_CHANGE_CHANGED_CREATED_FOLDERS,
-
-
+
-};
-
@@ -62 +61 @@
-
-void tny_folder_store_change_add_created_folder (TnyFolderStoreChange *self, TnyFolder *folder);
-void tny_folder_store_change_add_renamed_folder (TnyFolderStoreChange *self, TnyFolder *folder);
-void tny_folder_store_change_add_removed_folder (TnyFolderStoreChange *self, TnyFolder *folder);
-
-void tny_folder_store_change_get_created_folders (TnyFolderStoreChange *self, TnyList *folders);
-void tny_folder_store_change_get_renamed_folders (TnyFolderStoreChange *self, TnyList *folders);
-void tny_folder_store_change_get_removed_folders (TnyFolderStoreChange *self, TnyList *folders);
-

trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c

@@ -30 +30 @@
-#include <tny-simple-list.h>
-
+#include <tny-folder-store-change.h>
+#include <tny-folder-store-observer.h>
+#include <tny-folder-change.h>
+#include <tny-folder-observer.h>
+
-#include <tny-gtk-folder-store-tree-model.h>
-
@@ -50 +55 @@
-        AsyncHelpr *hlrp = user_data;
-        TnyIterator *iter = tny_list_create_iterator (folders);
+        TnyGtkFolderStoreTreeModel *me = (TnyGtkFolderStoreTreeModel*) self;
-
-        while (!tny_iterator_is_done (iter))
@@ -56 +62 @@
-                TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter);
-                GtkTreeIter *tree_iter = gtk_tree_iter_copy (hlrp->parent_tree_iter);
+
+                tny_folder_add_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (self));
+                tny_folder_store_add_observer (TNY_FOLDER_STORE (folder), TNY_FOLDER_STORE_OBSERVER (self));
+                me->folder_observables = g_list_prepend (me->folder_observables, folder);
+                me->store_observables = g_list_prepend (me->store_observables, folder);
-
-                gtk_tree_store_append (model, tree_iter, hlrp->parent_tree_iter);
@@ -102 +113 @@
-        TnyIterator *iter;
-        TnyList *folders = tny_simple_list_new ();
+        TnyGtkFolderStoreTreeModel *me = (TnyGtkFolderStoreTreeModel*) self;
-
-        /* TODO add error checking and reporting here */
@@ -115 +127 @@
-                gtk_tree_store_append (model, &tree_iter, parent_tree_iter);
-
-
+
+
+
+
+
+
-                        TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, 
-                        tny_folder_get_name (TNY_FOLDER (folder)),
@@ -129 +146 @@
-                g_object_unref (G_OBJECT (folder));
-
-          
+
-        }
-
@@ -225 +242 @@
-}
-
+static void 
+unregister_folder_observerable (gpointer item, gpointer user_data)
+{
+        TnyFolder *f = (TnyFolder *) item;
+        tny_folder_remove_observer (f, TNY_FOLDER_OBSERVER (user_data));
+}
+
+static void 
+unregister_store_observerable (gpointer item, gpointer user_data)
+{
+        TnyFolderStore *fstore = (TnyFolderStore *) item;
+        tny_folder_store_remove_observer (fstore, TNY_FOLDER_STORE_OBSERVER (user_data));
+}
+
-static void
-tny_gtk_folder_store_tree_model_finalize (GObject *object)
@@ -237 +268 @@
-        }
-        g_mutex_unlock (me->iterator_lock);
+
+        if (me->folder_observables)
+        {
+                g_list_foreach (me->folder_observables, unregister_folder_observerable, me);
+                g_list_free (me->store_observables);
+        }
+
+        if (me->store_observables)
+        {
+                g_list_foreach (me->store_observables, unregister_store_observerable, me);
+                g_list_free (me->store_observables);
+        }
-
-        g_mutex_free (me->iterator_lock);
@@ -268 +311 @@
-
-        me->iterator_lock = g_mutex_new ();
+        me->folder_observables = NULL;
+        me->store_observables = NULL;
-
-        gtk_tree_store_set_column_types (store, 
@@ -479 +524 @@
-}
-
+static void
+tny_gtk_folder_store_tree_model_store_obsr_update (TnyFolderStoreObserver *self, TnyFolderStoreChange *change)
+{
+        TnyFolderStoreChangeChanged changed = tny_folder_store_change_get_changed (change);
+
+        if (changed & TNY_FOLDER_STORE_CHANGE_CHANGED_CREATED_FOLDERS)
+        {
+        }
+
+        if (changed & TNY_FOLDER_STORE_CHANGE_CHANGED_REMOVED_FOLDERS)
+        {
+        }
+}
+
+
+static void
+tny_gtk_folder_store_tree_model_folder_obsr_update (TnyFolderObserver *self, TnyFolderChange *change)
+{
+        TnyFolderChangeChanged changed = tny_folder_change_get_changed (change);
+
+        if (changed & TNY_FOLDER_CHANGE_CHANGED_FOLDER_RENAME)
+        {
+                const gchar *oldname, *newname;
+
+                newname = tny_folder_change_get_rename (change, &oldname);
+
+                printf ("Renamed %s to %s\n", oldname, newname);
+        }
+
+}
+
+static void
+tny_folder_store_observer_init (TnyFolderStoreObserverIface *klass)
+{
+        klass->update_func = tny_gtk_folder_store_tree_model_store_obsr_update;
+}
+
+static void
+tny_folder_observer_init (TnyFolderObserverIface *klass)
+{
+        klass->update_func = tny_gtk_folder_store_tree_model_folder_obsr_update;
+}
-
-static void
@@ -523 +610 @@
-                };
-
+                static const GInterfaceInfo tny_folder_store_observer_info = {
+                        (GInterfaceInitFunc) tny_folder_store_observer_init,
+                        NULL,
+                        NULL
+                };
+
+                static const GInterfaceInfo tny_folder_observer_info = {
+                        (GInterfaceInitFunc) tny_folder_observer_init,
+                        NULL,
+                        NULL
+                };
+
-                g_type_add_interface_static (type, TNY_TYPE_LIST,
-                                             &tny_list_info);
+                g_type_add_interface_static (type, TNY_TYPE_FOLDER_STORE_OBSERVER,
+                                             &tny_folder_store_observer_info);
+                g_type_add_interface_static (type, TNY_TYPE_FOLDER_OBSERVER,
+                                             &tny_folder_observer_info);
+
-        }
-

trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.h

@@ -61 +61 @@
-        gboolean is_async;
-        TnyFolderStoreQuery *query;
+        GList *store_observables, *folder_observables;
-};
-

trunk/tests/c-demo/tny-demoui-summary-view.c

@@ -507 +507 @@
-        GtkTreeModel *model;
-
-G_LIKELY (gtk_tree_selection_get_selected (selection, &model, &iter)
+gtk_tree_selection_get_selected (selection, &model, &iter
-        {
-                TnyFolder *folder;
@@ -648 +648 @@
-                }
-        }
+}
+
+
+static void 
+on_rename_folder_activate (GtkMenuItem *mitem, gpointer user_data)
+{
+        TnyDemouiSummaryView *self = user_data;
+        TnyDemouiSummaryViewPriv *priv = TNY_DEMOUI_SUMMARY_VIEW_GET_PRIVATE (self);
+        GtkTreeIter iter;
+        GtkTreeModel *model;
+
+        if (gtk_tree_selection_get_selected (priv->mailbox_select, &model, &iter))
+        {
+                gint type;
+
+                gtk_tree_model_get (model, &iter, 
+                        TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, 
+                        &type, -1);
+
+                if (type != TNY_FOLDER_TYPE_ROOT) 
+                { 
+                        TnyFolder *folder;
+                        GtkWidget *dialog, *entry;
+                        gint result;
+
+                        gtk_tree_model_get (model, &iter, 
+                                TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, 
+                                &folder, -1);
+
+                        dialog = gtk_dialog_new_with_buttons (_("Rename a folder"),
+                                                                                                  GTK_WINDOW (gtk_widget_get_parent (GTK_WIDGET (self))),
+                                                                                                  GTK_DIALOG_MODAL,
+                                                                                                  GTK_STOCK_OK,
+                                                                                                  GTK_RESPONSE_ACCEPT,
+                                                                                                  GTK_STOCK_CANCEL,
+                                                                                                  GTK_RESPONSE_REJECT,
+                                                                                                  NULL);
+
+                        entry = gtk_entry_new ();
+                        gtk_entry_set_text (GTK_ENTRY (entry), tny_folder_get_name (folder));
+                        gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), entry);
+                        gtk_widget_show (entry);
+
+                        result = gtk_dialog_run (GTK_DIALOG (dialog));
+
+                        switch (result)
+                        {
+                                case GTK_RESPONSE_ACCEPT: 
+                                {
+                                        GError *err = NULL;
+                                        const gchar *newname = gtk_entry_get_text (GTK_ENTRY (entry));
+                                        tny_folder_set_name (folder, newname, &err);
+
+                                        if (err != NULL)
+                                        {
+                                                GtkWidget *edialog = gtk_message_dialog_new (
+                                                                                  GTK_WINDOW (gtk_widget_get_parent (GTK_WIDGET (self))),
+                                                                                  GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                                                  GTK_MESSAGE_ERROR,
+                                                                                  GTK_BUTTONS_CLOSE,
+                                                                                  err->message);
+                                                gtk_widget_show_all (edialog);
+                                                g_error_free (err);
+                                        }
+                                }
+                                break;
+
+                                default:
+                                break;
+                        }
+                        gtk_widget_destroy (dialog);
+                        g_object_unref (G_OBJECT (folder));
+                }
+
+        }
+
+}
+
+static void 
+on_delete_folder_activate (GtkMenuItem *mitem, gpointer user_data)
+{
+
+}
+
+static void 
+on_create_folder_activate (GtkMenuItem *mitem, gpointer user_data)
+{
+
+}
+
+static void
+header_view_do_popup_menu (GtkWidget *my_widget, GdkEventButton *event, gpointer user_data)
+{
+        GtkWidget *menu;
+        int button, event_time;
+
+        menu = gtk_menu_new ();
+        g_signal_connect (menu, "deactivate", G_CALLBACK (gtk_widget_destroy), NULL);
+
+        /* ... add menu items ... */
+
+        if (event)
+        {
+                button = event->button;
+                event_time = event->time;
+        }
+        else
+        {
+                button = 0;
+                event_time = gtk_get_current_event_time ();
+        }
+
+        gtk_menu_attach_to_widget (GTK_MENU (menu), my_widget, NULL);
+        gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 
+                                        button, event_time);
+}
+
+static gboolean 
+on_header_view_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
+{
+        if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
+        {
+                header_view_do_popup_menu (widget, event, user_data);
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
+static gboolean
+header_view_popup_menu_event (GtkWidget *widget, gpointer user_data)
+{
+        header_view_do_popup_menu (widget, NULL, user_data);
+        return TRUE;
+}
+
+
+
+static void
+mailbox_view_do_popup_menu (GtkWidget *my_widget, GdkEventButton *event, gpointer user_data)
+{
+        GtkWidget *menu;
+        GtkWidget *mrename, *mdelete, *mcreate;
+        int button, event_time;
+
+        menu = gtk_menu_new ();
+        //g_signal_connect (menu, "deactivate", G_CALLBACK (gtk_widget_destroy), NULL);
+
+        mrename = gtk_menu_item_new_with_label (_("Rename folder"));
+        mcreate = gtk_menu_item_new_with_label (_("Create folder"));
+        mdelete = gtk_menu_item_new_with_label (_("Delete folder"));
+
+        g_signal_connect (G_OBJECT (mrename), "activate",
+                G_CALLBACK (on_rename_folder_activate), user_data);
+        g_signal_connect (G_OBJECT (mcreate), "activate",
+                G_CALLBACK (on_rename_folder_activate), user_data);
+        g_signal_connect (G_OBJECT (mdelete), "activate",
+                G_CALLBACK (on_delete_folder_activate), user_data);
+
+        gtk_menu_prepend (menu, mrename);
+        gtk_menu_prepend (menu, mcreate);
+        gtk_menu_prepend (menu, mdelete);
+
+        gtk_widget_show (mrename);
+        gtk_widget_show (mcreate);
+        gtk_widget_show (mdelete);
+
+
+        if (event)
+        {
+                button = event->button;
+                event_time = event->time;
+        }
+        else
+        {
+                button = 0;
+                event_time = gtk_get_current_event_time ();
+        }
+
+        gtk_menu_attach_to_widget (GTK_MENU (menu), my_widget, NULL);
+        gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 
+                                        button, event_time);
+}
+
+static gboolean 
+on_mailbox_view_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
+{
+        if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
+        {
+                mailbox_view_do_popup_menu (widget, event, user_data);
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
+static gboolean
+mailbox_view_popup_menu_event (GtkWidget *widget, gpointer user_data)
+{
+        mailbox_view_do_popup_menu (widget, NULL, user_data);
+        return FALSE;
-}
-
@@ -732 +933 @@
-        priv->msg_view = tny_platform_factory_new_msg_view (platfact);
-
- 
+
-
-        widget = gtk_scrolled_window_new (NULL, NULL);
@@ -817 +1018 @@
-        column = gtk_tree_view_column_new_with_attributes (_("From"), renderer,
-                "text", TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, NULL);
-                         
+
-        gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-        gtk_tree_view_column_set_fixed_width (column, 100);
@@ -827 +1028 @@
-                column = gtk_tree_view_column_new_with_attributes (_("To"), renderer,
-                        "text", TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, NULL);
-                   
+
-                gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);