* fix some logical ids

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

diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c
index 9f86675..ebf1262 100644 (file)
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -36,8 +36,9 @@
 #include <modest-runtime.h>
 #include <modest-account-mgr-helpers.h>
 #include <string.h>
-#include "modest-account-assistant.h"
 #include "modest-tny-platform-factory.h"
+#include "maemo/easysetup/modest-easysetup-wizard.h"
+#include "maemo/modest-account-settings-dialog.h"
 
 /* 'private'/'protected' functions */
 static void                            modest_account_view_window_class_init   (ModestAccountViewWindowClass *klass);
@@ -195,33 +196,37 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 static void
 on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
-       modest_runtime_not_implemented (GTK_WINDOW(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;
+               
+       /* Show the Account Settings window: */
+       ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
+       modest_account_settings_dialog_set_account_name (dialog, account_name);
+       
+       gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self));
+       gtk_dialog_run (GTK_DIALOG (dialog));
+       gtk_widget_destroy (GTK_WIDGET (dialog));
+       
+       g_free (account_name);
 }
 
 static void
 on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
-       GtkWidget *notebook, *assistant;
-       ModestAccountViewWindowPrivate *priv;
-
-       /* TODO: */
-       modest_runtime_not_implemented (GTK_WINDOW(self));
-       return;
-
-       priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
-
-       notebook = modest_account_assistant_new (modest_runtime_get_account_mgr());
-       assistant = hildon_wizard_dialog_new (GTK_WINDOW(self), _("Account setup wizard"),
-                                             GTK_NOTEBOOK(notebook));
-       
-       gtk_dialog_run (GTK_DIALOG(assistant));
-       gtk_widget_destroy (assistant);
+       /* Show the easy-setup wizard: */
+       ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new ();
+       gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (self));
+       gtk_dialog_run (GTK_DIALOG (wizard));
+       gtk_widget_destroy (GTK_WIDGET (wizard));
 }
 
 
 static void
 on_close_button_clicked (GtkWidget *button, gpointer user_data)
-{
+{              
        ModestAccountViewWindow *self = MODEST_ACCOUNT_VIEW_WINDOW (user_data);
 
        gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK);