* Now we put signatures before the original/forwarded messages (fixes

[modest] / src / gnome / modest-account-view-window.c

diff --git a/src/gnome/modest-account-view-window.c b/src/gnome/modest-account-view-window.c
index 7827f80..fce5fb0 100644 (file)
--- a/src/gnome/modest-account-view-window.c
+++ b/src/gnome/modest-account-view-window.c
@@ -268,17 +268,33 @@ check_for_active_account (ModestAccountViewWindow *self, const gchar* account_na
 static void
 on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
-       ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (self);
+       ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (self);
        
        gchar* account_name = modest_account_view_get_selected_account (priv->account_view);
        if (!account_name)
                return;
                
+       /* Check whether any connections are active, and cancel them if 
+        * the user wishes.
+        */
        if (check_for_active_account (self, account_name)) {
-               modest_tny_account_store_show_account_settings_dialog (modest_runtime_get_account_store (), account_name);
-               
+               ModestAccountProtocol *proto;
+               ModestProtocolType proto_type;
+
+               /* Get proto */
+               proto_type = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), 
+                                                                   account_name);
+               proto = (ModestAccountProtocol *)
+                       modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), 
+                                                                      proto_type);
+
+               /* Create and show the dialog */
+               if (proto && MODEST_IS_ACCOUNT_PROTOCOL (proto)) {
+                       ModestAccountSettingsDialog *dialog =
+                               modest_account_protocol_get_account_settings_dialog (proto, account_name);
+                       gtk_widget_show (GTK_WIDGET (dialog));
+               }
        }
-       
        g_free (account_name);
 }
 
@@ -319,7 +335,7 @@ on_add_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
        /* there is no such wizard yet */
        wizard = GTK_DIALOG (modest_account_assistant_new (modest_runtime_get_account_mgr ()));
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), 
-                                    GTK_WINDOW (wizard));
+                                    GTK_WINDOW (wizard), self);
 
        /* if there is already another modal dialog, make it non-modal */
        if (dialog)