diff options
author | William Jon McCann <mccann@jhu.edu> | 2007-09-11 01:43:41 +0000 |
---|---|---|
committer | William Jon McCann <mccann@src.gnome.org> | 2007-09-11 01:43:41 +0000 |
commit | 729df8c4453b8b4cff659d3b76722dded1475035 (patch) | |
tree | 6836bf3c4873a0d352249dca1ab73c80563feffc /gui | |
parent | 9dcf648c80d6b62cafb7527b0771591ade44cb16 (diff) | |
download | gdm-729df8c4453b8b4cff659d3b76722dded1475035.tar.gz |
Don't auto-activate g-p-m. Try to get focus in entry.
2007-09-10 William Jon McCann <mccann@jhu.edu>
* gui/simple-greeter/gdm-simple-greeter.c: (set_focus),
(reset_dialog), (gdm_simple_greeter_info_query),
(gdm_simple_greeter_secret_info_query):
* gui/simple-greeter/gdm-simple-greeter.glade:
* gui/simple-greeter/greeter-main.c:
Don't auto-activate g-p-m. Try to get focus in entry.
svn path=/branches/mccann-gobject/; revision=5236
Diffstat (limited to 'gui')
-rw-r--r-- | gui/simple-greeter/gdm-simple-greeter.c | 38 | ||||
-rw-r--r-- | gui/simple-greeter/gdm-simple-greeter.glade | 5 | ||||
-rw-r--r-- | gui/simple-greeter/greeter-main.c | 2 |
3 files changed, 29 insertions, 16 deletions
diff --git a/gui/simple-greeter/gdm-simple-greeter.c b/gui/simple-greeter/gdm-simple-greeter.c index 66eedfb1..45f5455d 100644 --- a/gui/simple-greeter/gdm-simple-greeter.c +++ b/gui/simple-greeter/gdm-simple-greeter.c @@ -147,6 +147,23 @@ set_sensitive (GdmSimpleGreeter *greeter, } static void +set_focus (GdmSimpleGreeter *greeter) +{ + GtkWidget *top_level; + GtkWidget *entry; + + entry = glade_xml_get_widget (GDM_SIMPLE_GREETER (greeter)->priv->xml, "auth-entry"); + top_level = glade_xml_get_widget (greeter->priv->xml, "auth-window"); + + gdk_window_focus (top_level->window, GDK_CURRENT_TIME); + + if (! GTK_WIDGET_HAS_FOCUS (entry)) { + gtk_widget_grab_focus (entry); + } +} + + +static void set_message (GdmSimpleGreeter *greeter, const char *text) { @@ -180,14 +197,11 @@ reset_dialog (GdmSimpleGreeter *greeter) label = glade_xml_get_widget (GDM_SIMPLE_GREETER (greeter)->priv->xml, "auth-label"); gtk_label_set_text (GTK_LABEL (label), ""); - if (! GTK_WIDGET_HAS_FOCUS (entry)) { - gtk_widget_grab_focus (entry); - } - set_message (greeter, ""); - set_ready (greeter); set_sensitive (greeter, TRUE); + set_ready (greeter); + set_focus (GDM_SIMPLE_GREETER (greeter)); } static gboolean @@ -253,13 +267,14 @@ gdm_simple_greeter_info_query (GdmGreeter *greeter, label = glade_xml_get_widget (GDM_SIMPLE_GREETER (greeter)->priv->xml, "auth-label"); gtk_label_set_text (GTK_LABEL (label), text); + set_sensitive (GDM_SIMPLE_GREETER (greeter), TRUE); + set_ready (GDM_SIMPLE_GREETER (greeter)); + set_focus (GDM_SIMPLE_GREETER (greeter)); + if (! GTK_WIDGET_HAS_FOCUS (entry)) { gtk_widget_grab_focus (entry); } - set_ready (GDM_SIMPLE_GREETER (greeter)); - set_sensitive (GDM_SIMPLE_GREETER (greeter), TRUE); - return TRUE; } @@ -283,12 +298,9 @@ gdm_simple_greeter_secret_info_query (GdmGreeter *greeter, label = glade_xml_get_widget (GDM_SIMPLE_GREETER (greeter)->priv->xml, "auth-label"); gtk_label_set_text (GTK_LABEL (label), text); - if (! GTK_WIDGET_HAS_FOCUS (entry)) { - gtk_widget_grab_focus (entry); - } - - set_ready (GDM_SIMPLE_GREETER (greeter)); set_sensitive (GDM_SIMPLE_GREETER (greeter), TRUE); + set_ready (GDM_SIMPLE_GREETER (greeter)); + set_focus (GDM_SIMPLE_GREETER (greeter)); return TRUE; } diff --git a/gui/simple-greeter/gdm-simple-greeter.glade b/gui/simple-greeter/gdm-simple-greeter.glade index 5e22069d..c8a79c62 100644 --- a/gui/simple-greeter/gdm-simple-greeter.glade +++ b/gui/simple-greeter/gdm-simple-greeter.glade @@ -6,7 +6,7 @@ <widget class="GtkWindow" id="auth-window"> <property name="border_width">12</property> <property name="visible">True</property> - <property name="title" translatable="yes">window1</property> + <property name="title" translatable="yes">Authentication Dialog</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">False</property> @@ -15,7 +15,7 @@ <property name="decorated">True</property> <property name="skip_taskbar_hint">False</property> <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> <property name="urgency_hint">False</property> @@ -148,4 +148,5 @@ </widget> </child> </widget> + </glade-interface> diff --git a/gui/simple-greeter/greeter-main.c b/gui/simple-greeter/greeter-main.c index d1100c8a..8ed414ce 100644 --- a/gui/simple-greeter/greeter-main.c +++ b/gui/simple-greeter/greeter-main.c @@ -289,7 +289,7 @@ proxy_destroyed (GObject *object, g_debug ("GREETER Proxy disconnected"); } -#if 1 +#if 0 static void activate_power_manager (void) { |