From: Murray Cumming Date: Fri, 1 Jun 2007 09:57:26 +0000 (+0000) Subject: 2007-06-01 Murray Cumming X-Git-Tag: git_migration_finished~3460 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=c534e9adef3ebe87ff9772f91a741b54cbd5b518 2007-06-01 Murray Cumming * src/maemo/easysetup/modest-easysetup-wizard.c: (create_caption_new_with_asterisk): * src/maemo/modest-account-settings-dialog.c: (create_caption_new_with_asterisk): Uncomment the code to add the asterisk, because they are no longer in the translated text in the .po file. Fixes projects.maemo.org bug NB#59202 . (update_incoming_server_title): Add an asterisk here too. pmo-trunk-r2027 --- diff --git a/ChangeLog2 b/ChangeLog2 index d0d06f7..352b088 100644 --- a/ChangeLog2 +++ b/ChangeLog2 @@ -1,5 +1,15 @@ 2007-06-01 Murray Cumming + * src/maemo/easysetup/modest-easysetup-wizard.c: + (create_caption_new_with_asterisk): + * src/maemo/modest-account-settings-dialog.c: + (create_caption_new_with_asterisk): + Uncomment the code to add the asterisk, because they are no longer in the + translated text in the .po file. Fixes projects.maemo.org bug NB#59202 . + (update_incoming_server_title): Add an asterisk here too. + +2007-06-01 Murray Cumming + * src/maemo/modest-maemo-global-settings-dialog.c: (current_connection): Check that we are even connected before trying to get the current connection name, to prevent a warning. diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c index cfe9dc3..2c6f12c 100644 --- a/src/maemo/easysetup/modest-easysetup-wizard.c +++ b/src/maemo/easysetup/modest-easysetup-wizard.c @@ -180,12 +180,11 @@ static GtkWidget* create_caption_new_with_asterisk(ModestEasysetupWizardDialog * 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) { @@ -195,7 +194,6 @@ static GtkWidget* create_caption_new_with_asterisk(ModestEasysetupWizardDialog * } 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: diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c index 765289c..4baf0a8 100644 --- 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, diff --git a/src/widgets/modest-serversecurity-combo-box.c b/src/widgets/modest-serversecurity-combo-box.c index 77d392b..0df836d 100644 --- a/src/widgets/modest-serversecurity-combo-box.c +++ b/src/widgets/modest-serversecurity-combo-box.c @@ -157,6 +157,7 @@ void modest_serversecurity_combo_box_fill (ModestServersecurityComboBox *combobo GtkTreeIter iter; gtk_list_store_append (liststore, &iter); + /* TODO: This logical ID is not in the .po file: */ gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_CONNECTION_NORMAL, MODEL_COL_NAME, _("mcen_fi_advsetup_other_security_none"), -1); /* Select the None item: */