2007-07-16 Murray Cumming <murrayc@murrayc.com>

Reverted this previous commit from Johannes,
because the scrollbars are always visible and because
I think we only need it on onepage of the account
settings, not the account wizard.
(I wrote the wrong instructions in the bug.)

* src/maemo/easysetup/modest-easysetup-wizard.c:
Added scrollbars to account wizard dialog.
Fixed projects.maemo.org NB #62744

pmo-trunk-r2765

diff --git a/ChangeLog2 b/ChangeLog2
index 0c33b4e..862cfbd 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,3 +1,15 @@
+2007-07-16  Murray Cumming  <murrayc@murrayc.com>
+
+       Reverted this previous commit from Johannes, 
+       because the scrollbars are always visible and because 
+       I think we only need it on onepage of the account 
+       settings, not the account wizard.
+       (I wrote the wrong instructions in the bug.)
+
+       * src/maemo/easysetup/modest-easysetup-wizard.c:
+       Added scrollbars to account wizard dialog.
+       Fixed projects.maemo.org NB #62744
+
 2007-07-22  Johannes Schmid <johannes.schmid@openismus.com>
 
        * src/maemo/easysetup/modest-easysetup-wizard.c:

diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c
index 7242293..ad46faf 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-wizard.c
+++ b/src/maemo/easysetup/modest-easysetup-wizard.c
@@ -371,19 +371,11 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
 {
        GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails"));
-       GtkWidget *scrollwin = gtk_scrolled_window_new(NULL, NULL);
-
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
-                                                                                                                                GTK_POLICY_NEVER,
-                                                                                                                                GTK_POLICY_AUTOMATIC);
-
-       
        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
        gtk_label_set_max_width_chars (GTK_LABEL (label), 40);
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF);
        gtk_widget_show (label);
        
-       
        /* Create a size group to be used by all captions.
         * Note that HildonCaption does not create a default size group if we do not specify one.
         * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
@@ -510,23 +502,14 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
                                              on_entry_max, self);
        
        gtk_widget_show (GTK_WIDGET (box));
-       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollwin),
-                                                                                                                                                               box);
-       gtk_widget_show (GTK_WIDGET(scrollwin));
        
-       return GTK_WIDGET (scrollwin);
+       return GTK_WIDGET (box);
 }
 
 static GtkWidget*
 create_page_user_details (ModestEasysetupWizardDialog *self)
 {
        GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
-       GtkWidget *scrollwin = gtk_scrolled_window_new(NULL, NULL);
-
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
-                                                                                                                                GTK_POLICY_NEVER,
-                                                                                                                                GTK_POLICY_AUTOMATIC);
-
        
        /* Create a size group to be used by all captions.
         * Note that HildonCaption does not create a default size group if we do not specify one.
@@ -623,11 +606,8 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
        
        
        gtk_widget_show (GTK_WIDGET (box));
-       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollwin), 
-                                                                                                                                                               box);
-       gtk_widget_show(scrollwin);
        
-       return GTK_WIDGET (scrollwin);
+       return GTK_WIDGET (box);
 }
 
 static GtkWidget* create_page_complete_easysetup (ModestEasysetupWizardDialog *self)
@@ -655,7 +635,6 @@ static GtkWidget* create_page_complete_easysetup (ModestEasysetupWizardDialog *s
        gtk_widget_show (label);
        
        gtk_widget_show (GTK_WIDGET (box));
-       
        return GTK_WIDGET (box);
 }
 
@@ -718,13 +697,7 @@ static void on_entry_incoming_servername_changed(GtkEntry *entry, gpointer user_
 static GtkWidget* create_page_custom_incoming (ModestEasysetupWizardDialog *self)
 {
        GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
-       GtkWidget *scrollwin = gtk_scrolled_window_new(NULL, NULL);
-
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
-                                                                                                                                GTK_POLICY_NEVER,
-                                                                                                                                GTK_POLICY_AUTOMATIC);
 
-       
        /* Show note that account type cannot be changed in future: */
        GtkWidget *label = gtk_label_new (_("mcen_ia_emailsetup_account_type"));
        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
@@ -808,11 +781,8 @@ static GtkWidget* create_page_custom_incoming (ModestEasysetupWizardDialog *self
        gtk_widget_show (caption);
        
        gtk_widget_show (GTK_WIDGET (box));
-       gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW(scrollwin), 
-                                                                                                                                                                box);
-       gtk_widget_show(scrollwin);
        
-       return GTK_WIDGET (scrollwin);
+       return GTK_WIDGET (box);
 }
 
 static void
@@ -870,12 +840,6 @@ static void on_entry_outgoing_servername_changed (GtkEntry *entry, gpointer user
 static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self)
 {
        GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
-       GtkWidget *scrollwin = gtk_scrolled_window_new(NULL, NULL);
-
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
-                                                                                                                                GTK_POLICY_NEVER,
-                                                                                                                                GTK_POLICY_AUTOMATIC);
-
        
        /* Create a size group to be used by all captions.
         * Note that HildonCaption does not create a default size group if we do not specify one.
@@ -969,10 +933,8 @@ static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self
        
        
        gtk_widget_show (GTK_WIDGET (box));
-       gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW(scrollwin), box);
-       gtk_widget_show(scrollwin);
        
-       return GTK_WIDGET (scrollwin);
+       return GTK_WIDGET (box);
 }
 
 static gboolean
@@ -1023,7 +985,6 @@ static GtkWidget* create_page_complete_custom (ModestEasysetupWizardDialog *self
 {
        GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
-       
        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
        gtk_widget_show (label);

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 630a5de..599ebe7 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -496,6 +496,8 @@ on_sendqueue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg,
                                message = g_strdup_printf (_("eemev_ni_ui_smtp_authentication_fail_error"), server_name);
                                break;
                        case TNY_TRANSPORT_ACCOUNT_ERROR_SEND:
+                               /* TODO: Tinymail is still sending this sometimes when it should 
+                                * send TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL. */
                        default:
                                message = g_strdup (_("emev_ib_ui_smtp_send_error"));
                                break;