rpms/libgnomekbd/devel libgnomekbd-2.21.4-redraw.patch, NONE, 1.1 libgnomekbd.spec, 1.29, 1.30 libgnomekbd-0.1-werror.patch, 1.3, NONE libgnomekbd-2.17.2-redraw.patch, 1.1, NONE

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/libgnomekbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20901

Modified Files:
	libgnomekbd.spec 
Added Files:
	libgnomekbd-2.21.4-redraw.patch 
Removed Files:
	libgnomekbd-0.1-werror.patch libgnomekbd-2.17.2-redraw.patch 
Log Message:
2.21.4


libgnomekbd-2.21.4-redraw.patch:

--- NEW FILE libgnomekbd-2.21.4-redraw.patch ---
diff -up libgnomekbd-2.21.4/libgnomekbd/gkbd-keyboard-drawing.c.redraw libgnomekbd-2.21.4/libgnomekbd/gkbd-keyboard-drawing.c
--- libgnomekbd-2.21.4/libgnomekbd/gkbd-keyboard-drawing.c.redraw	2007-12-15 20:22:24.000000000 -0500
+++ libgnomekbd-2.21.4/libgnomekbd/gkbd-keyboard-drawing.c	2007-12-15 20:28:08.000000000 -0500
@@ -1229,6 +1229,26 @@ typedef struct {
 } DrawKeyboardItemData;
 
 static void
+redraw_overlapping_doodads (GkbdKeyboardDrawingRenderContext * context,
+                            GkbdKeyboardDrawing * drawing,
+                            GkbdKeyboardDrawingKey * key)
+{
+  GList *list;
+  gboolean do_draw = FALSE;
+
+  for (list = drawing->keyboard_items; list; list = list->next)
+    {
+      GkbdKeyboardDrawingItem * item = list->data;
+
+      if (do_draw && item->type == GKBD_KEYBOARD_DRAWING_ITEM_TYPE_DOODAD)
+       draw_doodad (context, drawing, (GkbdKeyboardDrawingDoodad *) item);
+
+      if (list->data == key)
+       do_draw = TRUE;
+    }
+}
+
+static void
 draw_keyboard_item (GkbdKeyboardDrawingItem * item,
 		    DrawKeyboardItemData *data)
 {
@@ -1463,6 +1483,7 @@ key_event (GtkWidget * widget,
 
 	create_cairo (drawing);
 	draw_key (drawing->renderContext, drawing, key);
+	redraw_overlapping_doodads (drawing->renderContext, drawing, key);
 	destroy_cairo (drawing);
 
 	invalidate_key_region (drawing, key);


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libgnomekbd.spec	13 Dec 2007 17:46:40 -0000	1.29
+++ libgnomekbd.spec	16 Dec 2007 01:30:18 -0000	1.30
@@ -7,10 +7,8 @@
 License:        LGPLv2+
 URL:            http://gswitchit.sourceforge.net
 Source0:        http://download.gnome.org/sources/libgnomekbd/2.21/libgnomekbd-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=365590
-Patch1:         libgnomekbd-0.1-werror.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=353163
-Patch5:         libgnomekbd-2.17.2-redraw.patch
+Patch0:         libgnomekbd-2.21.4-redraw.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,8 +52,7 @@
 
 %prep
 %setup -q
-#%patch1 -p1 -b .werror
-%patch5 -p1 -b .redraw
+%patch0 -p1 -b .redraw
 
 %build
 %configure --disable-static --enable-compile-warnings=no


--- libgnomekbd-0.1-werror.patch DELETED ---


--- libgnomekbd-2.17.2-redraw.patch DELETED ---