[gtk+/gtk-2-24-quartz] quartz: don't filter away directly encoded 24-bit UCS characters

[John Ralls <jralls src gnome org>]

commit a2a2ed5db8416c047f3bde0a650ed33dbeb38f5a
Author: Michael Natterer <mitch lanedo com>
Date:   Wed Sep 28 13:48:52 2011 +0200

    quartz: don't filter away directly encoded 24-bit UCS characters
    
    gdk_unicode_to_keyval(uc) returning (uc | 0x01000000) is not an
    error return value but simply the way to encode 24-bit unicode
    characters directly as keyvals.

 gdk/quartz/gdkkeys-quartz.c |   30 ++++++++++--------------------
 1 files changed, 10 insertions(+), 20 deletions(-)
---
diff --git a/gdk/quartz/gdkkeys-quartz.c b/gdk/quartz/gdkkeys-quartz.c
index 9fffc70..ea67588 100644
--- a/gdk/quartz/gdkkeys-quartz.c
+++ b/gdk/quartz/gdkkeys-quartz.c
@@ -336,18 +336,10 @@ maybe_update_keymap (void)
 			p[j] = GDK_ISO_Left_Tab;
 
 		      if (!found)
-                        {
-                          guint tmp;
-                          
-                          tmp = gdk_unicode_to_keyval (uc);
-                          if (tmp != (uc | 0x01000000))
-                            p[j] = tmp;
-                          else
-                            p[j] = 0;
-                        }
+                        p[j] = gdk_unicode_to_keyval (uc);
 		    }
 		}
-	      
+
 	      if (p[3] == p[2])
 		p[3] = 0;
 	      if (p[2] == p[1])
@@ -428,22 +420,20 @@ maybe_update_keymap (void)
 		      /* Special-case shift-tab since GTK+ expects
 		       * GDK_ISO_Left_Tab for that.
 		       */
+<<<<<<< HEAD
 		      if (found && p[j] == GDK_Tab && modifiers[j] == shiftKey)
 			p[j] = GDK_ISO_Left_Tab;
 		      
+=======
+		      if (found && p[j] == GDK_KEY_Tab && modifiers[j] == shiftKey)
+			p[j] = GDK_KEY_ISO_Left_Tab;
+
+>>>>>>> 0a13dea... quartz: don't filter away directly encoded 24-bit UCS characters
 		      if (!found)
-                        {
-                          guint tmp;
-                          
-                          tmp = gdk_unicode_to_keyval (uc);
-                          if (tmp != (uc | 0x01000000))
-                            p[j] = tmp;
-                          else
-                            p[j] = 0;
-                        }
+                        p[j] = gdk_unicode_to_keyval (uc);
 		    }
 		}
-	      
+
 	      if (p[3] == p[2])
 		p[3] = 0;
 	      if (p[2] == p[1])