gdm r6583 - in trunk: . gui/simple-greeter

[mccann svn gnome org]

Author: mccann
Date: Fri Oct 24 02:13:56 2008
New Revision: 6583
URL: http://svn.gnome.org/viewvc/gdm?rev=6583&view=rev

Log:
2008-10-23  William Jon McCann  <jmccann redhat com>

	* gui/simple-greeter/gdm-greeter-login-window.c (load_theme),
	(gdm_greeter_login_window_key_press_event):
	* gui/simple-greeter/gdm-greeter-login-window.glade:
	Remove capslock warning label since Gtk+ sorta has support
	for this now.



Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-greeter-login-window.c
   trunk/gui/simple-greeter/gdm-greeter-login-window.glade

Modified: trunk/gui/simple-greeter/gdm-greeter-login-window.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-login-window.c	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-login-window.c	Fri Oct 24 02:13:56 2008
@@ -111,14 +111,11 @@
 {
         GladeXML        *xml;
         GtkWidget       *user_chooser;
-        GtkWidget       *auth_capslock_label;
         GtkWidget       *auth_banner_label;
         guint            display_is_local : 1;
         guint            is_interactive : 1;
         GConfClient     *client;
 
-        gboolean         caps_lock_on;
-
         gboolean         banner_message_enabled;
         guint            gconf_cnxn;
 
@@ -166,41 +163,6 @@
 G_DEFINE_TYPE (GdmGreeterLoginWindow, gdm_greeter_login_window, GTK_TYPE_WINDOW)
 
 static void
-capslock_update (GdmGreeterLoginWindow *login_window,
-                 gboolean               is_on)
-{
-
-        login_window->priv->caps_lock_on = is_on;
-
-        if (login_window->priv->auth_capslock_label == NULL) {
-                return;
-        }
-
-        if (is_on) {
-                gtk_label_set_text (GTK_LABEL (login_window->priv->auth_capslock_label),
-                                    _("You have the Caps Lock key on."));
-        } else {
-                gtk_label_set_text (GTK_LABEL (login_window->priv->auth_capslock_label),
-                                    "");
-        }
-}
-
-static gboolean
-is_capslock_on (void)
-{
-        XkbStateRec states;
-        Display     *dsp;
-
-        dsp = GDK_DISPLAY ();
-
-        if (XkbGetState (dsp, XkbUseCoreKbd, &states) != Success) {
-              return FALSE;
-        }
-
-        return (states.locked_mods & LockMask) != 0;
-}
-
-static void
 set_busy (GdmGreeterLoginWindow *login_window)
 {
         GdkCursor *cursor;
@@ -1641,8 +1603,6 @@
         login_window->priv->auth_banner_label = glade_xml_get_widget (login_window->priv->xml, "auth-banner-label");
         /*make_label_small_italic (login_window->priv->auth_banner_label);*/
 
-        login_window->priv->auth_capslock_label = glade_xml_get_widget (login_window->priv->xml, "auth-capslock-label");
-
         button = glade_xml_get_widget (login_window->priv->xml, "suspend-button");
         g_signal_connect (button, "clicked", G_CALLBACK (suspend_button_clicked), login_window);
 
@@ -1680,7 +1640,6 @@
                                           GdkEventKey *event)
 {
         GdmGreeterLoginWindow *login_window;
-        gboolean               capslock_on;
 
         login_window = GDM_GREETER_LOGIN_WINDOW (widget);
 
@@ -1690,12 +1649,6 @@
                 }
         }
 
-        capslock_on = is_capslock_on ();
-
-        if (capslock_on != login_window->priv->caps_lock_on) {
-                capslock_update (login_window, capslock_on);
-        }
-
         return GTK_WIDGET_CLASS (gdm_greeter_login_window_parent_class)->key_press_event (widget, event);
 }
 

Modified: trunk/gui/simple-greeter/gdm-greeter-login-window.glade
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-login-window.glade	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-login-window.glade	Fri Oct 24 02:13:56 2008
@@ -30,9 +30,9 @@
         </child>
         <child>
           <widget class="GtkEventBox" id="computer-info-event-box">
-            <property name="visible-window">False</property>
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="visible_window">False</property>
             <child>
               <widget class="GtkNotebook" id="computer-info-notebook">
                 <property name="visible">True</property>
@@ -138,7 +138,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="invisible_char">â</property>
                         <property name="activates_default">True</property>
                       </widget>
                       <packing>
@@ -170,21 +169,6 @@
                     <property name="position">2</property>
                   </packing>
                 </child>
-                <child>
-                  <widget class="GtkHBox" id="auth-capslock-box">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkLabel" id="auth-capslock-label">
-                        <property name="visible">True</property>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
               </widget>
             </child>
           </widget>