r50936 - in /desktop/unstable/libgnomekbd/debian: changelog patches/02-Remove-redundent-key-label-information.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Sep 20 22:17:23 2016
New Revision: 50936

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50936
Log:
New upstream release.

Modified:
    desktop/unstable/libgnomekbd/debian/changelog
    desktop/unstable/libgnomekbd/debian/patches/02-Remove-redundent-key-label-information.patch

Modified: desktop/unstable/libgnomekbd/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/changelog?rev=50936&op=diff
==============================================================================
--- desktop/unstable/libgnomekbd/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libgnomekbd/debian/changelog	[utf-8] Tue Sep 20 22:17:23 2016
@@ -1,4 +1,4 @@
-libgnomekbd (3.6.0-2) UNRELEASED; urgency=low
+libgnomekbd (3.22.0.1-1) UNRELEASED; urgency=low
 
   [ Jeremy Bicha ]
   * Update debian/rules for soname bump too
@@ -7,6 +7,9 @@
   [ James Leddy ]
   * debian/patches/02-Remove-redundent-key-label-information.patch:
     - Fix extra unnecessary key info in the keyboard layout widget
+
+  [ Michael Biebl ]
+  * New upstream release.
 
  -- Jeremy Bicha <jbicha at ubuntu.com>  Mon, 29 Jul 2013 20:02:22 -0400
 

Modified: desktop/unstable/libgnomekbd/debian/patches/02-Remove-redundent-key-label-information.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/patches/02-Remove-redundent-key-label-information.patch?rev=50936&op=diff
==============================================================================
--- desktop/unstable/libgnomekbd/debian/patches/02-Remove-redundent-key-label-information.patch	[utf-8] (original)
+++ desktop/unstable/libgnomekbd/debian/patches/02-Remove-redundent-key-label-information.patch	[utf-8] Tue Sep 20 22:17:23 2016
@@ -14,19 +14,19 @@
  libgnomekbd/gkbd-keyboard-drawing.c |    9 +++++++++
  1 file changed, 9 insertions(+)
 
-diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
-index 899df18..aefa730 100644
+Index: b/libgnomekbd/gkbd-keyboard-drawing.c
+===================================================================
 --- a/libgnomekbd/gkbd-keyboard-drawing.c
 +++ b/libgnomekbd/gkbd-keyboard-drawing.c
-@@ -999,6 +999,7 @@ draw_key_label (GkbdKeyboardDrawingRenderContext * context,
+@@ -999,6 +999,7 @@
  	gint x, y, width, height;
  	gint padding;
  	gint g, l, glp;
 +	KeySym left_sym = 0;
  
- 	if (!drawing->xkb)
+ 	if (!drawing->xkb || !drawing->groupLevels || keycode == INVALID_KEYCODE)
  		return;
-@@ -1041,11 +1042,15 @@ draw_key_label (GkbdKeyboardDrawingRenderContext * context,
+@@ -1041,11 +1042,15 @@
  						 XkbBuildCoreState
  						 (drawing->mods, g),
  						 &mods_rtrn, &keysym)) {
@@ -42,7 +42,7 @@
  				/* reverse y order */
  			}
  		} else {
-@@ -1054,10 +1059,14 @@ draw_key_label (GkbdKeyboardDrawingRenderContext * context,
+@@ -1054,10 +1059,14 @@
  			keysym =
  			    XkbKeySymEntry (drawing->xkb, keycode, l, g);
  
@@ -57,6 +57,3 @@
  			/* reverse y order */
  		}
  	}
--- 
-1.7.9.5
-