2007-05-17 Murray Cumming <murrayc@murrayc.com>

* src/maemo/modest-account-settings-dialog.c:
        (create_page_account_details),
        (modest_account_settings_dialog_set_account_name):
        * src/maemo/modest-account-settings-dialog.h: Hide the whole caption
        for the leave-on-server checkbox, rathr than just the checkbox, when
        the protocol is not POP.

pmo-trunk-r1901

diff --git a/ChangeLog2 b/ChangeLog2
index ca0ddab..37c6af9 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,14 @@
 2007-05-17  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/maemo/modest-account-settings-dialog.c:
+       (create_page_account_details),
+       (modest_account_settings_dialog_set_account_name):
+       * src/maemo/modest-account-settings-dialog.h: Hide the whole caption 
+       for the leave-on-server checkbox, rathr than just the checkbox, when 
+       the protocol is not POP.
+
+2007-05-17  Murray Cumming  <murrayc@murrayc.com>
+
        * src/widgets/modest-account-view.c:
        * src/widgets/modest-account-view.h:
        Added modest_account_view_select_account() which will be useful later 

diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c
index 0e67eaa..de23a14 100644 (file)
--- a/src/maemo/modest-account-settings-dialog.c
+++ b/src/maemo/modest-account-settings-dialog.c
@@ -323,12 +323,15 @@ create_page_account_details (ModestAccountSettingsDialog *self)
        /* The leave-messages widgets: */
        if(!self->checkbox_leave_messages)
                self->checkbox_leave_messages = gtk_check_button_new ();
-       caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_leave_on_server"), 
-               self->checkbox_leave_messages, NULL, HILDON_CAPTION_MANDATORY);
+       if (!self->caption_leave_messages) {
+               self->caption_leave_messages = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_leave_on_server"), 
+                       self->checkbox_leave_messages, NULL, HILDON_CAPTION_MANDATORY);
+       }
+                       
        gtk_widget_show (self->checkbox_leave_messages);
        connect_for_modified (self, self->checkbox_leave_messages);
-       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (caption);
+       gtk_box_pack_start (GTK_BOX (box), self->caption_leave_messages, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (self->caption_leave_messages);
        
        gtk_widget_show (GTK_WIDGET (box));
        
@@ -1029,9 +1032,9 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo
        /* Only show the leave-on-server checkbox for POP, 
         * as per the UI spec: */
        if (incoming_account->proto != MODEST_PROTOCOL_STORE_POP) {
-               gtk_widget_hide (dialog->checkbox_leave_messages);
+               gtk_widget_hide (dialog->caption_leave_messages);
        } else {
-               gtk_widget_show (dialog->checkbox_leave_messages);
+               gtk_widget_show (dialog->caption_leave_messages);
        }
                
        if (incoming_account) {

diff --git a/src/maemo/modest-account-settings-dialog.h b/src/maemo/modest-account-settings-dialog.h
index 83c0fc4..7fa4136 100644 (file)
--- a/src/maemo/modest-account-settings-dialog.h
+++ b/src/maemo/modest-account-settings-dialog.h
@@ -51,6 +51,7 @@ typedef struct {
        GtkWidget *entry_account_title;
        GtkWidget *combo_retrieve;
        GtkWidget *combo_limit_retrieve;
+       GtkWidget *caption_leave_messages;
        GtkWidget *checkbox_leave_messages;
        
        GtkWidget *page_user_details;