Dominique Leuenberger
1ec6175cc4
- Add patch gtk3-revert-kp_decimal_handling.patch: revert kp_decimal locale-based handling (already reverted upstream) (bgo#756751). OBS-URL: https://build.opensuse.org/request/show/359594 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=215
63 lines
1.5 KiB
Diff
63 lines
1.5 KiB
Diff
From 4eb333801b517c58b896d82dcd129768e76d0e0e Mon Sep 17 00:00:00 2001
|
|
From: Matthias Clasen <mclasen@redhat.com>
|
|
Date: Fri, 8 Jan 2016 08:59:02 -0500
|
|
Subject: [PATCH] Revert "Translate GDK_KEY_KP_Decimal according to locale"
|
|
|
|
This reverts commit 7c7fde136e1fd1197df1881a3bbd975c4cb1c01a.
|
|
|
|
Too much controversy for this minor improvement.
|
|
See https://bugzilla.gnome.org/show_bug.cgi?id=756751
|
|
---
|
|
gdk/gdkkeyuni.c | 21 ---------------------
|
|
1 file changed, 21 deletions(-)
|
|
|
|
diff --git a/gdk/gdkkeyuni.c b/gdk/gdkkeyuni.c
|
|
index ea28010..d770737 100644
|
|
--- a/gdk/gdkkeyuni.c
|
|
+++ b/gdk/gdkkeyuni.c
|
|
@@ -27,7 +27,6 @@
|
|
#include "gdkkeys.h"
|
|
#include "gdktypes.h"
|
|
|
|
-#include <locale.h>
|
|
|
|
/* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode
|
|
* mapping functions, from the xterm sources.
|
|
@@ -873,23 +872,6 @@ static const struct {
|
|
#endif
|
|
};
|
|
|
|
-static gunichar
|
|
-get_decimal_point (void)
|
|
-{
|
|
- struct lconv *locale_data;
|
|
- const gchar *decimal_point;
|
|
- gunichar ret;
|
|
-
|
|
- locale_data = localeconv ();
|
|
- decimal_point = locale_data->decimal_point;
|
|
-
|
|
- ret = g_utf8_get_char_validated (decimal_point, -1);
|
|
- if (ret != (gunichar)-2 && ret != (gunichar)-1)
|
|
- return ret;
|
|
-
|
|
- return (gunichar) '.';
|
|
-}
|
|
-
|
|
/**
|
|
* gdk_keyval_to_unicode:
|
|
* @keyval: a GDK key symbol
|
|
@@ -917,9 +899,6 @@ gdk_keyval_to_unicode (guint keyval)
|
|
if ((keyval & 0xff000000) == 0x01000000)
|
|
return keyval & 0x00ffffff;
|
|
|
|
- if (keyval == 0xffae)
|
|
- return (guint32) get_decimal_point ();
|
|
-
|
|
/* binary search in table */
|
|
while (max >= min) {
|
|
mid = (min + max) / 2;
|
|
--
|
|
2.6.2
|
|
|