gtk+ r20070 - in branches/gtk-2-12: . gdk/quartz

[rhult svn gnome org]

Author: rhult
Date: Sun May  4 15:09:20 2008
New Revision: 20070
URL: http://svn.gnome.org/viewvc/gtk+?rev=20070&view=rev

Log:
2008-05-04  Richard Hult  <richard imendio com>

	Merged from trunk:

	* gdk/quartz/gdkkeys-quartz.c (maybe_update_keymap): Remove stray
	semicolon after if statement. Fixes bug #530963, patch from Yevgen
	Muntyan.


Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gdk/quartz/gdkkeys-quartz.c

Modified: branches/gtk-2-12/gdk/quartz/gdkkeys-quartz.c
==============================================================================
--- branches/gtk-2-12/gdk/quartz/gdkkeys-quartz.c	(original)
+++ branches/gtk-2-12/gdk/quartz/gdkkeys-quartz.c	Sun May  4 15:09:20 2008
@@ -364,8 +364,8 @@
 	{
 	  p = keyval_array + known_numeric_keys[i].keycode * KEYVALS_PER_KEYCODE;
 
-	  if (p[0] == known_numeric_keys[i].normal_keyval);
-	      p[0] = known_numeric_keys[i].keypad_keyval;
+	  if (p[0] == known_numeric_keys[i].normal_keyval)
+            p[0] = known_numeric_keys[i].keypad_keyval;
 	}
       
       if (current_layout)
@@ -543,8 +543,8 @@
   if (state & GDK_LOCK_MASK)
     {
       guint upper = gdk_keyval_to_upper (tmp_keyval);
-	if (upper != tmp_keyval)
-	  tmp_keyval = upper;
+      if (upper != tmp_keyval)
+        tmp_keyval = upper;
     }
 
   return tmp_keyval;