2007-06-03 Christian Kellner <ckellner@openismus.com>

[modest] / src / maemo / modest-account-settings-dialog.c

diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c
index 765289c..50d747b 100644 (file)
--- a/src/maemo/modest-account-settings-dialog.c
+++ b/src/maemo/modest-account-settings-dialog.c
@@ -212,12 +212,11 @@ static GtkWidget* create_caption_new_with_asterisk(ModestAccountSettingsDialog *
        GtkWidget *icon,
        HildonCaptionStatus flag)
 {
-  GtkWidget *caption = hildon_caption_new (group, value, control, icon, flag);
+       GtkWidget *caption = NULL;
   
-/* The translated strings seem to already contain the *,
- * but this code can be used if that is not true in future.
- */
-#if 0
+       /* Note: Previously, the translated strings already contained the "*",
+        * Comment out this code if they do again.
+        */
        /* Add a * character to indicate mandatory fields,
         * as specified in our "Email UI Specification": */
        if (flag == HILDON_CAPTION_MANDATORY) {
@@ -227,7 +226,6 @@ static GtkWidget* create_caption_new_with_asterisk(ModestAccountSettingsDialog *
        }       
        else
                caption = hildon_caption_new (group, value, control, icon, flag);
-#endif
 
        /* Connect to the appropriate changed signal for the widget, 
         * so we can ask for the prev/next buttons to be enabled/disabled appropriately:
@@ -496,8 +494,14 @@ static void update_incoming_server_title (ModestAccountSettingsDialog *self, Mod
         * because the compiler does not know that the translated string will have a %s in it.
         * I do not see a way to avoid the warning while still using these Logical IDs. murrayc. */
        gchar* incomingserver_title = g_strdup_printf(_("mcen_li_emailsetup_servertype"), type);
-       g_object_set (G_OBJECT (self->caption_incoming), "label", incomingserver_title, NULL);
-       g_free(incomingserver_title);
+       
+       /* 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. */
+       gchar *with_asterisk = g_strconcat (incomingserver_title, "*", NULL);
+       g_free (incomingserver_title);
+       
+       g_object_set (G_OBJECT (self->caption_incoming), "label", with_asterisk, NULL);
+       g_free(with_asterisk);
 }
 
 /** Change the caption title for the incoming server, 
@@ -904,9 +908,6 @@ modest_account_settings_dialog_init (ModestAccountSettingsDialog *self)
         * Each page of the notebook will be a page of the wizard: */
        GtkNotebook *notebook = GTK_NOTEBOOK (gtk_notebook_new());
 
-    
-    gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_emailsetup"));
-       
        /* Get the account manager object, 
         * so we can check for existing accounts,
         * and create new accounts: */
@@ -1134,7 +1135,21 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo
                        GTK_TOGGLE_BUTTON (dialog->checkbox_outgoing_smtp_specific), 
                        has_specific);
        }
-       
+
+       /* Set window title according to account: */
+       /* TODO: Is this the correct way to find a human-readable name for
+        * the protocol used? */
+       const gchar* proto_str = modest_protocol_info_get_transport_store_protocol_name (dialog->incoming_protocol);
+       gchar *proto_name = g_utf8_strup(proto_str, -1);
+       gchar *account_title = modest_account_mgr_get_display_name(dialog->account_manager, account_name);
+
+       gchar *title = g_strdup_printf(_("mcen_ti_account_settings"), proto_name, account_title);
+       g_free (proto_name);
+       g_free (account_title);
+
+       gtk_window_set_title (GTK_WINDOW (dialog), title);
+       g_free (title);
+
        /* account_data->is_enabled,  */
        /*account_data->is_default,  */