* changed visibility of characters in password dialog (hildon + gtk-glade)
[modest] / src / gtk-glade / modest-ui.c
index 375e9ce..7964dab 100644 (file)
@@ -7,62 +7,44 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-/* TODO: put in auto* */
-#include <tny-text-buffer-stream.h>
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif /*HAVE_CONFIG_H*/
 
+/* TODO: put in auto* */
+#include <tny-text-buffer-stream.h>
+#include <tny-msg-folder.h>
+
 #include "../modest-ui.h"
 #include "../modest-window-mgr.h"
 #include "../modest-account-mgr.h"
+#include "../modest-account-mgr.h"
+#include "../modest-identity-mgr.h"
 
 #include "../modest-tny-account-store.h"
 #include "../modest-tny-folder-tree-view.h"
 #include "../modest-tny-header-tree-view.h"
 #include "../modest-tny-msg-view.h"
 #include "../modest-tny-transport-actions.h"
+#include "../modest-tny-store-actions.h"
 
+#include "../modest-text-utils.h"
+#include "../modest-tny-msg-actions.h"
 
-#define MODEST_GLADE          PREFIX "/share/modest/glade/modest.glade"
-#define MODEST_GLADE_MAIN_WIN "main"
-#define MODEST_GLADE_EDIT_WIN "new_mail"
+#include "../modest-editor-window.h"
 
+#include "modest-ui-glade.h"
+#include "modest-ui-wizard.h"
 
 /* 'private'/'protected' functions */
 static void   modest_ui_class_init     (ModestUIClass *klass);
 static void   modest_ui_init           (ModestUI *obj);
 static void   modest_ui_finalize       (GObject *obj);
 
-static void    modest_ui_window_destroy    (GtkWidget *win, gpointer data);
-static void    modest_ui_last_window_closed (GObject *obj, gpointer data);
-
-static GtkWidget* modest_main_window_toolbar (void);
-static GtkWidget* modest_main_window_folder_tree (ModestAccountMgr *modest_acc_mgr,
-                                                 TnyAccountStoreIface *account_store);
-static GtkWidget* modest_main_window_header_tree (TnyMsgFolderIface *folder);
-
-
-void on_account_settings1_activate (GtkMenuItem *,
-                                          gpointer);
-static void on_password_requested (ModestTnyAccountStore *account_store,
-                                  const gchar *account_name, gpointer user_data);
-
-static void on_folder_clicked (ModestTnyFolderTreeView *folder_tree,
-                              TnyMsgFolderIface *folder,
-                              gpointer data);
-static void on_message_clicked (ModestTnyFolderTreeView *folder_tree,
-                               TnyMsgIface *message,
-                               gpointer data);
-static void on_new_mail_clicked (GtkWidget *widget, ModestUI *modest_ui);
-
-static void on_reply_clicked (GtkWidget *widget, ModestUI *modest_ui);
-
-static void on_send_button_clicked (GtkWidget *widget, ModestUI *modest_ui);
-
-static void register_toolbar_callbacks (ModestUI *modest_ui);
+static void   modest_ui_window_destroy    (GtkWidget *win, GdkEvent *event, gpointer data);
+static void   modest_ui_last_window_closed (GObject *obj, gpointer data);
 
+static void   on_password_requested (ModestTnyAccountStore *account_store, const gchar *account_name, gpointer user_data);
 
 /* list my signals */
 enum {
@@ -71,28 +53,9 @@ enum {
        LAST_SIGNAL
 };
 
-
-typedef struct _ModestUIPrivate ModestUIPrivate;
-struct _ModestUIPrivate {
-
-       ModestConf           *modest_conf;
-       ModestAccountMgr     *modest_acc_mgr;
-       ModestWindowMgr      *modest_window_mgr;
-       TnyAccountStoreIface *account_store;
-
-       GtkWindow            *main_window;
-       GladeXML             *glade_xml;
-
-
-};
-#define MODEST_UI_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                       MODEST_TYPE_UI, \
-                                       ModestUIPrivate))
 /* globals */
 static GObjectClass *parent_class = NULL;
 
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
 
 GType
 modest_ui_get_type (void)
@@ -117,6 +80,7 @@ modest_ui_get_type (void)
        return my_type;
 }
 
+
 static void
 modest_ui_class_init (ModestUIClass *klass)
 {
@@ -128,26 +92,26 @@ modest_ui_class_init (ModestUIClass *klass)
 
        g_type_class_add_private (gobject_class, sizeof(ModestUIPrivate));
 
-       /* signal definitions go here, e.g.: */
-/*     signals[MY_SIGNAL_1] = */
-/*             g_signal_new ("my_signal_1",....); */
-/*     signals[MY_SIGNAL_2] = */
-/*             g_signal_new ("my_signal_2",....); */
-/*     etc. */
 }
 
+
 static void
 modest_ui_init (ModestUI *obj)
 {
        ModestUIPrivate *priv = MODEST_UI_GET_PRIVATE(obj);
 
        priv->modest_acc_mgr    = NULL;
+       priv->modest_id_mgr     = NULL;
        priv->modest_conf       = NULL;
        priv->modest_window_mgr = NULL;
        priv->glade_xml         = NULL;
-
+       priv->folder_view       = NULL;
+       priv->header_view       = NULL;
+       priv->message_view      = NULL;
+       priv->current_folder    = NULL;
 }
 
