diff options
| author | Guido Günther <agx@sigxcpu.org> | 2009-04-24 11:28:59 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2009-04-24 11:28:59 +0200 |
| commit | 06c02461f04fc20d72341e44681410a8d017d4ee (patch) | |
| tree | bc5a52646fb42d587cf072e0ccf72802825a053c /gtksecentry | |
| parent | document changes and release 0.9~rc1-1 (diff) | |
| parent | Imported Upstream version 0.9+0gitec60300 (diff) | |
| download | krb5-auth-dialog-06c02461f04fc20d72341e44681410a8d017d4ee.tar.gz krb5-auth-dialog-06c02461f04fc20d72341e44681410a8d017d4ee.tar.bz2 krb5-auth-dialog-06c02461f04fc20d72341e44681410a8d017d4ee.zip | |
Merge commit 'upstream/0.9+0gitec60300'
Diffstat (limited to 'gtksecentry')
| -rw-r--r-- | gtksecentry/gtksecentry.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gtksecentry/gtksecentry.c b/gtksecentry/gtksecentry.c index 4ad0e97..712ff2a 100644 --- a/gtksecentry/gtksecentry.c +++ b/gtksecentry/gtksecentry.c @@ -683,13 +683,6 @@ gtk_secure_entry_class_init(GtkSecureEntryClass * class) GDK_CONTROL_MASK, "delete_from_cursor", 2, G_TYPE_ENUM, GTK_DELETE_WORD_ENDS, G_TYPE_INT, -1); - - gtk_settings_install_property(g_param_spec_boolean - ("gtk-entry-select-on-focus", - _("Select on focus"), - _ - ("Whether to select the contents of an entry when it is focused"), - TRUE, G_PARAM_READWRITE)); } static void @@ -1369,14 +1362,18 @@ gtk_secure_entry_focus_out(GtkWidget * widget, static void gtk_secure_entry_grab_focus(GtkWidget * widget) { + GtkWidget *tmp; GtkSecureEntry *entry = GTK_SECURE_ENTRY(widget); gboolean select_on_focus; GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_DEFAULT); GTK_WIDGET_CLASS(parent_class)->grab_focus(widget); - g_object_get(gtk_widget_get_settings(widget), + /* read current select on focus setting from GtkEntry */ + tmp = gtk_entry_new (); + g_object_get(gtk_widget_get_settings(tmp), "gtk-entry-select-on-focus", &select_on_focus, NULL); + gtk_widget_destroy (tmp); if (select_on_focus && !entry->in_click) gtk_editable_select_region(GTK_EDITABLE(widget), 0, -1); |