2006-09-20 Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>

* hildon-widgets/hildon-get-password-dialog.c: Fixing the way input
	method is set. Fixes #NB37467.

	* hildon-widgets/hildon-name-password-dialog.c: Fixing the way the
	password entry is being accessed. Fixes #MB767.

diff --git a/ChangeLog b/ChangeLog
index b137926..fcfc457 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-20  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+
+       * hildon-widgets/hildon-get-password-dialog.c: Fixing the way input
+       method is set. Fixes #NB37467. 
+
+       * hildon-widgets/hildon-name-password-dialog.c: Fixing the way the
+       password entry is being accessed. Fixes #MB767.
+
 2006-09-19  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
        * hildon-widgets/hildon-date-editor.c:

diff --git a/hildon-widgets/hildon-get-password-dialog.c b/hildon-widgets/hildon-get-password-dialog.c
index c4c952f..e7b2a15 100644 (file)
--- a/hildon-widgets/hildon-get-password-dialog.c
+++ b/hildon-widgets/hildon-get-password-dialog.c
@@ -118,12 +118,12 @@ hildon_get_password_set_property(GObject * object,
     break;
   case PROP_PASSWORD:
     gtk_entry_set_text(GTK_ENTRY
-                      (gtk_bin_get_child(GTK_BIN(priv->passwordEntry))),
+                      (hildon_caption_get_control (priv->passwordEntry)),
                       g_value_get_string(value));
     break;
   case PROP_NUMBERS_ONLY:
     /* Set input mode for the password entry */
-    g_object_set(G_OBJECT(gtk_bin_get_child(GTK_BIN(priv->passwordEntry))),
+    g_object_set(G_OBJECT(hildon_caption_get_control(priv->passwordEntry)),
                 "input-mode",
                 (g_value_get_boolean(value)
                  ? HILDON_INPUT_MODE_HINT_NUMERIC
@@ -166,13 +166,13 @@ hildon_get_password_get_property(GObject * object,
       g_value_set_string(value, string);
       break;
     case PROP_PASSWORD:
-      string = gtk_entry_get_text(GTK_ENTRY(priv->passwordEntry));
+      string = gtk_entry_get_text(GTK_ENTRY (hildon_caption_get_control(priv->passwordEntry)));
       g_value_set_string(value, string);
       break;
     case PROP_NUMBERS_ONLY:
       /* This property is set if and only if the input mode
         of the password entry has been set to numeric only */
-      g_object_get(G_OBJECT(gtk_bin_get_child(GTK_BIN(priv->passwordEntry))),
+      g_object_get(G_OBJECT(hildon_caption_get_control(priv->passwordEntry)),
                   "input-mode", &input_mode);
       g_value_set_boolean(value,
                          (input_mode == HILDON_INPUT_MODE_HINT_NUMERIC));
@@ -321,6 +321,7 @@ create_contents(HildonGetPasswordDialog *dialog)
 
     /* Create password text entry */
     control = gtk_entry_new();
+    g_object_set (control, "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL);
     gtk_entry_set_visibility(GTK_ENTRY(control), FALSE);
     priv->passwordEntry = HILDON_CAPTION
       (hildon_caption_new(group,
@@ -453,9 +454,7 @@ const gchar
     priv = HILDON_GET_PASSWORD_DIALOG_GET_PRIVATE(dialog);
 
     /* Retrieve the password entry widget */
-    entry1 = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(
-                       priv->passwordEntry)));
-
+    entry1 = GTK_ENTRY (hildon_caption_get_control(priv->passwordEntry));
     text1 = GTK_ENTRY(entry1)->text;
 
     return text1;

diff --git a/hildon-widgets/hildon-name-password-dialog.c b/hildon-widgets/hildon-name-password-dialog.c
index 50ab82c..9464c88 100644 (file)
--- a/hildon-widgets/hildon-name-password-dialog.c
+++ b/hildon-widgets/hildon-name-password-dialog.c
@@ -233,7 +233,7 @@ hildon_name_password_dialog_init(HildonNamePasswordDialog * dialog)
 
     /* Setup password entry */
     priv->passwordEntry = GTK_ENTRY(gtk_entry_new());
-    g_object_set (priv->passwordEntry, "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL);
+    g_object_set (priv->passwordEntry, "hildon-input-mode", HILDON_GTK_INPUT_MODE_FULL, NULL);
     gtk_entry_set_visibility(GTK_ENTRY(priv->passwordEntry), FALSE);
     caption =
       HILDON_CAPTION(hildon_caption_new(group,