* decided against the wizard to modify existing accounts. We are going to use it

  only to set up new ones.

pmo-trunk-r186

diff --git a/src/gtk-glade/modest-ui-wizard.c b/src/gtk-glade/modest-ui-wizard.c
index d828771..47a8f98 100644 (file)
--- a/src/gtk-glade/modest-ui-wizard.c
+++ b/src/gtk-glade/modest-ui-wizard.c
@@ -258,38 +258,8 @@ void wizard_account_dialog(ModestUI *modest_ui)
 void new_wizard_account (GtkWidget *widget,
                         gpointer user_data)
 {
 void new_wizard_account (GtkWidget *widget,
                         gpointer user_data)
 {

-       /* for now: */
+       /* This will probably never be used to modify any existing account. */

        wizard_account_dialog(MODEST_UI(user_data));
 }
 
        wizard_account_dialog(MODEST_UI(user_data));
 }
 

-void setup_account_wizardry_menu (GtkWidget *menu,
-                                 ModestUI *modest_ui)
-{
-       ModestUIPrivate *priv;
-       gint retval;
-       GSList *account_name_list;
-       GSList *account_name_list_iter;
-       GtkWidget *awidget;
-       gint menucounter;
-
-        g_return_if_fail(MODEST_IS_UI(modest_ui));
-       priv = MODEST_UI_GET_PRIVATE(MODEST_UI(modest_ui));
-
-       account_name_list=modest_account_mgr_account_names(priv->modest_acc_mgr, NULL);
-
-       menucounter=1; /* The first item is supposed to be the "New Account..." item. */
-       for (account_name_list_iter=account_name_list;
-            account_name_list_iter!=NULL;
-            account_name_list_iter=g_slist_next(account_name_list_iter))
-       {
-               awidget=gtk_menu_item_new_with_label(account_name_list_iter->data);
-               gtk_widget_show(awidget);
-               gtk_menu_attach(GTK_MENU(menu),
-                               awidget,
-                               0, 1, menucounter, menucounter+1);
-       }
-
-       g_slist_free(account_name_list);
-}
-

 
 

diff --git a/src/gtk-glade/modest-ui.c b/src/gtk-glade/modest-ui.c
index 53e5b59..7ebf9ee 100644 (file)
--- a/src/gtk-glade/modest-ui.c
+++ b/src/gtk-glade/modest-ui.c
@@ -309,9 +309,6 @@ modest_ui_show_main_window (ModestUI *modest_ui)
                          G_CALLBACK(on_message_clicked),
                           modest_ui);
 
                          G_CALLBACK(on_message_clicked),
                           modest_ui);
 

-        AccountWizardryMenu=glade_xml_get_widget(priv->glade_xml, "AccountWizardry_menu");
-        setup_account_wizardry_menu(AccountWizardryMenu, modest_ui);
-

        account_settings_item = glade_xml_get_widget (priv->glade_xml, "AccountSettingsMenuItem");
        if (!account_settings_item)
        {
        account_settings_item = glade_xml_get_widget (priv->glade_xml, "AccountSettingsMenuItem");
        if (!account_settings_item)
        {

@@ -408,7 +405,7 @@ register_toolbar_callbacks (ModestUI *modest_ui)
                                  G_CALLBACK(on_delete_clicked), modest_ui);
                gtk_widget_set_sensitive(button, FALSE);
        }
                                  G_CALLBACK(on_delete_clicked), modest_ui);
                gtk_widget_set_sensitive(button, FALSE);
        }

