[libgnomekbd] Reverted the patch for GtkStyleContext
- From: Sergey V. Udaltsov <svu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgnomekbd] Reverted the patch for GtkStyleContext
- Date: Mon, 29 Nov 2010 23:11:31 +0000 (UTC)
commit da8f2801633a4cc46dc0e97cd1731901d495ff69
Author: Sergey V. Udaltsov <svu gnome org>
Date: Mon Nov 29 23:08:57 2010 +0000
Reverted the patch for GtkStyleContext
The commit 29729d1d494d5c600e0f1c76c9a64979dc08959b depended on
non-master changes in gtk. A bit too early.
So, here is emergency release (otherwise 2.91.3 would not build)
NEWS | 4 ++++
configure.in | 2 +-
libgnomekbd/gkbd-keyboard-drawing.c | 13 +++++++++----
3 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/NEWS b/NEWS
index 5c97eea..c6599f4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+2.91.3.1:
+ The patch from dev branch of gtk was used in 2.91.3 -
+ so 2.91.3 was not buildable with gtk+ master. Reverted
+
2.91.3:
More changes related to GTK3.
Eliminated one crasher
diff --git a/configure.in b/configure.in
index 52e85b2..2a95f12 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
dnl ***************************************************************************
dnl *** configure.in for libgnomekbd ***
dnl ***************************************************************************
-AC_INIT(libgnomekbd, 2.91.3, [http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomekbd])
+AC_INIT(libgnomekbd, 2.91.3.1, [http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomekbd])
AC_PREREQ(2.59)
VERSION_INFO=7:0:0
diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
index 3b9a800..01d8281 100644
--- a/libgnomekbd/gkbd-keyboard-drawing.c
+++ b/libgnomekbd/gkbd-keyboard-drawing.c
@@ -1384,6 +1384,8 @@ static gboolean
draw (GtkWidget * widget,
cairo_t *cr, GkbdKeyboardDrawing * drawing)
{
+ GtkAllocation allocation;
+
if (!drawing->xkb)
return FALSE;
@@ -1394,10 +1396,13 @@ draw (GtkWidget * widget,
cairo_paint (cr);
if (gtk_widget_has_focus (widget)) {
- gtk_render_focus (gtk_widget_get_style_context (widget),
- cr, 0, 0,
- gtk_widget_get_allocated_width (widget),
- gtk_widget_get_allocated_height (widget));
+ gtk_widget_get_allocation (widget, &allocation);
+ gtk_paint_focus (gtk_widget_get_style (widget),
+ cr,
+ gtk_widget_get_state (widget),
+ widget, "keyboard-drawing",
+ 0, 0, allocation.width,
+ allocation.height);
}
return FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]