2009-01-21 Claudio Saavedra <csaavedra@igalia.com>

* src/hildon-calendar-popup.c: (hildon_calendar_popup_init):
	* src/hildon-color-chooser-dialog.c:
	(hildon_color_chooser_dialog_init):
	* src/hildon-font-selection-dialog.c:
	(hildon_font_selection_dialog_init),
	(hildon_font_selection_dialog_show_preview):
	* src/hildon-get-password-dialog.c:
	* src/hildon-login-dialog.c:
	* src/hildon-set-password-dialog.c:
	* src/hildon-sort-dialog.c: (hildon_sort_dialog_init):
	* src/hildon-time-picker.c: (hildon_time_picker_init):

	Remove obsolete logical string IDs and update to the appropriate ones.

	Fixes: NB#98609 (Use wdgt_ strings for all hildon dialog buttons)

diff --git a/ChangeLog b/ChangeLog
index d8c64a9..889c86b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2009-01-21  Claudio Saavedra  <csaavedra@igalia.com>
+
+       * src/hildon-calendar-popup.c: (hildon_calendar_popup_init):
+       * src/hildon-color-chooser-dialog.c:
+       (hildon_color_chooser_dialog_init):
+       * src/hildon-font-selection-dialog.c:
+       (hildon_font_selection_dialog_init),
+       (hildon_font_selection_dialog_show_preview):
+       * src/hildon-get-password-dialog.c:
+       * src/hildon-login-dialog.c:
+       * src/hildon-set-password-dialog.c:
+       * src/hildon-sort-dialog.c: (hildon_sort_dialog_init):
+       * src/hildon-time-picker.c: (hildon_time_picker_init):
+
+       Remove obsolete logical string IDs and update to the appropriate ones.
+
+       Fixes: NB#98609 (Use wdgt_ strings for all hildon dialog buttons)
+
 2009-01-21  Alberto Garcia  <agarcia@igalia.com>
 
        * src/hildon-window.c (hildon_window_update_topmost): Fix warning

diff --git a/src/hildon-calendar-popup.c b/src/hildon-calendar-popup.c
index 459caad..861208a 100644 (file)
--- a/src/hildon-calendar-popup.c
+++ b/src/hildon-calendar-popup.c
@@ -338,7 +338,7 @@ hildon_calendar_popup_init                      (HildonCalendarPopup *cal)
     gtk_box_pack_start (GTK_BOX (GTK_DIALOG (cal)->vbox), priv->cal,
             TRUE, TRUE, 0);
     gtk_dialog_set_has_separator (GTK_DIALOG (cal), FALSE);
-    gtk_dialog_add_button (GTK_DIALOG (cal), _("ecdg_bd_font_dialog_ok"), GTK_RESPONSE_OK);
+    gtk_dialog_add_button (GTK_DIALOG (cal), _("wdgt_bd_done"), GTK_RESPONSE_OK);
     gtk_widget_show(priv->cal);
 
     /* Connect signals */

