* Fixes NB#101195, do not show confirmation note when closing connection specific...

[modest] / src / hildon2 / modest-default-account-settings-dialog.c

diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c
index 5ec31a0..d4e3d5c 100644 (file)
--- a/src/hildon2/modest-default-account-settings-dialog.c
+++ b/src/hildon2/modest-default-account-settings-dialog.c
@@ -496,7 +496,10 @@ on_button_delete (GtkButton *button, gpointer user_data)
        self = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data);
        priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
 
-       account_title = get_entered_account_title (self);
+       if (priv->modified)
+               account_title = g_strdup (priv->original_account_title);
+       else
+               account_title = get_entered_account_title (self);
 
        removed = modest_ui_actions_on_delete_account (GTK_WINDOW (self),
                                                       priv->account_name, 
@@ -646,7 +649,6 @@ update_incoming_server_title (ModestDefaultAccountSettingsDialog *self,
        ModestProtocol *protocol;
        const gchar *protocol_display_name;
        gchar* incomingserver_title;
-       gchar *with_asterisk;
        ModestDefaultAccountSettingsDialogPrivate *priv;
 
        priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
@@ -654,16 +656,11 @@ update_incoming_server_title (ModestDefaultAccountSettingsDialog *self,
        protocol_registry = modest_runtime_get_protocol_registry ();
        protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, protocol_type);
        protocol_display_name = modest_protocol_get_display_name (protocol);
-       incomingserver_title = g_strdup_printf(_("mcen_li_emailsetup_servertype"), 
-                                              protocol_display_name);
+       incomingserver_title = g_strconcat(_("mcen_li_emailsetup_servertype"), "*", 
+                                          "\n<small>(", protocol_display_name, ")</small>", NULL);
        
-       /* This is a mandatory field, so add a *. This is usually done by
-        * create_caption_new_with_asterisk() but we can't use that here. */
-       with_asterisk = g_strconcat (incomingserver_title, "*", NULL);
+       modest_maemo_utils_captioned_set_label (priv->caption_incoming, incomingserver_title, TRUE);
        g_free (incomingserver_title);
-       
-       modest_maemo_utils_captioned_set_label (priv->caption_incoming, with_asterisk, FALSE);
-       g_free (with_asterisk);
 }
 
 static GtkWidget* 
@@ -735,7 +732,7 @@ enable_widget_for_checkbutton (GtkWidget *widget, GtkButton* button)
 {
        g_signal_connect (G_OBJECT (button), "clicked",
                G_CALLBACK (on_check_button_clicked), widget);
-       
+
        /* Set the starting sensitivity: */
        on_check_button_clicked (button, widget);
 }
@@ -753,10 +750,9 @@ on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data)
        smtp_win = modest_connection_specific_smtp_window_new ();
        modest_connection_specific_smtp_window_fill_with_connections (smtp_win, priv->account_manager);
 
-       /* Show the window: */  
+       /* Show the window: */
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (smtp_win), GTK_WINDOW (self));
        gtk_widget_show (GTK_WIDGET (smtp_win));
-       priv->modified = TRUE;
 }
 
 static void
@@ -774,24 +770,27 @@ static GtkWidget*
 create_page_outgoing (ModestDefaultAccountSettingsDialog *self)
 {
        ModestDefaultAccountSettingsDialogPrivate *priv;
+       gchar *smtp_caption_label;
        GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
 
        priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
-       
+
        /* 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. */
        GtkSizeGroup *title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
        GtkSizeGroup *value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-        
+ 
        /* The outgoing server widgets: */
        if (!priv->entry_outgoingserver)
                priv->entry_outgoingserver = 
                        hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
        /* Auto-capitalization is the default, so let's turn it off: */
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL);
+       smtp_caption_label = g_strconcat (_("mcen_li_emailsetup_smtp"), "\n<small>(SMTP)</small>", NULL);
        GtkWidget *caption = create_captioned (self, title_sizegroup, value_sizegroup,
-                                              _("mcen_li_emailsetup_smtp"), FALSE, priv->entry_outgoingserver);
+                                              smtp_caption_label, TRUE, priv->entry_outgoingserver);
+       g_free (smtp_caption_label);
        gtk_widget_show (priv->entry_outgoingserver);
        connect_for_modified (self, priv->entry_outgoingserver);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);