+
 static void
 modest_ui_finalize (GObject *obj)
 {
@@ -157,6 +121,10 @@ modest_ui_finalize (GObject *obj)
                g_object_unref (priv->modest_acc_mgr);
        priv->modest_acc_mgr = NULL;
 
+       if (priv->modest_id_mgr)
+               g_object_unref (priv->modest_id_mgr);
+       priv->modest_id_mgr = NULL;
+
        if (priv->modest_conf)
                g_object_unref (priv->modest_conf);
        priv->modest_conf = NULL;
@@ -166,27 +134,51 @@ modest_ui_finalize (GObject *obj)
        priv->modest_window_mgr = NULL;
 }
 
+
+static void
+on_accounts_reloaded (ModestTnyAccountStore *account_store, gpointer user_data)
+{
+       ModestUIPrivate *priv = user_data;
+
+       g_return_if_fail (MODEST_IS_TNY_FOLDER_TREE_VIEW (priv->folder_view));
+       g_return_if_fail (MODEST_IS_TNY_HEADER_TREE_VIEW (priv->header_view));
+
+       modest_tny_header_tree_view_set_folder (priv->header_view, NULL);
+
+       modest_tny_folder_tree_view_update_model(priv->folder_view, account_store);
+}
+
+
 GObject*
 modest_ui_new (ModestConf *modest_conf)
 {
        GObject *obj;
        ModestUIPrivate *priv;
        ModestAccountMgr *modest_acc_mgr;
+       ModestIdentityMgr *modest_id_mgr;
        TnyAccountStoreIface *account_store_iface;
+       GSList *account_names_list;
+       GSList *identities_list;
 
        g_return_val_if_fail (modest_conf, NULL);
 
        obj = g_object_new(MODEST_TYPE_UI, NULL);
        priv = MODEST_UI_GET_PRIVATE(obj);
 
-       modest_acc_mgr =
-               MODEST_ACCOUNT_MGR(modest_account_mgr_new (modest_conf));
+       modest_acc_mgr = MODEST_ACCOUNT_MGR(modest_account_mgr_new (modest_conf));
        if (!modest_acc_mgr) {
                g_warning ("could not create ModestAccountMgr instance");
                g_object_unref (obj);
                return NULL;
        }
 
+       modest_id_mgr = MODEST_IDENTITY_MGR(modest_identity_mgr_new (modest_conf));
+       if (!modest_id_mgr) {
+               g_warning ("could not create ModestIdentityMgr instance");
+               g_object_unref (obj);
+               return NULL;
+       }
+
        account_store_iface =
                TNY_ACCOUNT_STORE_IFACE(modest_tny_account_store_new (modest_acc_mgr));
        if (!account_store_iface) {
@@ -196,9 +188,11 @@ modest_ui_new (ModestConf *modest_conf)
        g_signal_connect (account_store_iface, "password_requested",
                          G_CALLBACK(on_password_requested),
                          NULL);
+       g_signal_connect (account_store_iface, "accounts_reloaded",
+                         G_CALLBACK(on_accounts_reloaded), priv);
+
        glade_init ();
-       priv->glade_xml = glade_xml_new (MODEST_GLADE,
-                                        NULL,NULL);
+       priv->glade_xml = glade_xml_new (MODEST_GLADE, NULL, NULL);
        if (!priv->glade_xml) {
                g_warning ("failed to do glade stuff");
                g_object_unref (obj);
@@ -210,6 +204,7 @@ modest_ui_new (ModestConf *modest_conf)
         */
 
        priv->modest_acc_mgr = modest_acc_mgr;
+       priv->modest_id_mgr  = modest_id_mgr;
        g_object_ref (priv->modest_conf = modest_conf);
 
        priv->account_store = account_store_iface;
@@ -218,347 +213,40 @@ modest_ui_new (ModestConf *modest_conf)
        g_signal_connect (priv->modest_window_mgr, "last_window_closed",
                          G_CALLBACK(modest_ui_last_window_closed),
                          NULL);
-       return obj;
-}
-
-
-gboolean
-modest_ui_show_main_window (ModestUI *modest_ui)
-{
-       GtkWidget       *win;
-       int              height, width;
-       ModestUIPrivate *priv;
-       GtkWidget     *folder_view, *header_view;
-       GtkWidget     *message_view;
-       GtkWidget *account_settings_item;
-
-       GtkWidget  *folder_view_holder,
-               *header_view_holder,
-               *mail_paned;
-
-       priv = MODEST_UI_GET_PRIVATE(modest_ui);
-
-       height = modest_conf_get_int (priv->modest_conf,
-                                     MODEST_CONF_MAIN_WINDOW_HEIGHT,NULL);
-       width  = modest_conf_get_int (priv->modest_conf,
-                                     MODEST_CONF_MAIN_WINDOW_WIDTH,NULL);
-
-       win = glade_xml_get_widget (priv->glade_xml, "main");
-       if (!win) {
-               g_warning ("could not create main window");
-               return FALSE;
-       }
-
-       folder_view =
-               GTK_WIDGET(modest_main_window_folder_tree(priv->modest_acc_mgr,
-                                                         priv->account_store));
-       folder_view_holder = glade_xml_get_widget (priv->glade_xml, "folders");
-       if (!folder_view||!folder_view_holder) {
-               g_warning ("failed to create folder tree");
-               return FALSE;
-       }
-       gtk_container_add (GTK_CONTAINER(folder_view_holder), folder_view);
-
-       header_view  =  GTK_WIDGET(modest_main_window_header_tree (NULL));
-       header_view_holder = glade_xml_get_widget (priv->glade_xml, "mail_list");
-       if (!header_view) {
-               g_warning ("failed to create header tree");
-               return FALSE;
-       }
-       gtk_container_add (GTK_CONTAINER(header_view_holder), header_view);
-
-       g_signal_connect (G_OBJECT(folder_view), "folder_selected",
-                         G_CALLBACK(on_folder_clicked), modest_ui);
-
-       message_view  = GTK_WIDGET(modest_tny_msg_view_new (NULL));
-       if (!message_view) {
-               g_warning ("failed to create message view");
-               return FALSE;
-       }
-       mail_paned = glade_xml_get_widget (priv->glade_xml, "mail_paned");
-       gtk_paned_add2 (GTK_PANED(mail_paned), message_view);
-
-       g_signal_connect (header_view, "message_selected",
-                         G_CALLBACK(on_message_clicked),
-                         modest_ui);
-
-       account_settings_item = glade_xml_get_widget (priv->glade_xml, "account_settings1");
-       if (!account_settings_item)
-       {
-               g_warning ("The account settings item isn't available!\n");
-               return FALSE;
-       }
-
-       g_signal_connect (account_settings_item, "activate",
-                         G_CALLBACK(on_account_settings1_activate),
-                         modest_ui);
-
-       register_toolbar_callbacks (modest_ui);
-
-       modest_window_mgr_register (priv->modest_window_mgr,
-                                   G_OBJECT(win), MODEST_MAIN_WINDOW, 0);
-       g_signal_connect (win, "destroy", G_CALLBACK(modest_ui_window_destroy),
-                         modest_ui);
-       gtk_widget_set_usize (GTK_WIDGET(win), height, width);
-       gtk_window_set_title (GTK_WINDOW(win), PACKAGE_STRING);
-
-       gtk_widget_show_all (win);
-       return TRUE;
-}
-
-
-static void
-register_toolbar_callbacks (ModestUI *modest_ui)
-{
-       ModestUIPrivate *priv;
-       GtkWidget *button;
-
-       g_return_if_fail (modest_ui);
-
-       priv = MODEST_UI_GET_PRIVATE (modest_ui);
-
-       button = glade_xml_get_widget (priv->glade_xml, "toolb_new_mail");
-       if (button)
-               g_signal_connect (button, "clicked",
-                                 G_CALLBACK(on_new_mail_clicked), modest_ui);
-
-       button = glade_xml_get_widget (priv->glade_xml, "toolb_reply");
-       if (button)
-               g_signal_connect (button, "clicked",
-                                 G_CALLBACK(on_reply_clicked), modest_ui);
-}
-
-
-
-static void
-hide_edit_window (GtkWidget *win, gpointer data)
-{
-       gtk_widget_hide (win);
-}
-
-
-
-
-gboolean
-modest_ui_show_edit_window (ModestUI *modest_ui, const gchar* to,
-                           const gchar* cc, const gchar* bcc,
-                           const gchar* subject, const gchar *body,
-                           const GSList* att)
-{
-       GtkWidget       *win, *to_entry, *subject_entry, *body_view;
-
-       ModestUIPrivate *priv;
-       GtkWidget       *btn;
-       GtkTextBuffer   *buf;
-
-       priv = MODEST_UI_GET_PRIVATE(modest_ui);
-       int height = modest_conf_get_int (priv->modest_conf,
-                                         MODEST_CONF_EDIT_WINDOW_HEIGHT,NULL);
-       int width  = modest_conf_get_int (priv->modest_conf,
-                                         MODEST_CONF_EDIT_WINDOW_WIDTH,NULL);
-
-       win = glade_xml_get_widget (priv->glade_xml, "new_mail");
-       if (!win) {
-               g_warning ("could not create new mail  window");
-               return FALSE;
-       }
-
-       modest_window_mgr_register (priv->modest_window_mgr,
-                                   G_OBJECT(win), MODEST_EDIT_WINDOW, 0);
-       to_entry      = glade_xml_get_widget (priv->glade_xml, "to_entry");
-       subject_entry = glade_xml_get_widget (priv->glade_xml, "subject_entry");
-       body_view     = glade_xml_get_widget (priv->glade_xml, "body_view");
-
-       gtk_entry_set_text(GTK_ENTRY(subject_entry), subject);
-       gtk_entry_set_text(GTK_ENTRY(to_entry), to);
-
-       buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(body_view));
-       gtk_text_buffer_set_text(buf, body, -1);
-
-       g_signal_connect (win, "destroy", G_CALLBACK(hide_edit_window),
-                         NULL);
-
-       gtk_widget_set_usize (GTK_WIDGET(win), height, width);
-       gtk_window_set_title (GTK_WINDOW(win),
-                             subject ? subject : "Untitled");
-
 
-       btn = glade_xml_get_widget (priv->glade_xml, "toolb_send");
-       g_signal_connect (btn, "clicked", G_CALLBACK(on_send_button_clicked),
-                         modest_ui);
-
-       gtk_widget_show_all (win);
-
-       return TRUE;
-}
+       account_names_list = modest_account_mgr_server_account_names(modest_acc_mgr,
+                                       NULL, MODEST_PROTO_TYPE_ANY, NULL, FALSE);
+       identities_list = modest_identity_mgr_identity_names(modest_id_mgr, NULL);
+       if (!(account_names_list != NULL || identities_list != NULL))
+               wizard_account_dialog(MODEST_UI(obj));
+       g_slist_free(account_names_list);
+       g_slist_free(identities_list);
 
-
-static void
-modest_ui_window_destroy (GtkWidget *win, gpointer data)
-{
-       ModestUIPrivate *priv;
-
-       g_return_if_fail (data);
-
-       priv = MODEST_UI_GET_PRIVATE((ModestUI*)data);
-       if (!modest_window_mgr_unregister (priv->modest_window_mgr, G_OBJECT(win)))
-               g_warning ("modest window mgr: failed to unregister %p",
-                          G_OBJECT(win));
+       return obj;
 }
 
 
 static void
 modest_ui_last_window_closed (GObject *obj, gpointer data)
 {
+       /* FIXME: Other cleanups todo? Finalize Tinymail? */
        gtk_main_quit ();
 }
 
-void
-on_account_selector_selection_changed(GtkWidget *widget,
-       gpointer user_data)
-{
-       GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
-       GtkTreeIter iter;
-
-       gchar *account_name;
-
-       if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter))
-       {
-               gtk_tree_model_get(GTK_TREE_MODEL(model),
-                                  &iter,
-                                  0, &account_name,
-                                  -1);
-       }
-       else
-       {
-               account_name="empty";
-       }
-
-       g_message("Value: '%s'\n", account_name);
-}
-
-void
-on_account_settings1_activate (GtkMenuItem *menuitem,
-                              gpointer user_data)
-{
-       GladeXML *glade_xml;
-       GtkWidget *advanced_account_setup;
-       ModestUIPrivate *priv;
-       gint retval;
-       GSList *account_name_list;
-       GSList *account_name_list_iter;
-       GtkListStore *account_names;
-       GtkTreeIter account_names_iter;
-       GtkWidget *account_selector;
-       GtkCellRenderer *renderer;
-
-       priv = MODEST_UI_GET_PRIVATE(MODEST_UI(user_data));
-
-       glade_xml = glade_xml_new(MODEST_GLADE, "mailbox_setup_advanced", NULL);
-       advanced_account_setup = glade_xml_get_widget(glade_xml, "mailbox_setup_advanced");
-
-       account_name_list=modest_account_mgr_account_names(priv->modest_acc_mgr, NULL);
-       account_names = gtk_list_store_new(1, G_TYPE_STRING);
-
-       for (account_name_list_iter=account_name_list;
-            account_name_list_iter!=NULL;
-            account_name_list_iter=g_slist_next(account_name_list_iter))
-       {
-               gtk_list_store_append(account_names, &account_names_iter);
-               gtk_list_store_set(account_names, &account_names_iter,
-                                  0, account_name_list_iter->data,
-                                  -1);
-       }
-
-       g_slist_free(account_name_list);
-
-       account_selector = glade_xml_get_widget(glade_xml, "account_selector");
-       gtk_combo_box_set_model(GTK_COMBO_BOX(account_selector), GTK_TREE_MODEL(account_names));
-
-       renderer = gtk_cell_renderer_text_new ();
-       gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (account_selector), renderer, TRUE);
-       gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (account_selector), renderer,
-                                       "text", 0,
-                                       NULL);
-
-       g_signal_connect(GTK_WIDGET(account_selector), "changed",
-                        G_CALLBACK(on_account_selector_selection_changed),
-                        GTK_WIDGET(advanced_account_setup));
-
-       gtk_combo_box_set_active(GTK_COMBO_BOX(account_selector), 0);
-
-       gtk_widget_show_all(GTK_WIDGET(advanced_account_setup));
-
-       retval=gtk_dialog_run(GTK_DIALOG(advanced_account_setup));
-
-       g_object_unref(account_names);
-
-       gtk_widget_destroy(GTK_WIDGET(advanced_account_setup));
-
-       g_object_unref(glade_xml);
-}
-
-
-static void
-on_folder_clicked (ModestTnyFolderTreeView *folder_tree,
-                  TnyMsgFolderIface *folder,
-                  gpointer data)
-{
-       GtkWidget *win;
-       ModestTnyHeaderTreeView *tree_view;
-       ModestUIPrivate *priv;
-       GtkWidget *scrollview;
-
-       g_return_if_fail (folder);
-       g_return_if_fail (data);
-
-       priv = MODEST_UI_GET_PRIVATE(data);
-       scrollview = glade_xml_get_widget (priv->glade_xml,"mail_list");
-
-       tree_view = MODEST_TNY_HEADER_TREE_VIEW(
-               gtk_bin_get_child(GTK_BIN(scrollview)));
-       win = glade_xml_get_widget (priv->glade_xml, "main");
-       gtk_window_set_title (GTK_WINDOW(win),
-                             tny_msg_folder_iface_get_name(folder));
-
-       modest_tny_header_tree_view_set_folder (tree_view,
-                                               folder);
-}
-
-
-
-static void on_message_clicked (ModestTnyFolderTreeView *folder_tree,
-                               TnyMsgIface *message,
-                               gpointer data)
-{
-       GtkWidget *paned;
-       ModestTnyMsgView *msg_view;
-       ModestUIPrivate *priv;
-
-       g_return_if_fail (message);
-       g_return_if_fail (data);
-
-       priv = MODEST_UI_GET_PRIVATE(data);
-       paned = glade_xml_get_widget (priv->glade_xml,"mail_paned");
-       msg_view = MODEST_TNY_MSG_VIEW(gtk_paned_get_child2 (GTK_PANED(paned)));
-
-       modest_tny_msg_view_set_message (msg_view,
-                                        message);
-}
 
 static void
 on_password_requested (ModestTnyAccountStore *account_store,
-                      const gchar *account_name, gpointer user_data)
-{
+                      const gchar *account_name,
+                      gpointer user_data) {
 
        GtkWidget *passdialog;
        GtkWidget *vbox;
        GtkWidget *infolabel;
-       GtkWidget *passentry;
+        GtkWidget *passentry;
        gint retval;
-       const gchar *infostring=g_strconcat("Please enter the password for ", account_name, ".", NULL);
+       const gchar *infostring = g_strconcat(_("Please enter the password for "), account_name, ".", NULL);
 
-       passdialog = gtk_dialog_new_with_buttons("MyDialog",
+       passdialog = gtk_dialog_new_with_buttons(_("Password"),
                                                 NULL,
                                                 GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
                                                 GTK_STOCK_OK,
@@ -567,10 +255,11 @@ on_password_requested (ModestTnyAccountStore *account_store,
                                                 GTK_RESPONSE_REJECT,
                                                 NULL);
 
-       vbox=gtk_vbox_new(FALSE, 0);
+       vbox = gtk_vbox_new(FALSE, 0);
 
-       infolabel=gtk_label_new(infostring);
-       passentry=gtk_entry_new();
+       infolabel = gtk_label_new(infostring);
+       passentry = gtk_entry_new();
+       gtk_entry_set_visibility(passentry, FALSE);
 
        gtk_box_pack_start(GTK_BOX(GTK_DIALOG(passdialog)->vbox), infolabel, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(GTK_DIALOG(passdialog)->vbox), passentry, FALSE, FALSE, 0);
@@ -578,8 +267,7 @@ on_password_requested (ModestTnyAccountStore *account_store,
 
        retval = gtk_dialog_run (GTK_DIALOG(passdialog));
 
-       switch (retval)
-       {
+       switch (retval) {
        case GTK_RESPONSE_ACCEPT:
                modest_account_mgr_set_server_account_string(modest_tny_account_store_get_accout_mgr(account_store),
                                                             account_name,
@@ -588,9 +276,9 @@ on_password_requested (ModestTnyAccountStore *account_store,
                                                             NULL);
                break;
        case GTK_RESPONSE_CANCEL:
-               /* FIXME:
-                * What happens, if canceled?"
-                */
+                       /* FIXME:
+                        * What happens, if canceled?"
+                        */
                break;
        }
 
@@ -598,437 +286,24 @@ on_password_requested (ModestTnyAccountStore *account_store,
 }
 
 
-
-
-
-
-static GtkWidget*
-modest_main_window_header_tree (TnyMsgFolderIface *folder)
-{
-       GtkWidget *header_tree;
-
-       header_tree = GTK_WIDGET(modest_tny_header_tree_view_new(folder));
-       if (!header_tree) {
-               g_warning ("could not create header tree");
-               return NULL;
-       }
-
-       return GTK_WIDGET(header_tree);
-}
-
-
-
-static GtkWidget*
-modest_main_window_folder_tree (ModestAccountMgr *modest_acc_mgr,
-                               TnyAccountStoreIface *account_store)
-{
-       GtkTreeViewColumn *column;
-       GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
-       GtkWidget *folder_tree;
-
-       folder_tree = GTK_WIDGET(modest_tny_folder_tree_view_new (account_store));
-       if (!folder_tree) {
-               g_warning ("could not create folder list");
-               return NULL;
-       }
-
-       column = gtk_tree_view_column_new_with_attributes(_("All Mail Folders"),
-                                                         renderer,"text",
-                                                         TNY_ACCOUNT_TREE_MODEL_NAME_COLUMN,
-                                                         NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(folder_tree), column);
-
-       column = gtk_tree_view_column_new_with_attributes(_("Unread"),
-                                                         renderer, "text",
-                                                         TNY_ACCOUNT_TREE_MODEL_UNREAD_COLUMN,
-                                                         NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(folder_tree), column);
-
-
-       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(folder_tree), TRUE);
-       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(folder_tree), TRUE);
-
-       return folder_tree;
-}
-
-
-static void
-on_new_mail_clicked (GtkWidget *widget, ModestUI *modest_ui)
-{
-       g_return_if_fail (modest_ui);
-       modest_ui_show_edit_window (modest_ui, "", "", "", "", "", NULL);
-}
-
-static gchar*
-modest_ui_quote_msg(const TnyMsgIface *src, const gchar *from, time_t sent_date)
+void
+on_account_selector_selection_changed (GtkWidget *widget, gpointer user_data)
 {
-       GList *parts;
-       TnyMsgMimePartIface *part;
-       TnyStreamIface* stream;
-       TnyTextBufferStream *dest;
-       TnyMsgMimePartIface *body = NULL;
-       GtkTextBuffer *buf;
-       GtkTextIter begin, end, iter1, iter2, iter3;
-       gchar *txt, *line;
-       gint tmp;
-       gint indent;
-       gboolean break_line;
-<<<<<<< .mine
-       gchar sent_str[101];
-       gchar from_cut[82];
-       gchar reply_head[202];
-               
-=======
-
->>>>>>> .r91
-       buf = gtk_text_buffer_new(NULL);
-       dest = tny_text_buffer_stream_new(buf);
-       parts  = (GList*) tny_msg_iface_get_parts (src);
-
-       while (parts) {
-               /* TODO: maybe we'd like to quote more than one part?
-                *       cleanup, fix leaks
-                */
-               TnyMsgMimePartIface *part =
-                       TNY_MSG_MIME_PART_IFACE(parts->data);
-               if (tny_msg_mime_part_iface_content_type_is (part, "text/plain")) {
-                       body = part;
-                       break;
-               }
-               parts = parts->next;
-       }
-       if (!body) {
-               return "";
-       }
-       buf    = gtk_text_buffer_new (NULL);
-       stream = TNY_STREAM_IFACE(tny_text_buffer_stream_new (buf));
-
-       tny_stream_iface_reset (stream);
-       tny_msg_mime_part_iface_decode_to_stream (body, stream);
-       tny_stream_iface_reset (stream);
-
-       /* format sent_date */
-       strftime(sent_str, 100, "%c", localtime(&sent_date));
-       strncpy(from_cut, from, 80);
-       sprintf(reply_head, "On %s, %s wrote:\n", sent_str, from_cut);
-       
-       gtk_text_buffer_get_iter_at_line(buf, &iter1, 0);
-       gtk_text_buffer_insert(buf, &iter1, reply_head, -1);
-       gtk_text_buffer_get_iter_at_line(buf, &iter1, 1);
-       while (TRUE) {
-               /* at each beginning of this while, iter1 must be at the beginning of
-                  the (next) line to quote */
-
-               iter2 = iter1;
-<<<<<<< .mine
-               if (gtk_text_iter_get_chars_in_line(&iter1) > 1) {
-                       /* check whether line is already quoted */
-                       iter2 = iter1;
-                       gtk_text_iter_forward_char (&iter2);
-                       txt = gtk_text_buffer_get_text (buf, &iter1, &iter2, FALSE);
-               } else {
-                       txt = "";
-               }
-=======
-               gtk_text_iter_forward_to_line_end(&iter2);
-               txt = gtk_text_buffer_get_text (buf, &iter1, &iter2, FALSE);
-               printf("%s\n", txt);
-               /* check whether line is already quoted */
-               iter2 = iter1;
-
-               gtk_text_iter_forward_word_end(&iter2);
-               txt = gtk_text_buffer_get_text (buf, &iter1, &iter2, FALSE);
-
->>>>>>> .r91
-               /* insert quotation mark */
-               tmp = gtk_text_iter_get_offset(&iter1);
-               gtk_text_buffer_insert(buf, &iter1, "> ", -1);
-
-               /* still at the beginning of the line */
-               gtk_text_buffer_get_iter_at_offset(buf, &iter1, tmp);
-               iter2 = iter1;
-
-               if (strcmp(txt, ">") != 0) {
-
-                       /* line was not already quoted */
-
-                       /* now check whether the line must be broken: */
-                       if (gtk_text_iter_get_chars_in_line(&iter2) >= 79) {
-
-                               gtk_text_iter_set_line_offset(&iter2, 79);
-
-                               /* move iter1 behind quote mark at the beginnig of the line */
-                               gtk_text_iter_forward_word_end(&iter1);
-
-                               /* save iter2 position */
-                               iter3 = iter2;
-
-                               /* move iter2 back one word (from breakpoint in line) */
-                               gtk_text_iter_backward_word_start(&iter2);
-
-                               /* check for one-word line (up to iter2) */
-                               if (!gtk_text_iter_compare(&iter1, &iter2) < 0) {
-                                       gtk_text_iter_forward_word_end(&iter2); /* BUG? */
-                               }
-
-                               /* insert linebreak */
-                               tmp = gtk_text_iter_get_offset(&iter2);
-<<<<<<< .mine
-                               gtk_text_buffer_insert(buf, &iter2, "\n", -1);
-=======
-                               gtk_text_buffer_insert(buf, &iter2, "\n#", -1);
-
->>>>>>> .r91
-                               gtk_text_buffer_get_iter_at_offset(buf, &iter1, tmp);
-
-                               /* move to the beginning of the "new" line */
-                               gtk_text_iter_forward_line(&iter1);
-
-                               /* try to kill 1 space */
-                               iter2 = iter1;
-                               gtk_text_iter_forward_char(&iter2);
-                               txt = gtk_text_buffer_get_text(buf, &iter1, &iter2, FALSE);
-                               if (strcmp(txt, " ") == 0) {
-                                       tmp = gtk_text_iter_get_offset(&iter1);
-                                       gtk_text_buffer_delete(buf, &iter1, &iter2);
-                                       gtk_text_buffer_get_iter_at_offset(buf, &iter1, tmp);
-                               }
-                               
-                               /* check whether there is a next line to merge */
-                               iter3 = iter1;
-                               if (!gtk_text_iter_forward_line(&iter3)) {
-                                       continue;
-                               }
-<<<<<<< .mine
-                               /* iter3 is now at the beginning of the next line.*/
-                               
-=======
-
->>>>>>> .r91
-                               /* check for empty line */
-                               if (gtk_text_iter_get_chars_in_line(&iter3) < 2) {
-                                       continue;
-                               }
-
-                               /* check for quote */
-                               iter2 = iter3;
-                               gtk_text_iter_forward_char (&iter2);
-                               txt = gtk_text_buffer_get_text(buf, &iter3, &iter2, FALSE);
-                               if (strcmp(txt, ">") == 0) {
-                                       /* iter1 is still at the beginning of the newly broken
-                                        * so we don't have to cleanup */
-                                       continue;
-                               }
-<<<<<<< .mine
-                               
-=======
-
-                               /* now merge in the next line */
->>>>>>> .r91
-                               if (!gtk_text_iter_forward_to_line_end(&iter1)) {
-                                       /* no further lines to merge */
-                                       continue;
-                               }
-                               
-                               /* "mark" newline */
-                               iter2 = iter1;
-                               gtk_text_iter_forward_char(&iter2);
-<<<<<<< .mine
-                                       
-                               /* do the merge */
-=======
-
->>>>>>> .r91
-                               tmp = gtk_text_iter_get_offset(&iter1);
-<<<<<<< .mine
-=======
-
-                               /* do the merge */
->>>>>>> .r91
-                               gtk_text_buffer_delete (buf, &iter1, &iter2);
-                               gtk_text_buffer_get_iter_at_offset (buf, &iter1, tmp);
-
-                               /* insert space */
-                               gtk_text_buffer_insert(buf, &iter1, " ", -1);
-                               gtk_text_buffer_get_iter_at_offset (buf, &iter1, tmp);
-                               
-                               /* move to beginning of line and continue */
-                               gtk_text_iter_set_line_offset(&iter1, 0);
-<<<<<<< .mine
-                               continue;
-                               
-=======
-
->>>>>>> .r91
-                       } else {
-                               /* line doesn't have to be broken, we're done. */
-                               if (!gtk_text_iter_forward_line(&iter1)) {
-                                       break;
-                               }
-                               continue;
-                       }
-               } else {
-                       /* line was already quoted */
-                       if (!gtk_text_iter_forward_line(&iter1)) {
-                               break;
-                       }
-                       continue;
-               }
-       }
-
-       gtk_text_buffer_get_bounds (buf, &begin, &end);
-       txt = gtk_text_buffer_get_text (buf, &begin, &end, FALSE);
-
-       return txt;
-}
+       GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
+       GtkTreeIter iter;
 
-static void
-modest_ui_reply_to_msg (ModestUI *modest_ui, TnyMsgHeaderIface *header,
-                                               ModestTnyMsgView *msg_view) {
-       const gchar *subject, *from, *quoted;
-       time_t sent_date;
-       const TnyMsgIface *msg;
-       const TnyMsgFolderIface *folder;
-       gchar *re_sub;
-
-       quoted = "";
-       if (header) {
-               folder = tny_msg_header_iface_get_folder (TNY_MSG_HEADER_IFACE(header));
-               if (!folder) {
-                       g_warning ("cannot find folder");
-                       return;
-               }
-
-               msg = tny_msg_folder_iface_get_message (TNY_MSG_FOLDER_IFACE(folder), header);
-               if (!msg) {
-                       g_warning ("cannot find msg");
-                       return;
-               }
-               subject = tny_msg_header_iface_get_subject(header);
-               /* TODO: checks, free */
-               re_sub = malloc(strlen(subject) + 5);
-               strcpy (re_sub, "Re: ");
-               strcat (re_sub, subject);
-               /* FIXME: honor replyto, cc */
-               from = tny_msg_header_iface_get_from(header);
-               sent_date = tny_msg_header_iface_get_date_sent(header);
-               quoted = modest_ui_quote_msg(msg, from, sent_date);
+       gchar *account_name;
 
+       if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter)) {
+               gtk_tree_model_get(GTK_TREE_MODEL(model), &iter,
+                                  0, &account_name, -1);
        } else {
-               printf("no header\n");
-               return;
+               account_name="empty";
        }
 
-       modest_ui_show_edit_window (modest_ui, from, "FIXME:cc", /* bcc */ "", re_sub, quoted, NULL);
-}
-
-
-/* WIP, testing az */
-static void
-on_reply_clicked (GtkWidget *widget, ModestUI *modest_ui)
-{
-       GtkTreeSelection *sel;
-       GtkWidget *paned;
-       GtkTreeModel *model;
-       GtkTreeIter iter;
-       GtkScrolledWindow *scroll;
-
-       TnyMsgHeaderIface *header;
-
-       ModestTnyHeaderTreeView *header_view;
-       ModestTnyMsgView *msg_view;
-       ModestUIPrivate *priv;
-
-       g_return_if_fail (modest_ui);
-
-       priv = MODEST_UI_GET_PRIVATE(modest_ui);
-
-       paned = glade_xml_get_widget (priv->glade_xml,"mail_paned");
-       g_return_if_fail (paned);
-
-       scroll = GTK_SCROLLED_WINDOW(gtk_paned_get_child1 (GTK_PANED(paned)));
-       g_return_if_fail (scroll);
-
-       msg_view = MODEST_TNY_MSG_VIEW(gtk_paned_get_child2 (GTK_PANED(paned)));
-       g_return_if_fail (msg_view);
-
-       header_view = MODEST_TNY_HEADER_TREE_VIEW(gtk_bin_get_child (GTK_BIN(scroll)));
-       g_return_if_fail (header_view);
-
-       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(header_view));
-       g_return_if_fail (sel);
-
-       if (!gtk_tree_selection_get_selected (sel, &model, &iter))
-               /* no message was selected. TODO: disable reply button in this case */
-               return;
-
-       gtk_tree_model_get (model, &iter,
-                           TNY_MSG_HEADER_LIST_MODEL_INSTANCE_COLUMN,
-                           &header, -1);
+       g_message("Value: '%s'\n", account_name);
 
-       modest_ui_reply_to_msg (modest_ui, header, msg_view);
+       free(account_name);
 }
 
 
-
-/* FIXME: truly evil --> we cannot really assume that
- * there is only one edit window open...
- */
-static void
-on_send_button_clicked (GtkWidget *widget, ModestUI *modest_ui)
-{
-       ModestTnyTransportActions *actions;
-       ModestUIPrivate *priv;
-       GtkWidget *to_entry, *subject_entry, *body_view;
-       const gchar *to, *subject;
-       gchar *body;
-       GtkTextIter start, end;
-       GtkTextBuffer *buf;
-       TnyAccountStoreIface *account_store;
-       const GList *transport_accounts;
-       TnyTransportAccountIface *transport_account;
-
-       g_return_if_fail (modest_ui);
-
-       actions = MODEST_TNY_TRANSPORT_ACTIONS
-               (modest_tny_transport_actions_new ());
-       priv = MODEST_UI_GET_PRIVATE(modest_ui);
-
-       account_store = priv->account_store;
-       transport_accounts =
-               tny_account_store_iface_get_transport_accounts (account_store);
-       if (!transport_accounts) {
-               g_message ("cannot send message: no transport account defined");
-               return;
-       } else /* take the first one! */
-               transport_account =
-                       TNY_TRANSPORT_ACCOUNT_IFACE(transport_accounts->data);
-
-       to_entry      = glade_xml_get_widget (priv->glade_xml, "to_entry");
-       subject_entry = glade_xml_get_widget (priv->glade_xml, "subject_entry");
-       body_view     = glade_xml_get_widget (priv->glade_xml, "body_view");
-
-       to      = gtk_entry_get_text (GTK_ENTRY(to_entry));
-       subject = gtk_entry_get_text (GTK_ENTRY(subject_entry));
-
-       buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(body_view));
-       gtk_text_buffer_get_bounds (buf, &start, &end);
-       body    = gtk_text_buffer_get_text (buf, &start, &end, FALSE);
-
-       g_message ("sending %s ==> %s", subject, to);
-       modest_tny_transport_actions_send_message (actions,
-                                                  transport_account,
-                                                  "dirk-jan.binnema@nokia.com",
-                                                  to, "", "", subject,
-                                                  body);
-       g_free (body);
-       g_object_unref (G_OBJECT(actions));
-
-       gtk_entry_set_text (GTK_ENTRY(to_entry), "");
-       gtk_entry_set_text (GTK_ENTRY(subject_entry), "");
-       gtk_text_buffer_set_text (buf, "", 0);
-
-       gtk_widget_hide (glade_xml_get_widget (priv->glade_xml, "new_mail"));
-}