diff --git a/src/hildon-color-chooser-dialog.c b/src/hildon-color-chooser-dialog.c
index 902a475..10676e4 100644 (file)
--- a/src/hildon-color-chooser-dialog.c
+++ b/src/hildon-color-chooser-dialog.c
@@ -214,7 +214,7 @@ hildon_color_chooser_dialog_init                (HildonColorChooserDialog *objec
     gtk_box_pack_start (GTK_BOX (priv->vbox), priv->separator, FALSE, FALSE, 0);
     gtk_box_pack_start (GTK_BOX (priv->vbox), priv->align_custom, FALSE, FALSE, 0);
 
-    gtk_dialog_add_button (GTK_DIALOG (object), _("ecdg_bd_colour_selector_ok"), GTK_RESPONSE_OK);
+    gtk_dialog_add_button (GTK_DIALOG (object), _("wdgt_bd_done"), GTK_RESPONSE_OK);
     gtk_dialog_set_default_response (GTK_DIALOG (object), GTK_RESPONSE_OK);
 
     g_signal_connect (G_OBJECT (priv->chooser), 

diff --git a/src/hildon-font-selection-dialog.c b/src/hildon-font-selection-dialog.c
index 4635d4b..5f864ed 100644 (file)
--- a/src/hildon-font-selection-dialog.c
+++ b/src/hildon-font-selection-dialog.c
@@ -755,7 +755,7 @@ hildon_font_selection_dialog_init               (HildonFontSelectionDialog *font
 
     /* Add dialog buttons */
     gtk_dialog_add_button (GTK_DIALOG (fontseldiag),
-            _("ecdg_bd_font_dialog_ok"),
+            _("wdgt_bd_done"),
             GTK_RESPONSE_OK);
 
     preview_button = gtk_button_new_with_label (_("ecdg_bd_font_dialog_preview"));
@@ -1139,7 +1139,7 @@ hildon_font_selection_dialog_show_preview       (HildonFontSelectionDialog *font
                 GTK_DIALOG_MODAL |
                 GTK_DIALOG_DESTROY_WITH_PARENT |
                 GTK_DIALOG_NO_SEPARATOR,
-                _("ecdg_bd_font_dialog_ok"),
+                _("wdgt_bd_done"),
                 GTK_RESPONSE_ACCEPT,
                 NULL);
 

diff --git a/src/hildon-get-password-dialog.c b/src/hildon-get-password-dialog.c
index 7db3d9b..5c03a55 100644 (file)
--- a/src/hildon-get-password-dialog.c
+++ b/src/hildon-get-password-dialog.c
@@ -91,7 +91,7 @@
 
 #define                                         HILDON_GET_PASSWORD_DIALOG_PASSWORD "ecdg_fi_get_old_pwd_enter_pwd"
 
-#define                                         HILDON_GET_PASSWORD_DIALOG_OK "ecdg_bd_get_old_password_dialog_ok"
+#define                                         HILDON_GET_PASSWORD_DIALOG_OK "wdgt_bd_done"
 
 #define                                         HILDON_GET_PASSWORD_DIALOG_CANCEL "ecdg_bd_get_old_password_dialog_cancel"
 
@@ -99,7 +99,7 @@
 
 #define                                         HILDON_GET_PASSWORD_VERIFY_DIALOG_PASSWORD "ecdg_fi_verify_pwd_enter_pwd"
 
-#define                                         HILDON_GET_PASSWORD_VERIFY_DIALOG_OK "ecdg_bd_verify_password_dialog_ok"
+#define                                         HILDON_GET_PASSWORD_VERIFY_DIALOG_OK "wdgt_bd_done"
 
 #define                                         HILDON_GET_PASSWORD_VERIFY_DIALOG_CANCEL "ecdg_bd_verify_password_dialog_cancel"
 

diff --git a/src/hildon-login-dialog.c b/src/hildon-login-dialog.c
index 6e61599..a232c62 100644 (file)
--- a/src/hildon-login-dialog.c
+++ b/src/hildon-login-dialog.c
@@ -84,7 +84,7 @@ hildon_login_dialog_get_property                (GObject *object,
 
 #define                                         HILDON_LOGIN_DIALOG_PASSWORD "frw_ti_get_user_name_and_pwd_enter_pwd"
 
-#define                                         HILDON_LOGIN_DIALOG_OK "frw_bd_get_user_name_and_pwd_ok"
+#define                                         HILDON_LOGIN_DIALOG_OK "wdgt_bd_done"
 
 #define                                         _(String) dgettext("hildon-libs", String)
 

diff --git a/src/hildon-set-password-dialog.c b/src/hildon-set-password-dialog.c
index adb300a..d051a81 100644 (file)
--- a/src/hildon-set-password-dialog.c
+++ b/src/hildon-set-password-dialog.c
@@ -67,7 +67,7 @@
 
 #define                                         HILDON_SET_PASSWORD_DIALOG_VERIFY_PASSWORD "ecdg_fi_set_passwd_confirm"
 
-#define                                         HILDON_SET_PASSWORD_DIALOG_OK "ecdg_bd_set_password_dialog_ok"
+#define                                         HILDON_SET_PASSWORD_DIALOG_OK "wdgt_bd_done"
 
 #define                                         HILDON_SET_PASSWORD_DIALOG_CANCEL "ecdg_bd_set_password_dialog_cancel"
 

diff --git a/src/hildon-sort-dialog.c b/src/hildon-sort-dialog.c
index 6990c7b..c3c4213 100644 (file)
--- a/src/hildon-sort-dialog.c
+++ b/src/hildon-sort-dialog.c
@@ -300,7 +300,7 @@ hildon_sort_dialog_init                         (HildonSortDialog * dialog)
 
     /* Create the OK/CANCEL buttons */
     (void) gtk_dialog_add_button (GTK_DIALOG(dialog),
-            _("ckdg_bd_sort_dialog_ok"),
+            _("wdgt_bd_sort"),
             GTK_RESPONSE_OK);
     (void) gtk_dialog_add_button (GTK_DIALOG(dialog),
             _("ckdg_bd_sort_dialog_cancel"),

diff --git a/src/hildon-time-picker.c b/src/hildon-time-picker.c
index a4568b9..e720deb 100644 (file)
--- a/src/hildon-time-picker.c
+++ b/src/hildon-time-picker.c
@@ -466,7 +466,7 @@ hildon_time_picker_init                         (HildonTimePicker *picker)
     gtk_window_set_modal (GTK_WINDOW (dialog), FALSE);
     /* And final dialog packing */
     gtk_dialog_set_has_separator (dialog, FALSE);
-    gtk_dialog_add_button (dialog, _("ecdg_bd_time_picker_close"),
+    gtk_dialog_add_button (dialog, _("wdgt_bd_done"),
             GTK_RESPONSE_OK);
 
     gtk_container_add (GTK_CONTAINER (maintocenter), GTK_WIDGET(table));