-       
+

        button = glade_xml_get_widget (priv->glade_xml, "toolb_send_receive");
        if (button) {
                g_signal_connect (button, "clicked",
        button = glade_xml_get_widget (priv->glade_xml, "toolb_send_receive");
        if (button) {
                g_signal_connect (button, "clicked",

@@ -1094,7 +1091,7 @@ on_sendreceive_button_clicked (GtkWidget *widget, ModestUI *modest_ui)
        TnyAccountStoreIface *account_store;
        const GList *store_accounts;
        const GList *iter;
        TnyAccountStoreIface *account_store;
        const GList *store_accounts;
        const GList *iter;

-       
+

        g_return_if_fail (modest_ui);
 
        store_actions = MODEST_TNY_STORE_ACTIONS (modest_tny_store_actions_new ());
        g_return_if_fail (modest_ui);
 
        store_actions = MODEST_TNY_STORE_ACTIONS (modest_tny_store_actions_new ());

@@ -1103,13 +1100,13 @@ on_sendreceive_button_clicked (GtkWidget *widget, ModestUI *modest_ui)
        account_store = priv->account_store;
        store_accounts =
                tny_account_store_iface_get_store_accounts (account_store);
        account_store = priv->account_store;
        store_accounts =
                tny_account_store_iface_get_store_accounts (account_store);

-               
+

        for (iter = store_accounts; iter; iter = iter->next)
        for (iter = store_accounts; iter; iter = iter->next)

-               modest_tny_store_actions_update_folders (store_actions, 
+               modest_tny_store_actions_update_folders (store_actions,

                                                                                                 TNY_STORE_ACCOUNT_IFACE (iter->data));
                                                                                                 TNY_STORE_ACCOUNT_IFACE (iter->data));

-       
+

        /* TODO, lock, refresh display */
        /* TODO, lock, refresh display */

-       
+

        g_object_unref (store_actions);
 
 }
        g_object_unref (store_actions);
 
 }

diff --git a/src/gtk-glade/modest.glade b/src/gtk-glade/modest.glade
index e70b112..86b7e4e 100644 (file)
--- a/src/gtk-glade/modest.glade
+++ b/src/gtk-glade/modest.glade
@@ -292,7 +292,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Inbox</property>
                      <property name="use_underline">True</property>
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Inbox</property>
                      <property name="use_underline">True</property>

-                     <property name="active">True</property>
+                     <property name="active">False</property>

                      <signal name="activate" handler="on_inbox1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>
                  </child>
                      <signal name="activate" handler="on_inbox1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>
                  </child>

@@ -302,7 +302,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Outbox</property>
                      <property name="use_underline">True</property>
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Outbox</property>
                      <property name="use_underline">True</property>

-                     <property name="active">True</property>
+                     <property name="active">False</property>

                      <property name="group">inbox1</property>
                      <signal name="activate" handler="on_outbox1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>
                      <property name="group">inbox1</property>
                      <signal name="activate" handler="on_outbox1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>

@@ -313,7 +313,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Drafts</property>
                      <property name="use_underline">True</property>
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Drafts</property>
                      <property name="use_underline">True</property>

-                     <property name="active">True</property>
+                     <property name="active">False</property>

                      <property name="group">inbox1</property>
                      <signal name="activate" handler="on_drafts1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>
                      <property name="group">inbox1</property>
                      <signal name="activate" handler="on_drafts1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>

@@ -324,7 +324,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Sent</property>
                      <property name="use_underline">True</property>
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Sent</property>
                      <property name="use_underline">True</property>

-                     <property name="active">True</property>
+                     <property name="active">False</property>

                      <property name="group">inbox1</property>
                      <signal name="activate" handler="on_sent1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>
                      <property name="group">inbox1</property>
                      <signal name="activate" handler="on_sent1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>

@@ -494,24 +494,11 @@
                  </child>
 
                  <child>
                  </child>
 
                  <child>

-                   <widget class="GtkMenuItem" id="AccountWizardryMenuItem">
+                   <widget class="GtkMenuItem" id="NewAccountWizzardMenuItem">

                      <property name="visible">True</property>
                      <property name="visible">True</property>

-                     <property name="label" translatable="yes">Account Wizardry</property>
+                     <property name="label" translatable="yes">New account...</property>

                      <property name="use_underline">True</property>
                      <property name="use_underline">True</property>

-
-                     <child>
-                       <widget class="GtkMenu" id="AccountWizardry_menu">
-
-                         <child>
-                           <widget class="GtkMenuItem" id="NewAccountWizardMenuItem">
-                             <property name="visible">True</property>
-                             <property name="label" translatable="yes">New account...</property>
-                             <property name="use_underline">True</property>
-                             <signal name="activate" handler="new_wizard_account" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>
-                           </widget>
-                         </child>
-                       </widget>
-                     </child>
+                     <signal name="activate" handler="on_new_account1_activate" last_modification_time="Fri, 28 Apr 2006 12:23:17 GMT"/>

                    </widget>
                  </child>
 
                    </widget>
                  </child>
 

@@ -3830,7 +3817,7 @@
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">

-    <widget class="GtkVBox" id="account_wizard_top_container">
+    <widget class="GtkVBox" id="account_wizzard_top_container">

       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>