summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorn Baayen <jorn@openedhand.com>2006-07-20 10:57:12 +0000
committerJorn Baayen <jorn@openedhand.com>2006-07-20 10:57:12 +0000
commit35fa11f1b5efea78225beb3c9b2e1c6e7ea240dc (patch)
treecd919db50bc0648cb9afdeff4271cfb0b63a7da5
parent36a71a9c620e4a9510725af3a9e731e6529f744c (diff)
downloadopenembedded-core-35fa11f1b5efea78225beb3c9b2e1c6e7ea240dc.tar.gz
openembedded-core-35fa11f1b5efea78225beb3c9b2e1c6e7ea240dc.tar.bz2
openembedded-core-35fa11f1b5efea78225beb3c9b2e1c6e7ea240dc.tar.xz
openembedded-core-35fa11f1b5efea78225beb3c9b2e1c6e7ea240dc.zip
Added GTK+ 2.10.0 + decairofication patches
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@519 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/automake-lossage.patch24
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/cellrenderer-cairo.patch32
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/disable-tooltips.patch11
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/entry-cairo.patch114
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/gtk+-handhelds.patch264
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/gtklabel-resize-patch10
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/gtktreeview-316689.patch25
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/hardcoded_libtool.patch29
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/menu-deactivate.patch50
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/no-demos.patch10
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/no-xwc.patch179
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/scroll-timings.patch15
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/single-click.patch36
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/small-gtkfilesel.patch267
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/spinbutton.patch128
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/style-cairo.patch2193
-rw-r--r--openembedded/packages/gtk+/gtk+-2.10.0/xsettings.patch16
-rw-r--r--openembedded/packages/gtk+/gtk+_2.10.0.bb89
18 files changed, 3492 insertions, 0 deletions
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/automake-lossage.patch b/openembedded/packages/gtk+/gtk+-2.10.0/automake-lossage.patch
new file mode 100644
index 000000000..0d423ddbb
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/automake-lossage.patch
@@ -0,0 +1,24 @@
+--- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100
++++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100
+@@ -52,21 +52,5 @@
+
+ dist-hook: html
+ cp -Rp $(srcdir)/html $(distdir)
+-else
+-html:
+- echo "***"
+- echo "*** Warning: Tutorial not built"
+- echo "***"
+-
+-pdf:
+- echo "***"
+- echo "*** Warning: Tutorial not built"
+- echo "***"
+-
+-dist-hook:
+- echo "***"
+- echo "*** Warning: Tutorial not built"
+- echo "*** DISTRIBUTION IS INCOMPLETE"
+- echo "***"
+ endif
+
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/cellrenderer-cairo.patch b/openembedded/packages/gtk+/gtk+-2.10.0/cellrenderer-cairo.patch
new file mode 100644
index 000000000..020f35bb8
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/cellrenderer-cairo.patch
@@ -0,0 +1,32 @@
+Index: gtkcellrenderer.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkcellrenderer.c,v
+retrieving revision 1.55
+diff -u -r1.55 gtk+-2.10.0/gtk/gtkcellrenderer.c
+--- gtk+-2.10.0/gtk/gtkcellrenderer.c 14 May 2006 04:25:28 -0000 1.55
++++ gtk+-2.10.0/gtk/gtkcellrenderer.c 30 Jun 2006 10:57:43 -0000
+@@ -551,6 +551,7 @@
+
+ if (cell->cell_background_set && !selected)
+ {
++#ifdef USE_CAIRO_INTERNALLY
+ cairo_t *cr = gdk_cairo_create (window);
+
+ gdk_cairo_rectangle (cr, background_area);
+@@ -558,6 +559,16 @@
+ cairo_fill (cr);
+
+ cairo_destroy (cr);
++#else
++ GdkGC *gc;
++
++ gc = gdk_gc_new (window);
++ gdk_gc_set_rgb_fg_color (gc, &priv->cell_background);
++ gdk_draw_rectangle (window, gc, TRUE,
++ background_area->x, background_area->y,
++ background_area->width, background_area->height);
++ g_object_unref (gc);
++#endif
+ }
+
+ GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell,
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/disable-tooltips.patch b/openembedded/packages/gtk+/gtk+-2.10.0/disable-tooltips.patch
new file mode 100644
index 000000000..d71d839c3
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/disable-tooltips.patch
@@ -0,0 +1,11 @@
+--- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100
++++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100
+@@ -118,7 +118,7 @@
+ tooltips->tips_data_list = NULL;
+
+ tooltips->delay = DEFAULT_DELAY;
+- tooltips->enabled = TRUE;
++ tooltips->enabled = FALSE;
+ tooltips->timer_tag = 0;
+ tooltips->use_sticky_delay = FALSE;
+ tooltips->last_popdown.tv_sec = -1;
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/entry-cairo.patch b/openembedded/packages/gtk+/gtk+-2.10.0/entry-cairo.patch
new file mode 100644
index 000000000..506b617d8
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/entry-cairo.patch
@@ -0,0 +1,114 @@
+Index: gtkentry.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
+retrieving revision 1.317
+diff -u -r1.317 gtk+-2.10.0/gtk/gtkentry.c
+--- gtk+-2.10.0/gtk/gtkentry.c 29 Jun 2006 09:18:05 -0000 1.317
++++ gtk+-2.10.0/gtk/gtkentry.c 2 Jul 2006 14:14:24 -0000
+@@ -3337,7 +3337,9 @@
+ if (GTK_WIDGET_DRAWABLE (entry))
+ {
+ PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE);
++#ifdef USE_CAIRO_INTERNALLY
+ cairo_t *cr;
++#endif
+ gint x, y;
+ gint start_pos, end_pos;
+
+@@ -3345,23 +3347,37 @@
+
+ get_layout_position (entry, &x, &y);
+
++#ifdef USE_CAIRO_INTERNALLY
+ cr = gdk_cairo_create (entry->text_area);
+
+ cairo_move_to (cr, x, y);
+ gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]);
+ pango_cairo_show_layout (cr, layout);
++#else
++ gdk_draw_layout (entry->text_area, widget->style->text_gc [widget->state],
++ x, y,
++ layout);
++#endif
+
+ if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos))
+ {
+ gint *ranges;
+ gint n_ranges, i;
+ PangoRectangle logical_rect;
+- GdkColor *selection_color, *text_color;
+ GtkBorder inner_border;
++#ifdef USE_CAIRO_INTERNALLY
++ GdkColor *selection_color, *text_color;
++#else
++ GdkGC *selection_gc, *text_gc;
++ GdkRegion *clip_region;
++#endif
+
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+ gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges);
+
++ get_inner_border (entry, &inner_border);
++
++#ifdef USE_CAIRO_INTERNALLY
+ if (GTK_WIDGET_HAS_FOCUS (entry))
+ {
+ selection_color = &widget->style->base [GTK_STATE_SELECTED];
+@@ -3373,8 +3389,6 @@
+ text_color = &widget->style->text [GTK_STATE_ACTIVE];
+ }
+
+- get_inner_border (entry, &inner_border);
+-
+ for (i = 0; i < n_ranges; ++i)
+ cairo_rectangle (cr,
+ inner_border.left - entry->scroll_offset + ranges[2 * i],
+@@ -3390,11 +3404,46 @@
+ cairo_move_to (cr, x, y);
+ gdk_cairo_set_source_color (cr, text_color);
+ pango_cairo_show_layout (cr, layout);
+-
++#else
++ if (GTK_WIDGET_HAS_FOCUS (entry))
++ {
++ selection_gc = widget->style->base_gc [GTK_STATE_SELECTED];
++ text_gc = widget->style->text_gc [GTK_STATE_SELECTED];
++ }
++ else
++ {
++ selection_gc = widget->style->base_gc [GTK_STATE_ACTIVE];
++ text_gc = widget->style->text_gc [GTK_STATE_ACTIVE];
++ }
++
++ clip_region = gdk_region_new ();
++ for (i = 0; i < n_ranges; ++i)
++ {
++ GdkRectangle rect;
++
++ rect.x = inner_border.left - entry->scroll_offset + ranges[2 * i];
++ rect.y = y;
++ rect.width = ranges[2 * i + 1];
++ rect.height = logical_rect.height;
++
++ gdk_draw_rectangle (entry->text_area, selection_gc, TRUE,
++ rect.x, rect.y, rect.width, rect.height);
++
++ gdk_region_union_with_rect (clip_region, &rect);
++ }
++
++ gdk_gc_set_clip_region (text_gc, clip_region);
++ gdk_draw_layout (entry->text_area, text_gc,
++ x, y,
++ layout);
++ gdk_gc_set_clip_region (text_gc, NULL);
++ gdk_region_destroy (clip_region);
++#endif
+ g_free (ranges);
+ }
+-
++#ifdef USE_CAIRO_INTERNALLY
+ cairo_destroy (cr);
++#endif
+ }
+ }
+
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/gtk+-handhelds.patch b/openembedded/packages/gtk+/gtk+-2.10.0/gtk+-handhelds.patch
new file mode 100644
index 000000000..4b97373f3
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/gtk+-handhelds.patch
@@ -0,0 +1,264 @@
+--- gtk+-2.8.6/gtk/gtkrange.c.orig 2005-12-07 21:13:33 +0100
++++ gtk+-2.8.6/gtk/gtkrange.c 2005-12-07 21:21:12 +0100
+@@ -186,6 +186,7 @@
+ static GtkWidgetClass *parent_class = NULL;
+ static guint signals[LAST_SIGNAL];
+
++static GdkAtom recognize_protocols_atom, atom_atom;
+
+ GType
+ gtk_range_get_type (void)
+@@ -226,6 +227,9 @@
+ object_class = (GtkObjectClass*) class;
+ widget_class = (GtkWidgetClass*) class;
+
++ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE);
++ atom_atom = gdk_atom_intern ("ATOM", FALSE);
++
+ parent_class = g_type_class_peek_parent (class);
+
+ gobject_class->set_property = gtk_range_set_property;
+@@ -860,6 +864,12 @@
+ &attributes, attributes_mask);
+ gdk_window_set_user_data (range->event_window, range);
+
++ gdk_property_change (range->event_window,
++ recognize_protocols_atom,
++ atom_atom,
++ 32, GDK_PROP_MODE_REPLACE,
++ NULL, 0);
++
+ widget->style = gtk_style_attach (widget->style, widget->window);
+ }
+
+@@ -1229,7 +1239,7 @@
+
+ /* ignore presses when we're already doing something else. */
+ if (range->layout->grab_location != MOUSE_OUTSIDE)
+- return FALSE;
++ return TRUE;
+
+ range->layout->mouse_x = event->x;
+ range->layout->mouse_y = event->y;
+@@ -1429,7 +1439,7 @@
+ return TRUE;
+ }
+
+- return FALSE;
++ return TRUE;
+ }
+
+ /**
+--- gtk+-2.8.6/gtk/gtkentry.c.orig 2005-09-02 21:51:06 +0200
++++ gtk+-2.8.6/gtk/gtkentry.c 2005-12-07 21:21:12 +0100
+@@ -597,6 +597,15 @@
+ 0.0,
+ GTK_PARAM_READWRITE));
+
++ gtk_widget_class_install_style_property (widget_class,
++ g_param_spec_int ("min_width",
++ _("Minimum width"),
++ _("Minimum width of the entry field"),
++ 0,
++ G_MAXINT,
++ MIN_ENTRY_WIDTH,
++ G_PARAM_READABLE));
++
+ signals[POPULATE_POPUP] =
+ g_signal_new ("populate_popup",
+ G_OBJECT_CLASS_TYPE (gobject_class),
+@@ -1227,7 +1236,7 @@
+ {
+ GtkEntry *entry = GTK_ENTRY (widget);
+ PangoFontMetrics *metrics;
+- gint xborder, yborder;
++ gint xborder, yborder, min_width;
+ PangoContext *context;
+
+ gtk_widget_ensure_style (widget);
+@@ -1243,9 +1252,11 @@
+
+ xborder += INNER_BORDER;
+ yborder += INNER_BORDER;
+-
++
++ gtk_widget_style_get (widget, "min_width", &min_width, NULL);
++
+ if (entry->width_chars < 0)
+- requisition->width = MIN_ENTRY_WIDTH + xborder * 2;
++ requisition->width = min_width + xborder * 2;
+ else
+ {
+ gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
+--- gtk+-2.8.6/gtk/gtkarrow.c.orig 2005-06-21 17:38:39 +0200
++++ gtk+-2.8.6/gtk/gtkarrow.c 2005-12-07 21:21:12 +0100
+@@ -31,7 +31,7 @@
+ #include "gtkintl.h"
+ #include "gtkalias.h"
+
+-#define MIN_ARROW_SIZE 15
++#define MIN_ARROW_SIZE 7
+
+ enum {
+ PROP_0,
+@@ -55,6 +55,8 @@
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
++static void gtk_arrow_size_request (GtkWidget *arrow,
++ GtkRequisition *requisition);
+
+ GType
+ gtk_arrow_get_type (void)
+@@ -113,6 +115,7 @@
+ GTK_PARAM_READWRITE));
+
+ widget_class->expose_event = gtk_arrow_expose;
++ widget_class->size_request = gtk_arrow_size_request;
+ }
+
+ static void
+@@ -168,13 +171,18 @@
+ }
+
+ static void
++gtk_arrow_size_request (GtkWidget *arrow,
++ GtkRequisition *requisition)
++{
++ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
++ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
++}
++
++static void
+ gtk_arrow_init (GtkArrow *arrow)
+ {
+ GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW);
+
+- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
+- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
+-
+ arrow->arrow_type = GTK_ARROW_RIGHT;
+ arrow->shadow_type = GTK_SHADOW_OUT;
+ }
+--- gtk+-2.8.6/gtk/gtkcalendar.c.orig 2005-12-07 21:36:14 +0100
++++ gtk+-2.8.6/gtk/gtkcalendar.c 2005-12-07 21:49:21 +0100
+@@ -692,6 +692,35 @@
+ ****************************************/
+
+ static void
++calendar_select_day (GtkCalendar *calendar, guint day)
++{
++ g_return_if_fail (GTK_IS_CALENDAR (calendar));
++ g_return_if_fail (day <= 31);
++
++ /* Deselect the old day */
++ if (calendar->selected_day > 0)
++ {
++ gint selected_day;
++
++ selected_day = calendar->selected_day;
++ calendar->selected_day = 0;
++ if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
++ calendar_invalidate_day_num (calendar, selected_day);
++ }
++
++ calendar->selected_day = day;
++
++ /* Select the new day */
++ if (day != 0)
++ {
++ if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
++ calendar_invalidate_day_num (calendar, day);
++ }
++
++ g_object_notify (G_OBJECT (calendar), "day");
++}
++
++static void
+ calendar_set_month_next (GtkCalendar *calendar)
+ {
+ gint month_len;
+@@ -723,10 +752,10 @@
+ if (month_len < calendar->selected_day)
+ {
+ calendar->selected_day = 0;
+- gtk_calendar_select_day (calendar, month_len);
++ calendar_select_day (calendar, month_len);
+ }
+ else
+- gtk_calendar_select_day (calendar, calendar->selected_day);
++ calendar_select_day (calendar, calendar->selected_day);
+
+ gtk_widget_queue_draw (GTK_WIDGET (calendar));
+ }
+@@ -752,10 +781,10 @@
+ if (month_len < calendar->selected_day)
+ {
+ calendar->selected_day = 0;
+- gtk_calendar_select_day (calendar, month_len);
++ calendar_select_day (calendar, month_len);
+ }
+ else
+- gtk_calendar_select_day (calendar, calendar->selected_day);
++ calendar_select_day (calendar, calendar->selected_day);
+
+ gtk_widget_queue_draw (GTK_WIDGET (calendar));
+ }
+@@ -784,10 +813,10 @@
+ if (month_len < calendar->selected_day)
+ {
+ calendar->selected_day = 0;
+- gtk_calendar_select_day (calendar, month_len);
++ calendar_select_day (calendar, month_len);
+ }
+ else
+- gtk_calendar_select_day (calendar, calendar->selected_day);
++ calendar_select_day (calendar, calendar->selected_day);
+
+ gtk_widget_queue_draw (GTK_WIDGET (calendar));
+ }
+@@ -1088,13 +1117,13 @@
+ if (month_len < calendar->selected_day)
+ {
+ calendar->selected_day = 0;
+- gtk_calendar_select_day (calendar, month_len);
++ calendar_select_day (calendar, month_len);
+ }
+ else
+ {
+ if (calendar->selected_day < 0)
+ calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
+- gtk_calendar_select_day (calendar, calendar->selected_day);
++ calendar_select_day (calendar, calendar->selected_day);
+ }
+
+ gtk_widget_queue_draw (GTK_WIDGET (calendar));
+@@ -3285,27 +3314,7 @@
+ g_return_if_fail (GTK_IS_CALENDAR (calendar));
+ g_return_if_fail (day <= 31);
+
+- /* Deselect the old day */
+- if (calendar->selected_day > 0)
+- {
+- gint selected_day;
+-
+- selected_day = calendar->selected_day;
+- calendar->selected_day = 0;
+- if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
+- calendar_invalidate_day_num (calendar, selected_day);
+- }
+-
+- calendar->selected_day = day;
+-
+- /* Select the new day */
+- if (day != 0)
+- {
+- if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
+- calendar_invalidate_day_num (calendar, day);
+- }
+-
+- g_object_notify (G_OBJECT (calendar), "day");
++ calendar_select_day (calendar, day);
+
+ g_signal_emit (calendar,
+ gtk_calendar_signals[DAY_SELECTED_SIGNAL],
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/gtklabel-resize-patch b/openembedded/packages/gtk+/gtk+-2.10.0/gtklabel-resize-patch
new file mode 100644
index 000000000..df2965634
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/gtklabel-resize-patch
@@ -0,0 +1,10 @@
+--- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100
++++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100
+@@ -1623,6 +1623,7 @@
+
+ /* We have to clear the layout, fonts etc. may have changed */
+ gtk_label_clear_layout (label);
++ gtk_widget_queue_resize (GTK_WIDGET (label));
+ }
+
+ static void
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/gtktreeview-316689.patch b/openembedded/packages/gtk+/gtk+-2.10.0/gtktreeview-316689.patch
new file mode 100644
index 000000000..4e77ddf9f
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/gtktreeview-316689.patch
@@ -0,0 +1,25 @@
+diff -u -p -r1.498 gtktreeview.c
+--- gtk+-2.8.9/gtk/gtktreeview.c 22 Oct 2005 21:08:23 -0000 1.498
++++ gtk+-2.8.9/gtk/gtktreeview.c 24 Oct 2005 22:30:27 -0000
+@@ -2098,6 +2098,9 @@ gtk_tree_view_size_allocate (GtkWidget
+ /* now the adjustments and window sizes are in sync, we can sync toprow/dy again */
+ if (tree_view->priv->height <= tree_view->priv->vadjustment->page_size)
+ gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0);
++ else if (tree_view->priv->vadjustment->value + tree_view->priv->vadjustment->page_size > tree_view->priv->height)
++ gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment),
++ tree_view->priv->height - tree_view->priv->vadjustment->page_size);
+ else if (gtk_tree_row_reference_valid (tree_view->priv->top_row))
+ gtk_tree_view_top_row_to_dy (tree_view);
+ else
+@ -5031,6 +5034,11 @@ validate_visible_area (GtkTreeView *tree
+ * else than zero. we update top_row to be in sync with dy = 0.
+ */
+ gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0);
++ gtk_tree_view_dy_to_top_row (tree_view);
++ }
++ else if (tree_view->priv->vadjustment->value + tree_view->priv->vadjustment->page_size > tree_view->priv->height)
++ {
++ gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), tree_view->priv->height - tree_view->priv->vadjustment->page_size);
+ gtk_tree_view_dy_to_top_row (tree_view);
+ }
+ else
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/hardcoded_libtool.patch b/openembedded/packages/gtk+/gtk+-2.10.0/hardcoded_libtool.patch
new file mode 100644
index 000000000..b2afddcc6
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/hardcoded_libtool.patch
@@ -0,0 +1,29 @@
+--- gtk+-2.6.0/configure.in.old 2005-01-01 16:23:45.000000000 +0000
++++ gtk+-2.6.0/configure.in 2005-01-01 16:24:03.000000000 +0000
+@@ -360,7 +360,7 @@
+ AC_MSG_CHECKING([Whether to write dependencies into .pc files])
+ case $enable_explicit_deps in
+ auto)
+- deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh`
++ deplib_check_method=`($host_alias-libtool --config; echo eval echo \\$deplib_check_method) | sh`
+ if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then
+ enable_explicit_deps=yes
+ else
+@@ -688,7 +688,7 @@
+ dnl Now we check to see if our libtool supports shared lib deps
+ dnl (in a rather ugly way even)
+ if $dynworks; then
+- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
++ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
+ pixbuf_deplibs_check=`$pixbuf_libtool_config | \
+ grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
+ sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
+@@ -1512,7 +1512,7 @@
+ #
+ # We are using gmodule-no-export now, but I'm leaving the stripping
+ # code in place for now, since pango and atk still require gmodule.
+-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ if test -n "$export_dynamic"; then
+ GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
+ GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/menu-deactivate.patch b/openembedded/packages/gtk+/gtk+-2.10.0/menu-deactivate.patch
new file mode 100644
index 000000000..29e665fbf
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/menu-deactivate.patch
@@ -0,0 +1,50 @@
+--- gtk+-2.4.4/gtk/gtkmenushell.c.old Thu Aug 26 23:45:28 2004
++++ gtk+-2.4.4/gtk/gtkmenushell.c Fri Aug 27 00:13:33 2004
+@@ -37,7 +37,7 @@
+ #include "gtktearoffmenuitem.h"
+ #include "gtkwindow.h"
+
+-#define MENU_SHELL_TIMEOUT 500
++#define MENU_SHELL_TIMEOUT 2000
+
+ enum {
+ DEACTIVATE,
+@@ -156,6 +156,7 @@
+ static GtkContainerClass *parent_class = NULL;
+ static guint menu_shell_signals[LAST_SIGNAL] = { 0 };
+
++static int last_crossing_time;
+
+ GType
+ gtk_menu_shell_get_type (void)
+@@ -418,6 +419,7 @@
+ gtk_grab_add (GTK_WIDGET (menu_shell));
+ menu_shell->have_grab = TRUE;
+ menu_shell->active = TRUE;
++ last_crossing_time = 0;
+ }
+ }
+
+@@ -545,6 +547,13 @@
+ menu_shell->activate_time = 0;
+ deactivate = FALSE;
+ }
++
++ if (last_crossing_time != 0
++ && ((event->time - last_crossing_time) < 500))
++ {
++ last_crossing_time = 0;
++ deactivate = FALSE;
++ }
+
+ if (deactivate)
+ {
+@@ -597,6 +606,8 @@
+ if (menu_shell->active)
+ {
+ menu_item = gtk_get_event_widget ((GdkEvent*) event);
++
++ last_crossing_time = event->time;
+
+ if (!menu_item ||
+ (GTK_IS_MENU_ITEM (menu_item) &&
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/no-demos.patch b/openembedded/packages/gtk+/gtk+-2.10.0/no-demos.patch
new file mode 100644
index 000000000..0145067ad
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/no-demos.patch
@@ -0,0 +1,10 @@
+--- gtk+-2.8.6/Makefile.am.orig 2005-12-07 21:30:56 +0100
++++ gtk+-2.8.6/Makefile.am 2005-12-07 21:31:10 +0100
+@@ -1,6 +1,6 @@
+ ## Makefile.am for GTK+
+
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+
+ # require automake 1.4
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/no-xwc.patch b/openembedded/packages/gtk+/gtk+-2.10.0/no-xwc.patch
new file mode 100644
index 000000000..318b15035
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/no-xwc.patch
@@ -0,0 +1,179 @@
+Index: configure.in
+===================================================================
+RCS file: /cvs/gnome/gtk+/configure.in,v
+retrieving revision 1.469.2.22
+diff -u -r1.469.2.22 configure.in
+--- gtk/configure.in 16 Mar 2006 16:39:45 -0000 1.469.2.22
++++ gtk/configure.in 20 Mar 2006 12:07:11 -0000
+@@ -1115,6 +1115,8 @@
+
+ AC_CHECK_FUNCS(XConvertCase XInternAtoms)
+
++ AC_CHECK_FUNCS(XmbDrawString)
++
+ # Generic X11R6 check needed for XIM support; we could
+ # probably use this to replace the above, but we'll
+ # leave the separate checks for XConvertCase and XInternAtoms
+Index: gdk/x11/gdkdrawable-x11.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gdk/x11/gdkdrawable-x11.c,v
+retrieving revision 1.58
+diff -u -r1.58 gdkdrawable-x11.c
+--- gtk/gdk/x11/gdkdrawable-x11.c 15 Aug 2005 19:04:54 -0000 1.58
++++ gtk/gdk/x11/gdkdrawable-x11.c 20 Mar 2006 12:07:12 -0000
+@@ -579,12 +579,14 @@
+ GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
+ }
+ }
++#ifdef HAVE_XMBDRAWSTRING
+ else if (font->type == GDK_FONT_FONTSET)
+ {
+ XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
+ XmbDrawString (xdisplay, impl->xid,
+ fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
+ }
++#endif
+ else
+ g_error("undefined font type\n");
+ }
+@@ -616,6 +618,7 @@
+ GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
+ g_free (text_8bit);
+ }
++#ifdef HAVE_XMBDRAWSTRING
+ else if (font->type == GDK_FONT_FONTSET)
+ {
+ if (sizeof(GdkWChar) == sizeof(wchar_t))
+@@ -636,6 +639,7 @@
+ g_free (text_wchar);
+ }
+ }
++#endif
+ else
+ g_error("undefined font type\n");
+ }
+Index: gdk/x11/gdkfont-x11.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gdk/x11/gdkfont-x11.c,v
+retrieving revision 1.48.2.1
+diff -u -r1.48.2.1 gdkfont-x11.c
+--- gtk/gdk/x11/gdkfont-x11.c 20 Jan 2006 04:39:43 -0000 1.48.2.1
++++ gtk/gdk/x11/gdkfont-x11.c 20 Mar 2006 12:07:12 -0000
+@@ -527,10 +527,12 @@
+ width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
+ }
+ break;
++#ifdef HAVE_XMBDRAWSTRING
+ case GDK_FONT_FONTSET:
+ fontset = (XFontSet) private->xfont;
+ width = XmbTextEscapement (fontset, text, text_length);
+ break;
++#endif
+ default:
+ width = 0;
+ }
+@@ -580,6 +582,7 @@
+ width = 0;
+ }
+ break;
++#ifdef HAVE_XMBDRAWSTRING
+ case GDK_FONT_FONTSET:
+ if (sizeof(GdkWChar) == sizeof(wchar_t))
+ {
+@@ -597,6 +600,7 @@
+ g_free (text_wchar);
+ }
+ break;
++#endif
+ default:
+ width = 0;
+ }
+@@ -669,6 +673,7 @@
+ if (descent)
+ *descent = overall.descent;
+ break;
++#ifdef HAVE_XMBDRAWSTRING
+ case GDK_FONT_FONTSET:
+ fontset = (XFontSet) private->xfont;
+ XmbTextExtents (fontset, text, text_length, &ink, &logical);
+@@ -683,6 +688,7 @@
+ if (descent)
+ *descent = ink.y + ink.height;
+ break;
++#endif
+ }
+
+ }
+@@ -755,6 +761,7 @@
+ *descent = overall.descent;
+ break;
+ }
++#ifdef HAVE_XMBDRAWSTRING
+ case GDK_FONT_FONTSET:
+ fontset = (XFontSet) private->xfont;
+
+@@ -782,6 +789,7 @@
+ if (descent)
+ *descent = ink.y + ink.height;
+ break;
++#endif
+ }
+
+ }
+Index: gdk/x11/gdkim-x11.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gdk/x11/gdkim-x11.c,v
+retrieving revision 1.38
+diff -u -r1.38 gdkim-x11.c
+--- gtk/gdk/x11/gdkim-x11.c 16 Mar 2005 03:17:27 -0000 1.38
++++ gtk/gdk/x11/gdkim-x11.c 20 Mar 2006 12:07:12 -0000
+@@ -48,6 +48,7 @@
+ void
+ _gdk_x11_initialize_locale (void)
+ {
++#ifdef HAVE_XMBDRAWSTRING
+ wchar_t result;
+ gchar *current_locale;
+ static char *last_locale = NULL;
+@@ -93,7 +94,8 @@
+ GDK_NOTE (XIM,
+ g_message ("%s multi-byte string functions.",
+ gdk_use_mb ? "Using" : "Not using"));
+-
++#endif
++
+ return;
+ }
+
+@@ -136,6 +138,7 @@
+ {
+ gchar *mbstr;
+
++#ifdef HAVE_XMBDRAWSTRING
+ if (gdk_use_mb)
+ {
+ GdkDisplay *display = find_a_display ();
+@@ -178,6 +181,7 @@
+ XFree (tpr.value);
+ }
+ else
++#endif
+ {
+ gint length = 0;
+ gint i;
+@@ -210,6 +214,7 @@
+ gint
+ gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
+ {
++#ifdef HAVE_XMBDRAWSTRING
+ if (gdk_use_mb)
+ {
+ GdkDisplay *display = find_a_display ();
+@@ -242,6 +247,7 @@
+ return len_cpy;
+ }
+ else
++#endif
+ {
+ gint i;
+
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/scroll-timings.patch b/openembedded/packages/gtk+/gtk+-2.10.0/scroll-timings.patch
new file mode 100644
index 000000000..a38b21dcc
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/scroll-timings.patch
@@ -0,0 +1,15 @@
+--- gtk+-2.4.4/gtk/gtkrange.c~ 2004-08-23 01:50:22.000000000 +0100
++++ gtk+-2.4.4/gtk/gtkrange.c 2004-08-27 15:48:49.000000000 +0100
+@@ -35,9 +35,9 @@
+ #include "gtkintl.h"
+ #include "gtkscrollbar.h"
+
+-#define SCROLL_INITIAL_DELAY 250 /* must hold button this long before ... */
+-#define SCROLL_LATER_DELAY 100 /* ... it starts repeating at this rate */
+-#define UPDATE_DELAY 300 /* Delay for queued update */
++#define SCROLL_INITIAL_DELAY 500 /* must hold button this long before ... */
++#define SCROLL_LATER_DELAY 200 /* ... it starts repeating at this rate */
++#define UPDATE_DELAY 1000 /* Delay for queued update */
+
+ enum {
+ PROP_0,
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/single-click.patch b/openembedded/packages/gtk+/gtk+-2.10.0/single-click.patch
new file mode 100644
index 000000000..1bf0db12a
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/single-click.patch
@@ -0,0 +1,36 @@
+--- gtk+-2.8.6/gtk/gtkfilesel.c.orig 2005-12-07 21:13:33 +0100
++++ gtk+-2.8.6/gtk/gtkfilesel.c 2005-12-07 21:14:56 +0100
+@@ -2461,6 +2461,33 @@
+ if (fs->last_selected != NULL)
+ g_free (fs->last_selected);
+
++ // Single-click directory entry
++ if (new_names->len == 1)
++ {
++ GtkTreeView *tree_view;
++ GtkTreeModel *model;
++ GtkTreePath *path;
++ GtkTreeIter iter;
++ gboolean is_file;
++
++ tree_view = gtk_tree_selection_get_tree_view (selection);
++
++ if (gtk_tree_selection_get_selected (selection, &model, &iter))
++ {
++ path = gtk_tree_model_get_path (model, &iter);
++ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
++
++ if (!is_file)
++ {
++ gtk_file_selection_dir_activate (tree_view, path,
++ gtk_tree_view_get_column (tree_view, DIR_COLUMN),
++ user_data);
++ }
++
++ gtk_tree_path_free (path);
++ }
++ }
++
+ fs->last_selected = g_strdup (g_ptr_array_index (new_names, index));
+ filename = get_real_filename (fs->last_selected, FALSE);
+
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/small-gtkfilesel.patch b/openembedded/packages/gtk+/gtk+-2.10.0/small-gtkfilesel.patch
new file mode 100644
index 000000000..20bf4cf36
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/small-gtkfilesel.patch
@@ -0,0 +1,267 @@
+diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c
+--- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100
++++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100
+@@ -68,6 +68,7 @@
+ #include "gtkprivate.h"
+ #include "gtkscrolledwindow.h"
+ #include "gtkstock.h"
++#include "gtksignal.h"
+ #include "gtktreeselection.h"
+ #include "gtktreeview.h"
+ #include "gtkvbox.h"
+@@ -77,6 +78,7 @@
+ #include "gtkmessagedialog.h"
+ #include "gtkdnd.h"
+ #include "gtkeventbox.h"
++#include "gtkimage.h"
+
+ #undef GTK_DISABLE_DEPRECATED
+ #include "gtkoptionmenu.h"
+@@ -245,7 +247,8 @@
+ };
+
+ enum {
+- DIR_COLUMN
++ DIR_COLUMN,
++ ISFILE_COLUMN
+ };
+
+ enum {
+@@ -400,6 +403,12 @@
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ gpointer user_data);
++
++static void gtk_file_selection_activate (GtkTreeView *tree_view,
++ GtkTreePath *path,
++ GtkTreeViewColumn *column,
++ gpointer user_data);
++
+ static void gtk_file_selection_file_changed (GtkTreeSelection *selection,
+ gpointer user_data);
+ static void gtk_file_selection_dir_activate (GtkTreeView *tree_view,
+@@ -419,6 +428,7 @@
+ static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data);
+ static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data);
+ static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data);
++static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style);
+
+ static void free_selected_names (GPtrArray *names);
+
+@@ -578,6 +588,23 @@
+ G_PARAM_WRITABLE));
+ object_class->destroy = gtk_file_selection_destroy;
+ widget_class->map = gtk_file_selection_map;
++ widget_class->style_set = gtk_file_selection_style_set;
++
++ gtk_widget_class_install_style_property (widget_class,
++ g_param_spec_boolean ("show_fileops_default",
++ _("Show fileop buttons by default"),
++ _("Whether file operation buttons are shown by default"),
++ TRUE,
++ G_PARAM_READABLE));
++
++ gtk_widget_class_install_style_property (widget_class,
++ g_param_spec_int ("border_width",
++ _("Border width"),
++ _("Width of border around the main dialog area"),
++ 0,
++ G_MAXINT,
++ 10,
++ G_PARAM_READABLE));
+ }
+
+ static void gtk_file_selection_set_property (GObject *object,
+@@ -649,7 +676,29 @@
+ gtk_widget_grab_default (widget);
+ return FALSE;
+ }
+-
++
++static void
++gtk_file_selection_style_set (GtkWidget *filesel,
++ GtkStyle *prev_style)
++{
++ gboolean show_fileops;
++ gint border_width;
++
++ gtk_widget_style_get (filesel,
++ "show_fileops_default",
++ &show_fileops,
++ "border_width",
++ &border_width,
++ NULL);
++
++ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width);
++
++ if (show_fileops)
++ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel));
++ else
++ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel));
++}
++
+ static void
+ gtk_file_selection_init (GtkFileSelection *filesel)
+ {
+@@ -674,17 +723,15 @@
+
+ /* The dialog-sized vertical box */
+ filesel->main_vbox = dialog->vbox;
+- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10);
+
+ /* The horizontal box containing create, rename etc. buttons */
+ filesel->button_area = gtk_hbutton_box_new ();
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START);
+- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0);
+ gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area,
+ FALSE, FALSE, 0);
+ gtk_widget_show (filesel->button_area);
+
+- gtk_file_selection_show_fileop_buttons (filesel);
++ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL);
+
+ /* hbox for pulldown menu */
+ pulldown_hbox = gtk_hbox_new (TRUE, 5);
+@@ -723,25 +770,32 @@
+
+ /* The directories list */
+
+- model = gtk_list_store_new (1, G_TYPE_STRING);
++ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */
+ filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
+ g_object_unref (model);
+
+- column = gtk_tree_view_column_new_with_attributes (_("Folders"),
++ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL,
+ gtk_cell_renderer_text_new (),
+ "text", DIR_COLUMN,
+ NULL);
+ label = gtk_label_new_with_mnemonic (_("Fol_ders"));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list);
+ gtk_widget_show (label);
+- gtk_tree_view_column_set_widget (column, label);
++
++ /* gtk_tree_view_column_set_widget (column, label); */
++ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE);
++
+ gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column);
+
+ gtk_widget_set_size_request (filesel->dir_list,
+ DIR_LIST_WIDTH, DIR_LIST_HEIGHT);
+ g_signal_connect (filesel->dir_list, "row_activated",
+- G_CALLBACK (gtk_file_selection_dir_activate), filesel);
++ G_CALLBACK (gtk_file_selection_activate), filesel);
++
++ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed",
++ G_CALLBACK (gtk_file_selection_file_changed), filesel);
++
+
+ /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */
+
+@@ -758,41 +812,6 @@
+ gtk_widget_show (filesel->dir_list);
+ gtk_widget_show (scrolled_win);
+
+- /* The files list */
+- model = gtk_list_store_new (1, G_TYPE_STRING);
+- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
+- g_object_unref (model);
+-
+- column = gtk_tree_view_column_new_with_attributes (_("Files"),
+- gtk_cell_renderer_text_new (),
+- "text", FILE_COLUMN,
+- NULL);
+- label = gtk_label_new_with_mnemonic (_("_Files"));
+- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list);
+- gtk_widget_show (label);
+- gtk_tree_view_column_set_widget (column, label);
+- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column);
+-
+- gtk_widget_set_size_request (filesel->file_list,
+- FILE_LIST_WIDTH, FILE_LIST_HEIGHT);
+- g_signal_connect (filesel->file_list, "row_activated",
+- G_CALLBACK (gtk_file_selection_file_activate), filesel);
+- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed",
+- G_CALLBACK (gtk_file_selection_file_changed), filesel);
+-
+- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */
+-
+- scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN);
+- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list);
+- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0);
+- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win);
+- gtk_widget_show (filesel->file_list);
+- gtk_widget_show (scrolled_win);
+-
+ /* action area for packing buttons into. */
+ filesel->action_area = gtk_hbox_new (TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area,
+@@ -2008,6 +2027,23 @@
+ }
+
+ static void
++gtk_file_selection_activate (GtkTreeView *tree_view,
++ GtkTreePath *path,
++ GtkTreeViewColumn *column,
++ gpointer user_data)
++{
++ GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
++ GtkTreeIter iter;
++ gboolean is_file;
++
++ gtk_tree_model_get_iter (model, &iter, path);
++ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
++
++ if (! is_file)
++ gtk_file_selection_dir_activate (tree_view, path, column, user_data);
++}
++
++static void
+ gtk_file_selection_file_activate (GtkTreeView *tree_view,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+@@ -2103,7 +2139,6 @@
+ PossibleCompletion* poss;
+ GtkTreeIter iter;
+ GtkListStore *dir_model;
+- GtkListStore *file_model;
+ gchar* filename;
+ gchar* rem_path = rel_path;
+ gchar* sel_text;
+@@ -2125,10 +2160,8 @@
+ g_assert (cmpl_state->reference_dir);
+
+ dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list)));
+- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list)));
+
+ gtk_list_store_clear (dir_model);
+- gtk_list_store_clear (file_model);
+
+ /* Set the dir list to include ./ and ../ */
+ gtk_list_store_append (dir_model, &iter);
+@@ -2150,13 +2183,17 @@
+ strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0)
+ {
+ gtk_list_store_append (dir_model, &iter);
+- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1);
++ gtk_list_store_set (dir_model, &iter,
++ DIR_COLUMN, filename,
++ ISFILE_COLUMN, FALSE, -1);
+ }
+ }
+ else
+ {
+- gtk_list_store_append (file_model, &iter);
+- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1);
++ gtk_list_store_append (dir_model, &iter);
++ gtk_list_store_set (dir_model, &iter,
++ DIR_COLUMN, filename,
++ ISFILE_COLUMN, TRUE, -1);
+ }
+ }
+
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/spinbutton.patch b/openembedded/packages/gtk+/gtk+-2.10.0/spinbutton.patch
new file mode 100644
index 000000000..8ad7507af
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/spinbutton.patch
@@ -0,0 +1,128 @@
+--- gtk+-2.4.3/gtk/gtkspinbutton.c.old 2004-04-22 14:49:27.000000000 +0100
++++ gtk+-2.4.3/gtk/gtkspinbutton.c 2004-06-30 21:48:18.000000000 +0100
+@@ -733,7 +733,7 @@
+
+ spin = GTK_SPIN_BUTTON (widget);
+ arrow_size = spin_button_get_arrow_size (spin);
+- panel_width = arrow_size + 2 * widget->style->xthickness;
++ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness;
+
+ widget->allocation = *allocation;
+
+@@ -866,19 +866,16 @@
+ {
+ width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness;
+
++ y = widget->style->ythickness;
++ height = widget->requisition.height - (2 * y);
++
+ if (arrow_type == GTK_ARROW_UP)
+ {
+ x = 0;
+- y = 0;
+-
+- height = widget->requisition.height / 2;
+ }
+ else
+ {
+- x = 0;
+- y = widget->requisition.height / 2;
+-
+- height = (widget->requisition.height + 1) / 2;
++ x = width;
+ }
+
+ if (spin_button_at_limit (spin_button, arrow_type))
+@@ -908,32 +905,17 @@
+ shadow_type = GTK_SHADOW_OUT;
+ }
+ }
+-
++
+ gtk_paint_box (widget->style, spin_button->panel,
+ state_type, shadow_type,
+ NULL, widget,
+- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down",
++ NULL,
+ x, y, width, height);
+
+ height = widget->requisition.height;
+
+- if (arrow_type == GTK_ARROW_DOWN)
+- {
+- y = height / 2;
+- height = height - y - 2;
+- }
+- else
+- {
+- y = 2;
+- height = height / 2 - 2;
+- }
+-
+ width -= 3;
+-
+- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+- x = 2;
+- else
+- x = 1;
++ height -= 3;
+
+ w = width / 2;
+ w -= w % 2 - 1; /* force odd */
+@@ -1108,7 +1090,7 @@
+ if (GTK_ENTRY (widget)->editable)
+ gtk_spin_button_update (spin);
+
+- if (event->y <= widget->requisition.height / 2)
++ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness))
+ {
+ if (event->button == 1)
+ start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment);
+@@ -1143,44 +1125,11 @@
+
+ arrow_size = spin_button_get_arrow_size (spin);
+
+- if (event->button == spin->button)
+- {
+- int click_child = spin->click_child;
++ gtk_spin_button_stop_spinning (spin);
+
+- gtk_spin_button_stop_spinning (spin);
+-
+- if (event->button == 3)
+- {
+- if (event->y >= 0 && event->x >= 0 &&
+- event->y <= widget->requisition.height &&
+- event->x <= arrow_size + 2 * widget->style->xthickness)
+- {
+- if (click_child == GTK_ARROW_UP &&
+- event->y <= widget->requisition.height / 2)
+- {
+- gdouble diff;
+-
+- diff = spin->adjustment->upper - spin->adjustment->value;
+- if (diff > EPSILON)
+- gtk_spin_button_real_spin (spin, diff);
+- }
+- else if (click_child == GTK_ARROW_DOWN &&
+- event->y > widget->requisition.height / 2)
+- {
+- gdouble diff;
+-
+- diff = spin->adjustment->value - spin->adjustment->lower;
+- if (diff > EPSILON)
+- gtk_spin_button_real_spin (spin, -diff);
+- }
+- }
+- }
+- spin_button_redraw (spin);
++ spin_button_redraw (spin);
+
+- return TRUE;
+- }
+- else
+- return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
++ return TRUE;
+ }
+
+ static gint
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/style-cairo.patch b/openembedded/packages/gtk+/gtk+-2.10.0/style-cairo.patch
new file mode 100644
index 000000000..197b0a8f4
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/style-cairo.patch
@@ -0,0 +1,2193 @@
+Index: gtkstyle.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkstyle.c,v
+retrieving revision 1.193
+diff -u -r1.193 gtk+-2.10.0/gtk/gtkstyle.c
+--- gtk+-2.10.0/gtk/gtkstyle.c 28 May 2006 12:56:26 -0000 1.193
++++ gtk+-2.10.0/gtk/gtkstyle.c 2 Jul 2006 14:15:15 -0000
+@@ -37,7 +37,6 @@
+ #include "gtkthemes.h"
+ #include "gtkiconfactory.h"
+ #include "gtksettings.h" /* _gtk_settings_parse_convert() */
+-#include "gtkintl.h"
+ #include "gtkalias.h"
+
+ #define LIGHTNESS_MULT 1.3
+@@ -59,6 +58,8 @@
+ };
+
+ /* --- prototypes --- */
++static void gtk_style_init (GtkStyle *style);
++static void gtk_style_class_init (GtkStyleClass *klass);
+ static void gtk_style_finalize (GObject *object);
+ static void gtk_style_realize (GtkStyle *style,
+ GdkColormap *colormap);
+@@ -311,6 +312,9 @@
+ gint width,
+ gint height);
+
++void _gtk_style_shade (GdkColor *a,
++ GdkColor *b,
++ gdouble k);
+ static void rgb_to_hls (gdouble *r,
+ gdouble *g,
+ gdouble *b);
+@@ -329,6 +333,128 @@
+ static const GtkRequisition default_option_indicator_size = { 7, 13 };
+ static const GtkBorder default_option_indicator_spacing = { 7, 5, 2, 2 };
+
++#define INDICATOR_PART_SIZE 13
++
++typedef enum {
++ CHECK_AA,
++ CHECK_BASE,
++ CHECK_BLACK,
++ CHECK_DARK,
++ CHECK_LIGHT,
++ CHECK_MID,
++ CHECK_TEXT,
++ CHECK_INCONSISTENT_TEXT,
++ RADIO_BASE,
++ RADIO_BLACK,
++ RADIO_DARK,
++ RADIO_LIGHT,
++ RADIO_MID,
++ RADIO_TEXT,
++ RADIO_INCONSISTENT_AA,
++ RADIO_INCONSISTENT_TEXT
++} IndicatorPart;
++
++/*
++ * Extracted from check-13.png, width=13, height=13
++ */
++static const guchar check_black_bits[] = {
++ 0x00,0x00,0xfe,0x0f,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,
++ 0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00};
++static const guchar check_dark_bits[] = {
++ 0xff,0x1f,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,
++ 0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x00,0x00};
++static const guchar check_mid_bits[] = {
++ 0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,
++ 0x08,0x00,0x08,0x00,0x08,0x00,0x08,0xfc,0x0f,0x00,0x00,0x00,0x00};
++static const guchar check_light_bits[] = {
++ 0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,
++ 0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0xfe,0x1f,0x00,0x00};
++static const guchar check_text_bits[] = {
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x03,0x80,0x01,0x80,0x00,0x58,
++ 0x00,0x60,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
++static const guchar check_aa_bits[] = {
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x58,0x00,0xa0,
++ 0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
++static const guchar check_base_bits[] = {
++ 0x00,0x00,0x00,0x00,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,
++ 0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0x00,0x00,0x00,0x00,0x00,0x00};
++
++/*
++ * Extracted from check-13-inconsistent.png, width=13, height=13
++ */
++static const guchar check_inconsistent_text_bits[] = {
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0xf8,
++ 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
++#if 0
++/*
++ * check_inconsistent_aa_bits is currently not used, since it is all zeros.
++ */
++static const guchar check_inconsistent_aa_bits[] = {
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
++#endif
++
++/*
++ * Extracted from radio-13.png, width=13, height=13
++ */
++static const guchar radio_black_bits[] = {
++ 0x00,0x00,0xf0,0x01,0x0c,0x02,0x04,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,
++ 0x00,0x02,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0d,0x08};
++static const guchar radio_dark_bits[] = {
++ 0xf0,0x00,0x0c,0x02,0x02,0x04,0x02,0x04,0x01,0x08,0x01,0x08,0x01,0x08,0x01,
++ 0x08,0x00,0x08,0x02,0x04,0x0c,0x06,0xf0,0x01,0x00,0x00,0x00,0x00};
++static const guchar radio_mid_bits[] = {
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
++static const guchar radio_light_bits[] = {
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,
++ 0x10,0x00,0x10,0x00,0x08,0x00,0x08,0x00,0x06,0xe0,0x01,0x00,0x00};
++static const guchar radio_text_bits[] = {
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x00,0xf0,0x01,0xf0,0x01,0xf0,
++ 0x01,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
++#if 0
++/*
++ * radio_aa_bits is currently not used, since it is all zeros.
++ */
++static const guchar radio_aa_bits[] = {
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
++#endif
++static const guchar radio_base_bits[] = {
++ 0x00,0x00,0x00,0x00,0xf0,0x01,0xf8,0x03,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,
++ 0x07,0xfc,0x07,0xf8,0x03,0xf0,0x01,0x00,0x00,0x00,0x00,0x00,0x00};
++
++/*
++ * Extracted from radio-13.png, width=13, height=13
++ */
++static const guchar radio_inconsistent_text_bits[] = {
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
++static const guchar radio_inconsistent_aa_bits[] = {
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0x00,0x00,0xf8,
++ 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
++
++static struct {
++ const guchar *bits;
++ GList *bmap_list; /* list of GdkBitmap */
++} indicator_parts[] = {
++ { check_aa_bits, NULL },
++ { check_base_bits, NULL },
++ { check_black_bits, NULL },
++ { check_dark_bits, NULL },
++ { check_light_bits, NULL },
++ { check_mid_bits, NULL },
++ { check_text_bits, NULL },
++ { check_inconsistent_text_bits, NULL },
++ { radio_base_bits, NULL },
++ { radio_black_bits, NULL },
++ { radio_dark_bits, NULL },
++ { radio_light_bits, NULL },
++ { radio_mid_bits, NULL },
++ { radio_text_bits, NULL },
++ { radio_inconsistent_aa_bits, NULL },
++ { radio_inconsistent_text_bits, NULL },
++};
+ #define GTK_GRAY 0xdcdc, 0xdada, 0xd5d5
+ #define GTK_DARK_GRAY 0xc4c4, 0xc2c2, 0xbdbd
+ #define GTK_LIGHT_GRAY 0xeeee, 0xebeb, 0xe7e7
+@@ -353,13 +479,39 @@
+ static const GdkColor gtk_default_selected_base = { 0, GTK_BLUE };
+ static const GdkColor gtk_default_active_base = { 0, GTK_VERY_DARK_GRAY };
+
++static gpointer parent_class = NULL;
++
+ /* --- signals --- */
+ static guint realize_signal = 0;
+ static guint unrealize_signal = 0;
+
+-G_DEFINE_TYPE (GtkStyle, gtk_style, G_TYPE_OBJECT)
+-
+ /* --- functions --- */
++GType
++gtk_style_get_type (void)
++{
++ static GType style_type = 0;
++
++ if (!style_type)
++ {
++ static const GTypeInfo style_info =
++ {
++ sizeof (GtkStyleClass),
++ (GBaseInitFunc) NULL,
++ (GBaseFinalizeFunc) NULL,
++ (GClassInitFunc) gtk_style_class_init,
++ NULL, /* class_finalize */
++ NULL, /* class_data */
++ sizeof (GtkStyle),
++ 0, /* n_preallocs */
++ (GInstanceInitFunc) gtk_style_init,
++ };
++
++ style_type = g_type_register_static (G_TYPE_OBJECT, "GtkStyle",
++ &style_info, 0);
++ }
++
++ return style_type;
++}
+
+ /**
+ * _gtk_style_init_for_settings:
+@@ -477,6 +629,8 @@
+ {
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
++ parent_class = g_type_class_peek_parent (klass);
++
+ object_class->finalize = gtk_style_finalize;
+
+ klass->clone = gtk_style_real_clone;
+@@ -511,6 +665,7 @@
+
+ g_type_class_add_private (object_class, sizeof (GtkStylePrivate));
+
++
+ /**
+ * GtkStyle::realize:
+ * @style: the object which received the signal
+@@ -522,7 +677,7 @@
+ *
+ * Since: 2.4
+ */
+- realize_signal = g_signal_new (I_("realize"),
++ realize_signal = g_signal_new ("realize",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GtkStyleClass, realize),
+@@ -540,7 +695,7 @@
+ *
+ * Since: 2.4
+ */
+- unrealize_signal = g_signal_new (I_("unrealize"),
++ unrealize_signal = g_signal_new ("unrealize",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GtkStyleClass, unrealize),
+@@ -602,8 +757,18 @@
+ }
+ }
+
+- g_slist_foreach (style->icon_factories, (GFunc) g_object_unref, NULL);
+- g_slist_free (style->icon_factories);
++ if (style->icon_factories)
++ {
++ GSList *tmp_list = style->icon_factories;
++
++ while (tmp_list)
++ {
++ g_object_unref (tmp_list->data);
++ tmp_list = tmp_list->next;
++ }
++
++ g_slist_free (style->icon_factories);
++ }
+
+ g_slist_foreach (priv->color_hashes, (GFunc) g_hash_table_unref, NULL);
+ g_slist_free (priv->color_hashes);
+@@ -619,7 +784,7 @@
+ if (style->rc_style)
+ gtk_rc_style_unref (style->rc_style);
+
+- G_OBJECT_CLASS (gtk_style_parent_class)->finalize (object);
++ G_OBJECT_CLASS (parent_class)->finalize (object);
+ }
+
+
+@@ -686,10 +851,6 @@
+ * it to a particular visual and colormap. The process may
+ * involve the creation of a new style if the style has already
+ * been attached to a window with a different style and colormap.
+- *
+- * Since this function may return a new object, you have to use it
+- * in the following way:
+- * <literal>style = gtk_style_attach (style, window)</literal>
+ **/
+ GtkStyle*
+ gtk_style_attach (GtkStyle *style,
+@@ -766,19 +927,10 @@
+ return new_style;
+ }
+
+-/**
+- * gtk_style_detach:
+- * @style: a #GtkStyle
+- *
+- * Detaches a style from a window. If the style is not attached
+- * to any windows anymore, it is unrealized. See gtk_style_attach().
+- *
+- */
+ void
+ gtk_style_detach (GtkStyle *style)
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+- g_return_if_fail (style->attach_count > 0);
+
+ style->attach_count -= 1;
+ if (style->attach_count == 0)
+@@ -833,6 +985,9 @@
+ gtk_style_realize (GtkStyle *style,
+ GdkColormap *colormap)
+ {
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (GDK_IS_COLORMAP (colormap));
++
+ style->colormap = g_object_ref (colormap);
+ style->depth = gdk_colormap_get_visual (colormap)->depth;
+
+@@ -862,22 +1017,6 @@
+ return gtk_icon_factory_lookup_default (stock_id);
+ }
+
+-/**
+- * gtk_style_lookup_color:
+- * @style: a #GtkStyle
+- * @color_name: the name of the logical color to look up
+- * @color: the #GdkColor to fill in
+- *
+- * Looks up @color_name in the style's logical color mappings,
+- * filling in @color and returning %TRUE if found, otherwise
+- * returning %FALSE. Do not cache the found mapping, because
+- * it depends on the #GtkStyle and might change when a theme
+- * switch occurs.
+- *
+- * Return value: %TRUE if the mapping was found.
+- *
+- * Since: 2.10
+- **/
+ gboolean
+ gtk_style_lookup_color (GtkStyle *style,
+ const char *color_name,
+@@ -909,6 +1048,7 @@
+ return FALSE;
+ }
+
++
+ /**
+ * gtk_draw_hline:
+ * @style: a #GtkStyle
+@@ -1653,8 +1793,19 @@
+ if (rc_style->ythickness >= 0)
+ style->ythickness = rc_style->ythickness;
+
+- style->icon_factories = g_slist_copy (rc_style->icon_factories);
+- g_slist_foreach (style->icon_factories, (GFunc) g_object_ref, NULL);
++ if (rc_style->icon_factories)
++ {
++ GSList *iter;
++
++ style->icon_factories = g_slist_copy (rc_style->icon_factories);
++
++ iter = style->icon_factories;
++ while (iter != NULL)
++ {
++ g_object_ref (iter->data);
++ iter = g_slist_next (iter);
++ }
++ }
+
+ priv->color_hashes = g_slist_copy (_gtk_rc_style_get_color_hashes (rc_style));
+ g_slist_foreach (priv->color_hashes, (GFunc) g_hash_table_ref, NULL);
+@@ -1782,7 +1933,7 @@
+ {
+ _gtk_style_shade (&style->bg[i], &style->light[i], LIGHTNESS_MULT);
+ _gtk_style_shade (&style->bg[i], &style->dark[i], DARKNESS_MULT);
+-
++
+ style->mid[i].red = (style->light[i].red + style->dark[i].red) / 2;
+ style->mid[i].green = (style->light[i].green + style->dark[i].green) / 2;
+ style->mid[i].blue = (style->light[i].blue + style->dark[i].blue) / 2;
+@@ -2162,6 +2313,57 @@
+ gdk_drawable_get_size (window, NULL, height);
+ }
+
++static GdkBitmap *
++get_indicator_for_screen (GdkDrawable *drawable,
++ IndicatorPart part)
++
++{
++ GdkScreen *screen = gdk_drawable_get_screen (drawable);
++ GdkBitmap *bitmap;
++ GList *tmp_list;
++
++ tmp_list = indicator_parts[part].bmap_list;
++ while (tmp_list)
++ {
++ bitmap = tmp_list->data;
++
++ if (gdk_drawable_get_screen (bitmap) == screen)
++ return bitmap;
++
++ tmp_list = tmp_list->next;
++ }
++
++ bitmap = gdk_bitmap_create_from_data (drawable,
++ (gchar *)indicator_parts[part].bits,
++ INDICATOR_PART_SIZE, INDICATOR_PART_SIZE);
++ indicator_parts[part].bmap_list = g_list_prepend (indicator_parts[part].bmap_list, bitmap);
++
++ return bitmap;
++}
++
++static void
++draw_part (GdkDrawable *drawable,
++ GdkGC *gc,
++ GdkRectangle *area,
++ gint x,
++ gint y,
++ IndicatorPart part)
++{
++ if (area)
++ gdk_gc_set_clip_rectangle (gc, area);
++
++ gdk_gc_set_ts_origin (gc, x, y);
++ gdk_gc_set_stipple (gc, get_indicator_for_screen (drawable, part));
++ gdk_gc_set_fill (gc, GDK_STIPPLED);
++
++ gdk_draw_rectangle (drawable, gc, TRUE, x, y, INDICATOR_PART_SIZE, INDICATOR_PART_SIZE);
++
++ gdk_gc_set_fill (gc, GDK_SOLID);
++
++ if (area)
++ gdk_gc_set_clip_rectangle (gc, NULL);
++}
++
+ static void
+ gtk_default_draw_hline (GtkStyle *style,
+ GdkWindow *window,
+@@ -2177,6 +2379,9 @@
+ gint thickness_dark;
+ gint i;
+
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
++
+ thickness_light = style->ythickness / 2;
+ thickness_dark = style->ythickness - thickness_light;
+
+@@ -2231,6 +2436,9 @@
+ gint thickness_dark;
+ gint i;
+
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
++
+ thickness_light = style->xthickness / 2;
+ thickness_dark = style->xthickness - thickness_light;
+
+@@ -2456,6 +2664,9 @@
+ gint thickness_dark;
+ gint i;
+
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
++
+ if (shadow_type == GTK_SHADOW_IN)
+ {
+ if (detail && (strcmp (detail, "buttondefault") == 0))
+@@ -2791,6 +3002,10 @@
+ gint yadjust;
+ gint i;
+
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
++ g_return_if_fail (points != NULL);
++
+ switch (shadow_type)
+ {
+ case GTK_SHADOW_IN:
+@@ -2900,7 +3115,7 @@
+
+ static void
+ draw_arrow (GdkWindow *window,
+- GdkColor *color,
++ GdkGC *gc,
+ GdkRectangle *area,
+ GtkArrowType arrow_type,
+ gint x,
+@@ -2908,44 +3123,34 @@
+ gint width,
+ gint height)
+ {
+- cairo_t *cr = gdk_cairo_create (window);
+- gdk_cairo_set_source_color (cr, color);
+-
++ gint i, j;
++
+ if (area)
+- {
+- gdk_cairo_rectangle (cr, area);
+- cairo_clip (cr);
+- }
+-
++ gdk_gc_set_clip_rectangle (gc, area);
++
+ if (arrow_type == GTK_ARROW_DOWN)
+ {
+- cairo_move_to (cr, x, y);
+- cairo_line_to (cr, x + width, y);
+- cairo_line_to (cr, x + width / 2., y + height);
++ for (i = 0, j = 0; i < height; i++, j++)
++ gdk_draw_line (window, gc, x + j, y + i, x + width - j - 1, y + i);
+ }
+ else if (arrow_type == GTK_ARROW_UP)
+ {
+- cairo_move_to (cr, x, y + height);
+- cairo_line_to (cr, x + width / 2., y);
+- cairo_line_to (cr, x + width, y + height);
++ for (i = height - 1, j = 0; i >= 0; i--, j++)
++ gdk_draw_line (window, gc, x + j, y + i, x + width - j - 1, y + i);
+ }
+ else if (arrow_type == GTK_ARROW_LEFT)
+ {
+- cairo_move_to (cr, x + width, y);
+- cairo_line_to (cr, x + width, y + height);
+- cairo_line_to (cr, x, y + height / 2.);
++ for (i = width - 1, j = 0; i >= 0; i--, j++)
++ gdk_draw_line (window, gc, x + i, y + j, x + i, y + height - j - 1);
+ }
+ else if (arrow_type == GTK_ARROW_RIGHT)
+ {
+- cairo_move_to (cr, x, y);
+- cairo_line_to (cr, x + width, y + height / 2.);
+- cairo_line_to (cr, x, y + height);
++ for (i = 0, j = 0; i < width; i++, j++)
++ gdk_draw_line (window, gc, x + i, y + j, x + i, y + height - j - 1);
+ }
+
+- cairo_close_path (cr);
+- cairo_fill (cr);
+-
+- cairo_destroy (cr);
++ if (area)
++ gdk_gc_set_clip_rectangle (gc, NULL);
+ }
+
+ static void
+@@ -3032,17 +3237,22 @@
+ gint width,
+ gint height)
+ {
++ gint original_width, original_x;
++
+ sanitize_size (window, &width, &height);
+
++ original_width = width;
++ original_x = x;
++
+ calculate_arrow_geometry (arrow_type, &x, &y, &width, &height);
+
+ if (detail && strcmp (detail, "menu_scroll_arrow_up") == 0)
+ y++;
+
+ if (state == GTK_STATE_INSENSITIVE)
+- draw_arrow (window, &style->white, area, arrow_type,
++ draw_arrow (window, style->white_gc, area, arrow_type,
+ x + 1, y + 1, width, height);
+- draw_arrow (window, &style->fg[state], area, arrow_type,
++ draw_arrow (window, style->fg_gc[state], area, arrow_type,
+ x, y, width, height);
+ }
+
+@@ -3074,6 +3284,9 @@
+ GdkGC *inner_sw = NULL;
+ GdkGC *inner_se = NULL;
+
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
++
+ sanitize_size (window, &width, &height);
+
+ half_width = width / 2;
+@@ -3191,6 +3404,13 @@
+ gint y,
+ const gchar *string)
+ {
++ GdkDisplay *display;
++
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
++
++ display = gdk_drawable_get_display (window);
++
+ if (area)
+ {
+ gdk_gc_set_clip_rectangle (style->white_gc, area);
+@@ -3223,8 +3443,8 @@
+
+ if (widget)
+ gtk_widget_style_get (widget,
+- "indicator-size", &tmp_size,
+- "indicator-spacing", &tmp_spacing,
++ "indicator_size", &tmp_size,
++ "indicator_spacing", &tmp_spacing,
+ NULL);
+
+ if (tmp_size)
+@@ -3259,6 +3479,9 @@
+ {
+ gboolean is_spinbutton_box = FALSE;
+
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
++
+ sanitize_size (window, &width, &height);
+
+ if (widget && GTK_IS_SPIN_BUTTON (widget) && detail)
+@@ -3407,6 +3630,9 @@
+ GdkGC *gc1;
+ GdkGC *freeme = NULL;
+
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
++
+ sanitize_size (window, &width, &height);
+
+ if (detail)
+@@ -3415,26 +3641,15 @@
+ {
+ if (!strcmp ("text", detail))
+ gc1 = style->bg_gc[GTK_STATE_SELECTED];
+- else if (!strcmp ("cell_even", detail) ||
+- !strcmp ("cell_odd", detail) ||
+- !strcmp ("cell_even_ruled", detail) ||
+- !strcmp ("cell_even_ruled_sorted", detail))
++ else if (!strncmp ("cell_even", detail, strlen ("cell_even")) ||
++ !strncmp ("cell_odd", detail, strlen ("cell_odd")))
+ {
+ /* This has to be really broken; alex made me do it. -jrb */
+ if (GTK_WIDGET_HAS_FOCUS (widget))
+ gc1 = style->base_gc[state_type];
+- else
+- gc1 = style->base_gc[GTK_STATE_ACTIVE];
++ else
++ gc1 = style->base_gc[GTK_STATE_ACTIVE];
+ }
+- else if (!strcmp ("cell_odd_ruled", detail) ||
+- !strcmp ("cell_odd_ruled_sorted", detail))
+- {
+- if (GTK_WIDGET_HAS_FOCUS (widget))
+- freeme = get_darkened_gc (window, &style->base[state_type], 1);
+- else
+- freeme = get_darkened_gc (window, &style->base[GTK_STATE_ACTIVE], 1);
+- gc1 = freeme;
+- }
+ else
+ {
+ gc1 = style->bg_gc[state_type];
+@@ -3459,7 +3674,7 @@
+ GdkColor *color = NULL;
+
+ gtk_widget_style_get (widget,
+- "even-row-color", &color,
++ "even_row_color", &color,
+ NULL);
+
+ if (color)
+@@ -3477,7 +3692,7 @@
+ GdkColor *color;
+
+ gtk_widget_style_get (widget,
+- "odd-row-color", &color,
++ "odd_row_color", &color,
+ NULL);
+
+ if (color)
+@@ -3490,7 +3705,7 @@
+ else
+ {
+ gtk_widget_style_get (widget,
+- "even-row-color", &color,
++ "even_row_color", &color,
+ NULL);
+
+ if (color)
+@@ -3511,11 +3726,11 @@
+
+ if (!strcmp ("cell_odd_sorted", detail))
+ gtk_widget_style_get (widget,
+- "odd-row-color", &color,
++ "odd_row_color", &color,
+ NULL);
+ else
+ gtk_widget_style_get (widget,
+- "even-row-color", &color,
++ "even_row_color", &color,
+ NULL);
+
+ if (color)
+@@ -3536,7 +3751,7 @@
+ GdkColor *color = NULL;
+
+ gtk_widget_style_get (widget,
+- "odd-row-color", &color,
++ "odd_row_color", &color,
+ NULL);
+
+ if (color)
+@@ -3549,7 +3764,7 @@
+ else
+ {
+ gtk_widget_style_get (widget,
+- "even-row-color", &color,
++ "even_row_color", &color,
+ NULL);
+
+ if (color)
+@@ -3595,6 +3810,21 @@
+ g_object_unref (freeme);
+ }
+
++static GdkGC *
++create_aa_gc (GdkWindow *window, GtkStyle *style, GtkStateType state_type)
++{
++ GdkColor aa_color;
++ GdkGC *gc = gdk_gc_new (window);
++
++ aa_color.red = (style->fg[state_type].red + style->bg[state_type].red) / 2;
++ aa_color.green = (style->fg[state_type].green + style->bg[state_type].green) / 2;
++ aa_color.blue = (style->fg[state_type].blue + style->bg[state_type].blue) / 2;
++
++ gdk_gc_set_rgb_fg_color (gc, &aa_color);
++
++ return gc;
++}
++
+ static void
+ gtk_default_draw_check (GtkStyle *style,
+ GdkWindow *window,
+@@ -3608,116 +3838,92 @@
+ gint width,
+ gint height)
+ {
+- cairo_t *cr = gdk_cairo_create (window);
+- enum { BUTTON, MENU, CELL } type = BUTTON;
+- int exterior_size;
+- int interior_size;
+- int pad;
+-
+- if (detail)
+- {
+- if (strcmp (detail, "cellcheck") == 0)
+- type = CELL;
+- else if (strcmp (detail, "check") == 0)
+- type = MENU;
+- }
+-
+- if (area)
++ if (detail && strcmp (detail, "cellcheck") == 0)
+ {
+- gdk_cairo_rectangle (cr, area);
+- cairo_clip (cr);
++ if (area)
++ gdk_gc_set_clip_rectangle (widget->style->base_gc[state_type], area);
++ gdk_draw_rectangle (window,
++ widget->style->base_gc[state_type],
++ TRUE,
++ x, y,
++ width, height);
++ if (area)
++ {
++ gdk_gc_set_clip_rectangle (widget->style->base_gc[state_type], NULL);
++ gdk_gc_set_clip_rectangle (widget->style->text_gc[state_type], area);
++ }
++ gdk_draw_rectangle (window,
++ widget->style->text_gc[state_type],
++ FALSE,
++ x, y,
++ width, height);
++ if (area)
++ gdk_gc_set_clip_rectangle (widget->style->text_gc[state_type], NULL);
++
++ x -= (1 + INDICATOR_PART_SIZE - width) / 2;
++ y -= (((1 + INDICATOR_PART_SIZE - height) / 2) - 1);
++ if (shadow_type == GTK_SHADOW_IN)
++ {
++ draw_part (window, style->text_gc[state_type], area, x, y, CHECK_TEXT);
++ draw_part (window, style->text_aa_gc[state_type], area, x, y, CHECK_AA);
++ }
++ else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
++ {
++ draw_part (window, style->text_gc[state_type], area, x, y, CHECK_INCONSISTENT_TEXT);
++ }
+ }
+-
+- exterior_size = MIN (width, height);
+- if (exterior_size % 2 == 0) /* Ensure odd */
+- exterior_size -= -1;
+-
+- pad = style->xthickness + MAX (1, (exterior_size - 2 * style->xthickness) / 9);
+- interior_size = MAX (1, exterior_size - 2 * pad);
+-
+- if (interior_size < 7)
++ else
+ {
+- interior_size = 7;
+- pad = MAX (0, (exterior_size - interior_size) / 2);
+- }
++ GdkGC *free_me = NULL;
++
++ GdkGC *base_gc;
++ GdkGC *text_gc;
++ GdkGC *aa_gc;
+
+- x -= (1 + exterior_size - width) / 2;
+- y -= (1 + exterior_size - height) / 2;
++ x -= (1 + INDICATOR_PART_SIZE - width) / 2;
++ y -= (1 + INDICATOR_PART_SIZE - height) / 2;
+
+- switch (type)
+- {
+- case BUTTON:
+- case CELL:
+- if (type == BUTTON)
+- gdk_cairo_set_source_color (cr, &style->fg[state_type]);
++ if (detail && strcmp (detail, "check") == 0) /* Menu item */
++ {
++ text_gc = style->fg_gc[state_type];
++ base_gc = style->bg_gc[state_type];
++ aa_gc = free_me = create_aa_gc (window, style, state_type);
++ }
+ else
+- gdk_cairo_set_source_color (cr, &style->text[state_type]);
+-
+- cairo_set_line_width (cr, 1.0);
+- cairo_rectangle (cr, x + 0.5, y + 0.5, exterior_size - 1, exterior_size - 1);
+- cairo_stroke (cr);
++ {
++ if (state_type == GTK_STATE_ACTIVE)
++ {
++ text_gc = style->fg_gc[state_type];
++ base_gc = style->bg_gc[state_type];
++ aa_gc = free_me = create_aa_gc (window, style, state_type);
++ }
++ else
++ {
++ text_gc = style->text_gc[state_type];
++ base_gc = style->base_gc[state_type];
++ aa_gc = style->text_aa_gc[state_type];
++ }
+
+- gdk_cairo_set_source_color (cr, &style->base[state_type]);
+- cairo_rectangle (cr, x + 1, y + 1, exterior_size - 2, exterior_size - 2);
+- cairo_fill (cr);
+- break;
++ draw_part (window, base_gc, area, x, y, CHECK_BASE);
++ draw_part (window, style->black_gc, area, x, y, CHECK_BLACK);
++ draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_DARK);
++ draw_part (window, style->mid_gc[state_type], area, x, y, CHECK_MID);
++ draw_part (window, style->light_gc[state_type], area, x, y, CHECK_LIGHT);
++ }
+
+- case MENU:
+- break;
+- }
+-
+- switch (type)
+- {
+- case BUTTON:
+- case CELL:
+- gdk_cairo_set_source_color (cr, &style->text[state_type]);
+- break;
+- case MENU:
+- gdk_cairo_set_source_color (cr, &style->fg[state_type]);
+- break;
+- }
++ if (shadow_type == GTK_SHADOW_IN)
++ {
++ draw_part (window, text_gc, area, x, y, CHECK_TEXT);
++ draw_part (window, aa_gc, area, x, y, CHECK_AA);
++ }
++ else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
++ {
++ draw_part (window, text_gc, area, x, y, CHECK_INCONSISTENT_TEXT);
++ }
+
+- if (shadow_type == GTK_SHADOW_IN)
+- {
+- cairo_translate (cr,
+- x + pad, y + pad);
+-
+- cairo_scale (cr, interior_size / 7., interior_size / 7.);
+-
+- cairo_move_to (cr, 7.0, 0.0);
+- cairo_line_to (cr, 7.5, 1.0);
+- cairo_curve_to (cr, 5.3, 2.0,
+- 4.3, 4.0,
+- 3.5, 7.0);
+- cairo_curve_to (cr, 3.0, 5.7,
+- 1.3, 4.7,
+- 0.0, 4.7);
+- cairo_line_to (cr, 0.2, 3.5);
+- cairo_curve_to (cr, 1.1, 3.5,
+- 2.3, 4.3,
+- 3.0, 5.0);
+- cairo_curve_to (cr, 1.0, 3.9,
+- 2.4, 4.1,
+- 3.2, 4.9);
+- cairo_curve_to (cr, 3.5, 3.1,
+- 5.2, 2.0,
+- 7.0, 0.0);
+-
+- cairo_fill (cr);
+- }
+- else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
+- {
+- int line_thickness = MAX (1, (3 + interior_size * 2) / 7);
+-
+- cairo_rectangle (cr,
+- x + pad,
+- y + pad + (1 + interior_size - line_thickness) / 2,
+- interior_size,
+- line_thickness);
+- cairo_fill (cr);
++ if (free_me)
++ g_object_unref (free_me);
+ }
+-
+- cairo_destroy (cr);
+ }
+
+ static void
+@@ -3733,111 +3939,96 @@
+ gint width,
+ gint height)
+ {
+- cairo_t *cr = gdk_cairo_create (window);
+- enum { BUTTON, MENU, CELL } type = BUTTON;
+- int exterior_size;
+-
+- if (detail)
++ if (detail && strcmp (detail, "cellradio") == 0)
+ {
+- if (strcmp (detail, "radio") == 0)
+- type = CELL;
+- else if (strcmp (detail, "option") == 0)
+- type = MENU;
+- }
+-
+- if (area)
+- {
+- gdk_cairo_rectangle (cr, area);
+- cairo_clip (cr);
++ if (area)
++ gdk_gc_set_clip_rectangle (widget->style->fg_gc[state_type], area);
++ gdk_draw_arc (window,
++ widget->style->fg_gc[state_type],
++ FALSE,
++ x, y,
++ width,
++ height,
++ 0, 360*64);
++
++ if (shadow_type == GTK_SHADOW_IN)
++ {
++ gdk_draw_arc (window,
++ widget->style->fg_gc[state_type],
++ TRUE,
++ x + 2,
++ y + 2,
++ width - 4,
++ height - 4,
++ 0, 360*64);
++ }
++ else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
++ {
++ draw_part (window, widget->style->fg_gc[state_type],
++ area, x, y, CHECK_INCONSISTENT_TEXT);
++ }
++ if (area)
++ gdk_gc_set_clip_rectangle (widget->style->fg_gc[state_type], NULL);
+ }
+-
+- exterior_size = MIN (width, height);
+- if (exterior_size % 2 == 0) /* Ensure odd */
+- exterior_size -= -1;
+-
+- x -= (1 + exterior_size - width) / 2;
+- y -= (1 + exterior_size - height) / 2;
+-
+- switch (type)
++ else
+ {
+- case BUTTON:
+- case CELL:
+- gdk_cairo_set_source_color (cr, &style->base[state_type]);
++ GdkGC *free_me = NULL;
+
+- cairo_arc (cr,
+- x + exterior_size / 2.,
+- y + exterior_size / 2.,
+- (exterior_size - 1) / 2.,
+- 0, 2 * G_PI);
++ GdkGC *base_gc;
++ GdkGC *text_gc;
++ GdkGC *aa_gc;
+
+- cairo_fill_preserve (cr);
++ x -= (1 + INDICATOR_PART_SIZE - width) / 2;
++ y -= (1 + INDICATOR_PART_SIZE - height) / 2;
+
+- if (type == BUTTON)
+- gdk_cairo_set_source_color (cr, &style->fg[state_type]);
++ if (detail && strcmp (detail, "option") == 0) /* Menu item */
++ {
++ text_gc = style->fg_gc[state_type];
++ base_gc = style->bg_gc[state_type];
++ aa_gc = free_me = create_aa_gc (window, style, state_type);
++ }
+ else
+- gdk_cairo_set_source_color (cr, &style->text[state_type]);
+-
+- cairo_set_line_width (cr, 1.);
+- cairo_stroke (cr);
+- break;
+-
+- case MENU:
+- break;
+- }
+-
+- switch (type)
+- {
+- case BUTTON:
+- gdk_cairo_set_source_color (cr, &style->text[state_type]);
+- break;
+- case CELL:
+- break;
+- case MENU:
+- gdk_cairo_set_source_color (cr, &style->fg[state_type]);
+- break;
+- }
++ {
++ if (state_type == GTK_STATE_ACTIVE)
++ {
++ text_gc = style->fg_gc[state_type];
++ base_gc = style->bg_gc[state_type];
++ aa_gc = free_me = create_aa_gc (window, style, state_type);
++ }
++ else
++ {
++ text_gc = style->text_gc[state_type];
++ base_gc = style->base_gc[state_type];
++ aa_gc = style->text_aa_gc[state_type];
++ }
+
+- if (shadow_type == GTK_SHADOW_IN)
+- {
+- int pad = style->xthickness + MAX (1, 2 * (exterior_size - 2 * style->xthickness) / 9);
+- int interior_size = MAX (1, exterior_size - 2 * pad);
++ draw_part (window, base_gc, area, x, y, RADIO_BASE);
++ draw_part (window, style->black_gc, area, x, y, RADIO_BLACK);
++ draw_part (window, style->dark_gc[state_type], area, x, y, RADIO_DARK);
++ draw_part (window, style->mid_gc[state_type], area, x, y, RADIO_MID);
++ draw_part (window, style->light_gc[state_type], area, x, y, RADIO_LIGHT);
++ }
+
+- if (interior_size < 5)
++ if (shadow_type == GTK_SHADOW_IN)
+ {
+- interior_size = 7;
+- pad = MAX (0, (exterior_size - interior_size) / 2);
++ draw_part (window, text_gc, area, x, y, RADIO_TEXT);
+ }
+-
+- cairo_arc (cr,
+- x + pad + interior_size / 2.,
+- y + pad + interior_size / 2.,
+- interior_size / 2.,
+- 0, 2 * G_PI);
+- cairo_fill (cr);
+- }
+- else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
+- {
+- int pad = style->xthickness + MAX (1, (exterior_size - 2 * style->xthickness) / 9);
+- int interior_size = MAX (1, exterior_size - 2 * pad);
+- int line_thickness;
+-
+- if (interior_size < 7)
++ else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
+ {
+- interior_size = 7;
+- pad = MAX (0, (exterior_size - interior_size) / 2);
++ if (detail && strcmp (detail, "option") == 0) /* Menu item */
++ {
++ draw_part (window, text_gc, area, x, y, CHECK_INCONSISTENT_TEXT);
++ }
++ else
++ {
++ draw_part (window, text_gc, area, x, y, RADIO_INCONSISTENT_TEXT);
++ draw_part (window, aa_gc, area, x, y, RADIO_INCONSISTENT_AA);
++ }
+ }
+
+- line_thickness = MAX (1, (3 + interior_size * 2) / 7);
+-
+- cairo_rectangle (cr,
+- x + pad,
+- y + pad + (interior_size - line_thickness) / 2.,
+- interior_size,
+- line_thickness);
+- cairo_fill (cr);
++ if (free_me)
++ g_object_unref (free_me);
+ }
+-
+- cairo_destroy (cr);
+ }
+
+ static void
+@@ -3869,21 +4060,21 @@
+
+ if (state_type == GTK_STATE_INSENSITIVE)
+ {
+- draw_arrow (window, &style->white, area,
++ draw_arrow (window, style->white_gc, area,
+ GTK_ARROW_UP, x + 1, y + 1,
+ indicator_size.width, arrow_height);
+
+- draw_arrow (window, &style->white, area,
++ draw_arrow (window, style->white_gc, area,
+ GTK_ARROW_DOWN, x + 1, y + arrow_height + ARROW_SPACE + 1,
+ indicator_size.width, arrow_height);
+ }
+
+- draw_arrow (window, &style->fg[state_type], area,
++ draw_arrow (window, style->fg_gc[state_type], area,
+ GTK_ARROW_UP, x, y,
+ indicator_size.width, arrow_height);
+
+
+- draw_arrow (window, &style->fg[state_type], area,
++ draw_arrow (window, style->fg_gc[state_type], area,
+ GTK_ARROW_DOWN, x, y + arrow_height + ARROW_SPACE,
+ indicator_size.width, arrow_height);
+ }
+@@ -3909,6 +4100,9 @@
+ GdkGC *gc3 = NULL;
+ GdkGC *gc4 = NULL;
+
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
++
+ sanitize_size (window, &width, &height);
+
+ switch (shadow_type)
+@@ -4122,6 +4316,9 @@
+ GdkGC *gc3 = NULL;
+ GdkGC *gc4 = NULL;
+
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
++
+ gtk_style_apply_default_background (style, window,
+ widget && !GTK_WIDGET_NO_WINDOW (widget),
+ state_type, area, x, y, width, height);
+@@ -4338,6 +4535,9 @@
+ GdkGC *gc3 = NULL;
+ GdkGC *gc4 = NULL;
+
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
++
+ gtk_style_apply_default_background (style, window,
+ widget && !GTK_WIDGET_NO_WINDOW (widget),
+ GTK_STATE_NORMAL, area, x, y, width, height);
+@@ -4503,10 +4703,12 @@
+ gint width,
+ gint height)
+ {
+- cairo_t *cr;
++ GdkPoint points[5];
++ GdkGC *gc;
+ gboolean free_dash_list = FALSE;
+ gint line_width = 1;
+ gint8 *dash_list = "\1\1";
++ gint dash_len;
+
+ if (widget)
+ {
+@@ -4518,6 +4720,22 @@
+ free_dash_list = TRUE;
+ }
+
++ sanitize_size (window, &width, &height);
++
++ if (detail && !strcmp (detail, "colorwheel_light"))
++ gc = style->black_gc;
++ else if (detail && !strcmp (detail, "colorwheel_dark"))
++ gc = style->white_gc;
++ else
++ gc = style->fg_gc[state_type];
++
++ gdk_gc_set_line_attributes (gc, line_width,
++ dash_list[0] ? GDK_LINE_ON_OFF_DASH : GDK_LINE_SOLID,
++ GDK_CAP_BUTT, GDK_JOIN_MITER);
++
++ if (area)
++ gdk_gc_set_clip_rectangle (gc, area);
++
+ if (detail && !strcmp (detail, "add-mode"))
+ {
+ if (free_dash_list)
+@@ -4527,59 +4745,88 @@
+ free_dash_list = FALSE;
+ }
+
+- sanitize_size (window, &width, &height);
++ points[0].x = x + line_width / 2;
++ points[0].y = y + line_width / 2;
++ points[1].x = x + width - line_width + line_width / 2;
++ points[1].y = y + line_width / 2;
++ points[2].x = x + width - line_width + line_width / 2;
++ points[2].y = y + height - line_width + line_width / 2;
++ points[3].x = x + line_width / 2;
++ points[3].y = y + height - line_width + line_width / 2;
++ points[4] = points[0];
+
+- cr = gdk_cairo_create (window);
+-
+- if (detail && !strcmp (detail, "colorwheel_light"))
+- cairo_set_source_rgb (cr, 0., 0., 0.);
+- else if (detail && !strcmp (detail, "colorwheel_dark"))
+- cairo_set_source_rgb (cr, 1., 1., 1.);
++ if (!dash_list[0])
++ {
++ gdk_draw_lines (window, gc, points, 5);
++ }
+ else
+- gdk_cairo_set_source_color (cr, &style->fg[state_type]);
+-
+- cairo_set_line_width (cr, line_width);
+-
+- if (dash_list[0])
+ {
+- gint n_dashes = strlen (dash_list);
+- gdouble *dashes = g_new (gdouble, n_dashes);
+- gdouble total_length = 0;
+- gdouble dash_offset;
+- gint i;
+-
+- for (i = 0; i < n_dashes; i++)
++ /* We go through all the pain below because the X rasterization
++ * rules don't really work right for dashed lines if you
++ * want continuity in segments that go between top/right
++ * and left/bottom. For instance, a top left corner
++ * with a 1-1 dash is drawn as:
++ *
++ * X X X
++ * X
++ *
++ * X
++ *
++ * This is because pixels on the top and left boundaries
++ * of polygons are drawn, but not on the bottom and right.
++ * So, if you have a line going up that turns the corner
++ * and goes right, there is a one pixel shift in the pattern.
++ *
++ * So, to fix this, we drawn the top and right in one call,
++ * then the left and bottom in another call, fixing up
++ * the dash offset for the second call ourselves to get
++ * continuity at the upper left.
++ *
++ * It's not perfect since we really should have a join at
++ * the upper left and lower right instead of two intersecting
++ * lines but that's only really apparent for no-dashes,
++ * which (for this reason) are done as one polygon and
++ * don't to through this code path.
++ */
++
++ dash_len = strlen (dash_list);
++
++ if (dash_list[0])
++ gdk_gc_set_dashes (gc, 0, dash_list, dash_len);
++
++ gdk_draw_lines (window, gc, points, 3);
++
++ /* We draw this line one farther over than it is "supposed" to
++ * because of another rasterization problem ... if two 1 pixel
++ * unjoined lines meet at the lower right, there will be a missing
++ * pixel.
++ */
++ points[2].x += 1;
++
++ if (dash_list[0])
+ {
+- dashes[i] = dash_list[i];
+- total_length += dash_list[i];
++ gint dash_pixels = 0;
++ gint i;
++
++ /* Adjust the dash offset for the bottom and left so we
++ * match up at the upper left.
++ */
++ for (i = 0; i < dash_len; i++)
++ dash_pixels += dash_list[i];
++
++ if (dash_len % 2 == 1)
++ dash_pixels *= 2;
++
++ gdk_gc_set_dashes (gc, dash_pixels - (width + height - 2 * line_width) % dash_pixels, dash_list, dash_len);
+ }
+-
+- /* The dash offset here aligns the pattern to integer pixels
+- * by starting the dash at the right side of the left border
+- * Negative dash offsets in cairo don't work
+- * (https://bugs.freedesktop.org/show_bug.cgi?id=2729)
+- */
+- dash_offset = - line_width / 2.;
+- while (dash_offset < 0)
+- dash_offset += total_length;
+
+- cairo_set_dash (cr, dashes, n_dashes, dash_offset);
+- g_free (dashes);
++ gdk_draw_lines (window, gc, points + 2, 3);
+ }
+
+- if (area)
+- {
+- gdk_cairo_rectangle (cr, area);
+- cairo_clip (cr);
+- }
++ gdk_gc_set_line_attributes (gc, 0, GDK_LINE_SOLID, GDK_CAP_BUTT, GDK_JOIN_MITER);
+
+- cairo_rectangle (cr,
+- x + line_width / 2.,
+- y + line_width / 2.,
+- width - line_width,
+- height - line_width);
+- cairo_stroke (cr);
+- cairo_destroy (cr);
++ if (area)
++ gdk_gc_set_clip_rectangle (gc, NULL);
+
+ if (free_dash_list)
+ g_free (dash_list);
+@@ -4599,6 +4846,9 @@
+ gint height,
+ GtkOrientation orientation)
+ {
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
++
+ sanitize_size (window, &width, &height);
+
+ gtk_paint_box (style, window, state_type, shadow_type,
+@@ -4627,6 +4877,7 @@
+ gint y,
+ gushort size)
+ {
++
+ size = CLAMP (size, 2, 3);
+
+ if (size == 2)
+@@ -4667,6 +4918,9 @@
+ GdkRectangle dest;
+ gint intersect;
+
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
++
+ sanitize_size (window, &width, &height);
+
+ gtk_paint_box (style, window, state_type, shadow_type, area, widget,
+@@ -4682,9 +4936,9 @@
+ if (state_type == GTK_STATE_SELECTED && widget && !GTK_WIDGET_HAS_FOCUS (widget))
+ {
+ GdkColor unfocused_light;
+-
++
+ _gtk_style_shade (&style->base[GTK_STATE_ACTIVE], &unfocused_light,
+- LIGHTNESS_MULT);
++ LIGHTNESS_MULT);
+
+ light_gc = free_me = gdk_gc_new (window);
+ gdk_gc_set_rgb_fg_color (light_gc, &unfocused_light);
+@@ -4750,6 +5004,72 @@
+ }
+
+ static void
++create_expander_affine (gdouble affine[6],
++ gint degrees,
++ gint expander_size,
++ gint x,
++ gint y)
++{
++ gdouble s, c;
++ gdouble width;
++ gdouble height;
++
++ width = expander_size / 4.0;
++ height = expander_size / 2.0;
++
++ switch (degrees)
++ {
++ case 0:
++ s = 0.0;
++ c = 1.0;
++ break;
++ case 90:
++ s = 1.0;
++ c = 0.0;
++ break;
++ case 180:
++ s = 0.0;
++ c = -1.0;
++ break;
++ default:
++ s = sin (degrees * G_PI / 180.0);
++ c = cos (degrees * G_PI / 180.0);
++ break;
++ }
++
++ affine[0] = c;
++ affine[1] = s;
++ affine[2] = -s;
++ affine[3] = c;
++ affine[4] = -width * c - height * -s + x;
++ affine[5] = -width * s - height * c + y;
++}
++
++static void
++apply_affine_on_point (double affine[6], GdkPoint *point)
++{
++ gdouble x, y;
++
++ x = point->x * affine[0] + point->y * affine[2] + affine[4];
++ y = point->x * affine[1] + point->y * affine[3] + affine[5];
++
++ point->x = floor (x);
++ point->y = floor (y);
++}
++
++static void
++gtk_style_draw_polygon_with_gc (GdkWindow *window, GdkGC *gc, gint line_width,
++ gboolean do_fill, GdkPoint *points, gint n_points)
++{
++ gdk_gc_set_line_attributes (gc, line_width,
++ GDK_LINE_SOLID,
++ GDK_CAP_BUTT, GDK_JOIN_MITER);
++
++ gdk_draw_polygon (window, gc, do_fill, points, n_points);
++ gdk_gc_set_line_attributes (gc, 0, GDK_LINE_SOLID, GDK_CAP_BUTT, GDK_JOIN_MITER);
++}
++
++static void
+ gtk_default_draw_expander (GtkStyle *style,
+ GdkWindow *window,
+ GtkStateType state_type,
+@@ -4760,127 +5080,82 @@
+ gint y,
+ GtkExpanderStyle expander_style)
+ {
+-#define DEFAULT_EXPANDER_SIZE 12
+-
+ gint expander_size;
+- gint line_width;
+- double vertical_overshoot;
+- int diameter;
+- double radius;
+- double interp; /* interpolation factor for center position */
+- double x_double_horz, y_double_horz;
+- double x_double_vert, y_double_vert;
+- double x_double, y_double;
++ GdkPoint points[3];
++ gint i;
++ gint line_width, o;
++ gdouble affine[6];
+ gint degrees = 0;
+
+- cairo_t *cr = gdk_cairo_create (window);
+-
++ gtk_widget_style_get (widget,
++ "expander-size", &expander_size,
++ NULL);
++ line_width = MAX (1, expander_size/9);
++
+ if (area)
+ {
+- gdk_cairo_rectangle (cr, area);
+- cairo_clip (cr);
++ gdk_gc_set_clip_rectangle (style->fg_gc[GTK_STATE_NORMAL], area);
++ gdk_gc_set_clip_rectangle (style->base_gc[GTK_STATE_NORMAL], area);
+ }
+
+- if (widget &&
+- gtk_widget_class_find_style_property (GTK_WIDGET_GET_CLASS (widget),
+- "expander-size"))
+- {
+- gtk_widget_style_get (widget,
+- "expander-size", &expander_size,
+- NULL);
+- }
+- else
+- expander_size = DEFAULT_EXPANDER_SIZE;
+-
+- line_width = MAX (1, expander_size/9);
++ /* a rough estimate of how much the joins of the triangle will overshoot.
++ * 2.4 ~ 1 / tan (45 / 2)
++ */
++ o = ceil (2.4 * line_width / 2.0);
++ points[0].x = line_width / 2;
++ points[0].y = o;
++ points[1].x = expander_size / 2 + line_width / 2 - o;
++ points[1].y = expander_size / 2;
++ points[2].x = line_width / 2;
++ points[2].y = expander_size - o;
+
+ switch (expander_style)
+ {
+ case GTK_EXPANDER_COLLAPSED:
+ degrees = (get_direction (widget) == GTK_TEXT_DIR_RTL) ? 180 : 0;
+- interp = 0.0;
+ break;
+ case GTK_EXPANDER_SEMI_COLLAPSED:
+ degrees = (get_direction (widget) == GTK_TEXT_DIR_RTL) ? 150 : 30;
+- interp = 0.25;
+ break;
+ case GTK_EXPANDER_SEMI_EXPANDED:
+ degrees = (get_direction (widget) == GTK_TEXT_DIR_RTL) ? 120 : 60;
+- interp = 0.75;
+ break;
+ case GTK_EXPANDER_EXPANDED:
+ degrees = 90;
+- interp = 1.0;
+ break;
+ default:
+ g_assert_not_reached ();
+ }
+
+- /* Compute distance that the stroke extends beyonds the end
+- * of the triangle we draw.
+- */
+- vertical_overshoot = line_width / 2.0 * (1. / tan (G_PI / 8));
+-
+- /* For odd line widths, we end the vertical line of the triangle
+- * at a half pixel, so we round differently.
+- */
+- if (line_width % 2 == 1)
+- vertical_overshoot = ceil (0.5 + vertical_overshoot) - 0.5;
+- else
+- vertical_overshoot = ceil (vertical_overshoot);
+-
+- /* Adjust the size of the triangle we draw so that the entire stroke fits
+- */
+- diameter = MAX (3, expander_size - 2 * vertical_overshoot);
+-
+- /* If the line width is odd, we want the diameter to be even,
+- * and vice versa, so force the sum to be odd. This relationship
+- * makes the point of the triangle look right.
+- */
+- diameter -= (1 - (diameter + line_width) % 2);
+-
+- radius = diameter / 2.;
+-
+- /* Adjust the center so that the stroke is properly aligned with
+- * the pixel grid. The center adjustment is different for the
+- * horizontal and vertical orientations. For intermediate positions
+- * we interpolate between the two.
+- */
+- x_double_vert = floor (x - (radius + line_width) / 2.) + (radius + line_width) / 2.;
+- y_double_vert = y - 0.5;
+-
+- x_double_horz = x - 0.5;
+- y_double_horz = floor (y - (radius + line_width) / 2.) + (radius + line_width) / 2.;
+-
+- x_double = x_double_vert * (1 - interp) + x_double_horz * interp;
+- y_double = y_double_vert * (1 - interp) + y_double_horz * interp;
+-
+- cairo_translate (cr, x_double, y_double);
+- cairo_rotate (cr, degrees * G_PI / 180);
++ create_expander_affine (affine, degrees, expander_size, x, y);
+
+- cairo_move_to (cr, - radius / 2., - radius);
+- cairo_line_to (cr, radius / 2., 0);
+- cairo_line_to (cr, - radius / 2., radius);
+- cairo_close_path (cr);
+-
+- cairo_set_line_width (cr, line_width);
++ for (i = 0; i < 3; i++)
++ apply_affine_on_point (affine, &points[i]);
+
+ if (state_type == GTK_STATE_PRELIGHT)
+- gdk_cairo_set_source_color (cr,
+- &style->fg[GTK_STATE_PRELIGHT]);
++ {
++ gtk_style_draw_polygon_with_gc (window, style->fg_gc[GTK_STATE_PRELIGHT],
++ 1, TRUE, points, 3);
++ }
+ else if (state_type == GTK_STATE_ACTIVE)
+- gdk_cairo_set_source_color (cr,
+- &style->light[GTK_STATE_ACTIVE]);
++ {
++ gtk_style_draw_polygon_with_gc (window, style->light_gc[GTK_STATE_ACTIVE],
++ 1, TRUE, points, 3);
++ gtk_style_draw_polygon_with_gc (window, style->fg_gc[GTK_STATE_NORMAL],
++ line_width, FALSE, points, 3);
++ }
+ else
+- gdk_cairo_set_source_color (cr,
+- &style->base[GTK_STATE_NORMAL]);
+-
+- cairo_fill_preserve (cr);
+-
+- gdk_cairo_set_source_color (cr, &style->fg[state_type]);
+- cairo_stroke (cr);
+-
+- cairo_destroy (cr);
++ {
++ gtk_style_draw_polygon_with_gc (window, style->base_gc[GTK_STATE_NORMAL],
++ 1, TRUE, points, 3);
++ gtk_style_draw_polygon_with_gc (window, style->fg_gc[GTK_STATE_NORMAL],
++ line_width, FALSE, points, 3);
++ }
++ if (area)
++ {
++ gdk_gc_set_clip_rectangle (style->fg_gc[GTK_STATE_NORMAL], NULL);
++ gdk_gc_set_clip_rectangle (style->base_gc[GTK_STATE_NORMAL], NULL);
++ }
+ }
+
+ typedef struct _ByteRange ByteRange;
+@@ -5046,6 +5321,9 @@
+ PangoLayout *layout)
+ {
+ GdkGC *gc;
++
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
+
+ gc = use_text ? style->text_gc[state_type] : style->fg_gc[state_type];
+
+@@ -5087,6 +5365,9 @@
+ GdkPoint points[4];
+ gint i, j, skip;
+
++ g_return_if_fail (GTK_IS_STYLE (style));
++ g_return_if_fail (window != NULL);
++
+ if (area)
+ {
+ gdk_gc_set_clip_rectangle (style->light_gc[state_type], area);
+@@ -5390,8 +5671,8 @@
+
+ void
+ _gtk_style_shade (GdkColor *a,
+- GdkColor *b,
+- gdouble k)
++ GdkColor *b,
++ gdouble k)
+ {
+ gdouble red;
+ gdouble green;
+@@ -5578,10 +5859,9 @@
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+- * @area: rectangle to which the output is clipped, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: rectangle to which the output is clipped
++ * @widget: the widget
++ * @detail: a style detail
+ * @x1: the starting x coordinate
+ * @x2: the ending x coordinate
+ * @y: the y coordinate
+@@ -5602,7 +5882,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_hline != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_hline (style, window, state_type, area, widget, detail, x1, x2, y);
+ }
+@@ -5612,10 +5891,9 @@
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+- * @area: rectangle to which the output is clipped, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: rectangle to which the output is clipped
++ * @widget: the widget
++ * @detail: a style detail
+ * @y1_: the starting y coordinate
+ * @y2_: the ending y coordinate
+ * @x: the x coordinate
+@@ -5636,7 +5914,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_vline != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_vline (style, window, state_type, area, widget, detail, y1_, y2_, x);
+ }
+@@ -5647,10 +5924,9 @@
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+- * @area: clip rectangle or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @x: x origin of the rectangle
+ * @y: y origin of the rectangle
+ * @width: width of the rectangle
+@@ -5674,7 +5950,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_shadow (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+ }
+@@ -5685,10 +5960,9 @@
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @points: an array of #GdkPoint<!-- -->s
+ * @npoints: length of @points
+ * @fill: %TRUE if the polygon should be filled
+@@ -5709,7 +5983,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_polygon != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_polygon (style, window, state_type, shadow_type, area, widget, detail, points, npoints, fill);
+ }
+@@ -5720,10 +5993,9 @@
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @arrow_type: the type of arrow to draw
+ * @fill: %TRUE if the arrow tip should be filled
+ * @x: x origin of the rectangle to draw the arrow in
+@@ -5751,7 +6023,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_arrow != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_arrow (style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);
+ }
+@@ -5762,10 +6033,9 @@
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @x: x origin of the rectangle to draw the diamond in
+ * @y: y origin of the rectangle to draw the diamond in
+ * @width: width of the rectangle to draw the diamond in
+@@ -5789,7 +6059,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_diamond != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_diamond (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+ }
+@@ -5799,10 +6068,9 @@
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @x: x origin
+ * @y: y origin
+ * @string: the string to draw
+@@ -5824,7 +6092,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_string != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_string (style, window, state_type, area, widget, detail, x, y, string);
+ }
+@@ -5835,10 +6102,9 @@
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @x: x origin of the box
+ * @y: y origin of the box
+ * @width: the width of the box
+@@ -5861,7 +6127,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+ }
+@@ -5872,10 +6137,9 @@
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @x: x origin of the box
+ * @y: y origin of the box
+ * @width: the width of the box
+@@ -5898,7 +6162,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_flat_box != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_flat_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+ }
+@@ -5909,10 +6172,9 @@
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @x: x origin of the rectangle to draw the check in
+ * @y: y origin of the rectangle to draw the check in
+ * @width: the width of the rectangle to draw the check in
+@@ -5936,7 +6198,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_check != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_check (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+ }
+@@ -5947,10 +6208,9 @@
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @x: x origin of the rectangle to draw the option in
+ * @y: y origin of the rectangle to draw the option in
+ * @width: the width of the rectangle to draw the option in
+@@ -5974,7 +6234,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_option != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_option (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+ }
+@@ -5985,10 +6244,9 @@
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @x: x origin of the rectangle to draw the tab in
+ * @y: y origin of the rectangle to draw the tab in
+ * @width: the width of the rectangle to draw the tab in
+@@ -6012,7 +6270,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_tab != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_tab (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+ }
+@@ -6023,10 +6280,9 @@
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @x: x origin of the rectangle
+ * @y: y origin of the rectangle
+ * @width: width of the rectangle
+@@ -6057,7 +6313,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow_gap != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_shadow_gap (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
+ }
+@@ -6069,10 +6324,9 @@
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @x: x origin of the rectangle
+ * @y: y origin of the rectangle
+ * @width: width of the rectangle
+@@ -6102,7 +6356,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box_gap != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_box_gap (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
+ }
+@@ -6113,10 +6366,9 @@
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @x: x origin of the extension
+ * @y: y origin of the extension
+ * @width: width of the extension
+@@ -6141,7 +6393,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_extension != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_extension (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);
+ }
+@@ -6151,10 +6402,9 @@
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @x: the x origin of the rectangle around which to draw a focus indicator
+ * @y: the y origin of the rectangle around which to draw a focus indicator
+ * @width: the width of the rectangle around which to draw a focus indicator
+@@ -6177,30 +6427,10 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_focus != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_focus (style, window, state_type, area, widget, detail, x, y, width, height);
+ }
+
+-/**
+- * gtk_paint_slider:
+- * @style: a #GtkStyle
+- * @window: a #GdkWindow
+- * @state_type: a state
+- * @shadow_type: a shadow
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
+- * @x: the x origin of the rectangle in which to draw a slider
+- * @y: the y origin of the rectangle in which to draw a slider
+- * @width: the width of the rectangle in which to draw a slider
+- * @height: the height of the rectangle in which to draw a slider
+- * @orientation: the orientation to be used
+- *
+- * Draws a slider in the given rectangle on @window using the
+- * given style and orientation.
+- **/
+ void
+ gtk_paint_slider (GtkStyle *style,
+ GdkWindow *window,
+@@ -6217,7 +6447,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_slider != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_slider (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
+ }
+@@ -6228,10 +6457,9 @@
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @x: x origin of the handle
+ * @y: y origin of the handle
+ * @width: with of the handle
+@@ -6256,7 +6484,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_handle != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_handle (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
+ }
+@@ -6266,25 +6493,14 @@
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @x: the x position to draw the expander at
+ * @y: the y position to draw the expander at
+- * @expander_style: the style to draw the expander in; determines
+- * whether the expander is collapsed, expanded, or in an
+- * intermediate state.
++ * @expander_style: the style to draw the expander in
+ *
+- * Draws an expander as used in #GtkTreeView. @x and @y specify the
+- * center the expander. The size of the expander is determined by the
+- * "expander-size" style property of @widget. (If widget is not
+- * specified or doesn't have an "expander-size" property, an
+- * unspecified default size will be used, since the caller doesn't
+- * have sufficient information to position the expander, this is
+- * likely not useful.) The expander is expander_size pixels tall
+- * in the collapsed position and expander_size pixels wide in the
+- * expanded position.
++ * Draws an expander as used in #GtkTreeView.
+ **/
+ void
+ gtk_paint_expander (GtkStyle *style,
+@@ -6299,34 +6515,16 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_expander != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_expander (style, window, state_type, area,
+ widget, detail, x, y, expander_style);
+ }
+
+-/**
+- * gtk_paint_layout:
+- * @style: a #GtkStyle
+- * @window: a #GdkWindow
+- * @state_type: a state
+- * @use_text: whether to use the text or foreground
+- * graphics context of @style
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
+- * @x: x origin
+- * @y: y origin
+- * @layout: the layout to draw
+- *
+- * Draws a layout on @window using the given parameters.
+- **/
+ void
+ gtk_paint_layout (GtkStyle *style,
+ GdkWindow *window,
+ GtkStateType state_type,
+- gboolean use_text,
++ gboolean use_text,
+ GdkRectangle *area,
+ GtkWidget *widget,
+ const gchar *detail,
+@@ -6336,7 +6534,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_layout != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_layout (style, window, state_type, use_text, area,
+ widget, detail, x, y, layout);
+@@ -6347,10 +6544,9 @@
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+- * @area: clip rectangle, or %NULL if the
+- * output should not be clipped
+- * @widget: the widget (may be %NULL)
+- * @detail: a style detail (may be %NULL)
++ * @area: clip rectangle
++ * @widget: the widget
++ * @detail: a style detail
+ * @edge: the edge in which to draw the resize grip
+ * @x: the x origin of the rectangle in which to draw the resize grip
+ * @y: the y origin of the rectangle in which to draw the resize grip
+@@ -6376,7 +6572,6 @@
+ {
+ g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_resize_grip != NULL);
+- g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
+
+ GTK_STYLE_GET_CLASS (style)->draw_resize_grip (style, window, state_type,
+ area, widget, detail,
+@@ -6414,7 +6609,7 @@
+ static GType our_type = 0;
+
+ if (our_type == 0)
+- our_type = g_boxed_type_register_static (I_("GtkBorder"),
++ our_type = g_boxed_type_register_static ("GtkBorder",
+ (GBoxedCopyFunc) gtk_border_copy,
+ (GBoxedFreeFunc) gtk_border_free);
+
+@@ -6553,7 +6748,7 @@
+ gtk_gc_release (cursor_info->secondary_gc);
+
+ g_free (cursor_info);
+- g_object_set_data (G_OBJECT (style), I_("gtk-style-cursor-info"), NULL);
++ g_object_set_data (G_OBJECT (style), "gtk-style-cursor-info", NULL);
+ }
+ }
+
+@@ -6591,7 +6786,7 @@
+ if (!cursor_info)
+ {
+ cursor_info = g_new (CursorInfo, 1);
+- g_object_set_data (G_OBJECT (widget->style), I_("gtk-style-cursor-info"), cursor_info);
++ g_object_set_data (G_OBJECT (widget->style), "gtk-style-cursor-info", cursor_info);
+ cursor_info->primary_gc = NULL;
+ cursor_info->secondary_gc = NULL;
+ cursor_info->for_type = G_TYPE_INVALID;
+@@ -6655,6 +6850,8 @@
+ gfloat cursor_aspect_ratio;
+ gint offset;
+
++ g_return_if_fail (direction != GTK_TEXT_DIR_NONE);
++
+ /* When changing the shape or size of the cursor here,
+ * propagate the changes to gtktextview.c:text_window_invalidate_cursors().
+ */
diff --git a/openembedded/packages/gtk+/gtk+-2.10.0/xsettings.patch b/openembedded/packages/gtk+/gtk+-2.10.0/xsettings.patch
new file mode 100644
index 000000000..b63e262d3
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.10.0/xsettings.patch
@@ -0,0 +1,16 @@
+--- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004
++++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004
+@@ -2827,10 +2827,9 @@
+ {
+ GdkScreenX11 *screen = data;
+
+- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
+- return GDK_FILTER_REMOVE;
+- else
+- return GDK_FILTER_CONTINUE;
++ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
++
++ return GDK_FILTER_CONTINUE;
+ }
+
+ static void
diff --git a/openembedded/packages/gtk+/gtk+_2.10.0.bb b/openembedded/packages/gtk+/gtk+_2.10.0.bb
new file mode 100644
index 000000000..decabf2f8
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+_2.10.0.bb
@@ -0,0 +1,89 @@
+LICENSE = "LGPL"
+DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
+set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
+HOMEPAGE = "http://www.gtk.org"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Jorn Baayen <jorn@openedhand.com>"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
+ file://cellrenderer-cairo.patch;patch=1 \
+ file://entry-cairo.patch;patch=1 \
+ file://style-cairo.patch;patch=1 \
+ file://no-xwc.patch;patch=1 \
+ file://automake-lossage.patch;patch=1 \
+# file://spinbutton.patch;patch=1 \
+# file://hardcoded_libtool.patch;patch=1 \
+ file://disable-tooltips.patch;patch=1 \
+ file://gtklabel-resize-patch;patch=1 \
+ file://gtktreeview-316689.patch;patch=1 \
+# file://menu-deactivate.patch;patch=1 \
+# file://xsettings.patch;patch=1 \
+# file://scroll-timings.patch;patch=1 \
+# file://small-gtkfilesel.patch;patch=1 \
+# file://migration.patch;patch=1;pnum=0 \
+ file://no-demos.patch;patch=1"
+# file://gtk+-handhelds.patch;patch=1 \
+# file://single-click.patch;patch=1"
+
+inherit autotools pkgconfig
+
+FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
+ ${bindir}/gtk-query-immodules-2.0 \
+ ${bindir}/gtk-update-icon-cache \
+ ${libdir}/lib*.so.* \
+ ${datadir}/themes ${sysconfdir} \
+ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
+FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
+
+RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1"
+
+EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
+# --disable-cruft
+
+LIBV = "2.4.0"
+
+do_stage () {
+ oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
+
+ autotools_stage_includes
+
+ mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
+ install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
+
+ install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+do_install_append () {
+ install -d ${D}${sysconfdir}/gtk-2.0
+}
+
+postinst_prologue() {
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+}
+
+PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*"
+
+python populate_packages_prepend () {
+ import os.path
+
+ prologue = bb.data.getVar("postinst_prologue", d, 1)
+
+ gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
+ loaders_root = os.path.join(gtk_libdir, 'loaders')
+ immodules_root = os.path.join(gtk_libdir, 'immodules')
+
+ do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
+ do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
+
+ if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+ bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
+}
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-23 19:03:57 +0000