]> Pileus Git - ~andy/gtk/commitdiff
Show lock warning for num lock as well as caps lock
authorWilliam Jon McCann <jmccann@redhat.com>
Thu, 1 Jul 2010 22:52:13 +0000 (18:52 -0400)
committerWilliam Jon McCann <jmccann@redhat.com>
Fri, 2 Jul 2010 01:46:08 +0000 (21:46 -0400)
https://bugzilla.gnome.org/show_bug.cgi?id=623239

gtk/gtkentry.c

index 3c7aa25f9439b853a898103563a49ac35a5f3484..f0fd92c1db5ba301f81b35bbac5dafb57775c86d 100644 (file)
@@ -10016,7 +10016,12 @@ keymap_state_changed (GdkKeymap *keymap,
 
   if (gtk_entry_get_display_mode (entry) != DISPLAY_NORMAL && priv->caps_lock_warning)
     { 
-      if (gdk_keymap_get_caps_lock_state (keymap))
+      if (gdk_keymap_get_num_lock_state (keymap)
+          && gdk_keymap_get_caps_lock_state (keymap))
+        text = _("Caps Lock and Num Lock are on");
+      else if (gdk_keymap_get_num_lock_state (keymap))
+        text = _("Num Lock is on");
+      else if (gdk_keymap_get_caps_lock_state (keymap))
         text = _("Caps Lock is on");
     }