summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-04-04 12:17:43 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-04-04 12:17:43 +0000
commit19c7601ea0a2631772029d2d2a022506e37e691c (patch)
treebdc5e7e584cb1d8dc6c09a9a773858a85c183014
parent9fda8f71205f8a71f9f0faf2fa9a538a2c1df43c (diff)
parent7807a6a7ee656b2cd702124cd227d2f1b8f39c96 (diff)
merge of '1550600acee1d36cd658420fd1cfaaa1e57c7127'
and 'b08044fef3b3cdf0bdd7f1a8b8c18363c0fb688f'
-rw-r--r--packages/gtk+/gtk+-2.6.10/gtk+-2.6.10-bg.patch20
-rw-r--r--packages/gtk+/gtk+_2.6.10.bb5
2 files changed, 23 insertions, 2 deletions
diff --git a/packages/gtk+/gtk+-2.6.10/gtk+-2.6.10-bg.patch b/packages/gtk+/gtk+-2.6.10/gtk+-2.6.10-bg.patch
new file mode 100644
index 0000000000..039440f933
--- /dev/null
+++ b/packages/gtk+/gtk+-2.6.10/gtk+-2.6.10-bg.patch
@@ -0,0 +1,20 @@
+diff -ur gtk+-2.8.20/gtk/gtkiconview.c gtk+-2.8.20-new/gtk/gtkiconview.c
+--- gtk+-2.8.20/gtk/gtkiconview.c 2006-04-11 20:44:15.000000000 +0200
++++ gtk+-2.8.20-new/gtk/gtkiconview.c 2007-01-03 20:20:26.000000000 +0100
+@@ -899,9 +899,14 @@
+ gdk_window_set_user_data (icon_view->priv->bin_window, widget);
+
+ widget->style = gtk_style_attach (widget->style, widget->window);
+- gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]);
++/* gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]);
+ gdk_window_set_background (widget->window, &widget->style->base[widget->state]);
+-
++*/
++printf("realize iconview\n");
++// gdk_window_set_back_pixmap(widget->window, NULL, FALSE);
++// gdk_window_set_back_pixmap(icon_view->priv->bin_window, NULL, FALSE);
++ gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
++ gtk_style_set_background (widget->style, icon_view->priv->bin_window, GTK_STATE_NORMAL);
+ gdk_window_show (icon_view->priv->bin_window);
+ }
+
diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb
index f3d36bcb52..c096bbe688 100644
--- a/packages/gtk+/gtk+_2.6.10.bb
+++ b/packages/gtk+/gtk+_2.6.10.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
LICENSE = "LGPL"
PRIORITY = "optional"
DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
-PR = "r8"
+PR = "r9"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
file://help.patch;patch=1 \
@@ -32,7 +32,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
file://gtk.keynav.gtksettings.patch;patch=1;pnum=0 \
file://gtk.keynav.gtktextview.patch;patch=1;pnum=0 \
file://gtk.keynav.gtktreeview.patch;patch=1;pnum=0 \
- file://gtk.keynav.gtkwidget.patch;patch=1;pnum=0"
+ file://gtk.keynav.gtkwidget.patch;patch=1;pnum=0 \
+ file://gtk+-2.6.10-bg.patch;patch=1"
inherit autotools pkgconfig