merge of '2001ac2acd66ae1b7566b3830724007b6854f03f'

     and 'a6961e05d6a31b23961267e50853355f41ab5891'

3 files changed, 28 insertions, 24 deletions

diff --git a/packages/gtk+/gtk+-2.10.6/single-click.patch b/packages/gtk+/gtk+-2.10.6/single-click.patch
index 3bb208d4d6..250f1629f5 100644
--- a/packages/gtk+/gtk+-2.10.6/single-click.patch
+++ b/packages/gtk+/gtk+-2.10.6/single-click.patch
@@ -1,24 +1,26 @@
-diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c
---- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c	2005-04-06 16:57:04 +01:00
-+++ gtk+-2.6.3/gtk/gtkcalendar.c	2005-04-06 20:05:18 +01:00
-@@ -1023,9 +1023,11 @@
+Index: gtk+-2.10.6/gtk/gtkcalendar.c
+===================================================================
+--- gtk+-2.10.6.orig/gtk/gtkcalendar.c
++++ gtk+-2.10.6/gtk/gtkcalendar.c
+@@ -2482,9 +2482,11 @@ calendar_main_button_press (GtkCalendar	
  	}
  
-       gtk_calendar_select_and_focus_day (calendar, day);
+       calendar_select_and_focus_day (calendar, day);
 -    }
-+      
-+      // This change causes the calendar to disappear after choosing a day
++
++    // This change causes the calendar to disappear after choosing a day
 +/*    }
    else if (event->type == GDK_2BUTTON_PRESS)
 -    {
 +    {*/
-       private_data->in_drag = 0;
+       priv->in_drag = 0;
        if (day_month == MONTH_CURRENT)
  	g_signal_emit (calendar,
-diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c
---- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c	2005-04-06 16:57:07 +01:00
-+++ gtk+-2.6.3/gtk/gtkfilesel.c	2005-04-07 13:40:32 +01:00
-@@ -2468,6 +2468,33 @@
+Index: gtk+-2.10.6/gtk/gtkfilesel.c
+===================================================================
+--- gtk+-2.10.6.orig/gtk/gtkfilesel.c
++++ gtk+-2.10.6/gtk/gtkfilesel.c
+@@ -2426,6 +2426,33 @@ gtk_file_selection_file_changed (GtkTree
        if (fs->last_selected != NULL)
  	g_free (fs->last_selected);
  
diff --git a/packages/gtk+/gtk+-2.10.6/spinbutton.patch b/packages/gtk+/gtk+-2.10.6/spinbutton.patch
index 8ad7507af0..c26dc6d93c 100644
--- a/packages/gtk+/gtk+-2.10.6/spinbutton.patch
+++ b/packages/gtk+/gtk+-2.10.6/spinbutton.patch
@@ -1,6 +1,8 @@
---- 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 @@
+Index: gtk+-2.10.6/gtk/gtkspinbutton.c
+===================================================================
+--- gtk+-2.10.6.orig/gtk/gtkspinbutton.c
++++ gtk+-2.10.6/gtk/gtkspinbutton.c
+@@ -682,7 +682,7 @@ gtk_spin_button_size_allocate (GtkWidget
  
    spin = GTK_SPIN_BUTTON (widget);
    arrow_size = spin_button_get_arrow_size (spin);
@@ -9,7 +11,7 @@
    
    widget->allocation = *allocation;
    
-@@ -866,19 +866,16 @@
+@@ -815,19 +815,16 @@ gtk_spin_button_draw_arrow (GtkSpinButto
      {
        width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness;
  
@@ -33,7 +35,7 @@
  	}
  
        if (spin_button_at_limit (spin_button, arrow_type))
-@@ -908,32 +905,17 @@
+@@ -857,32 +854,17 @@ gtk_spin_button_draw_arrow (GtkSpinButto
  	      shadow_type = GTK_SHADOW_OUT;
  	    }
  	}
@@ -69,7 +71,7 @@
  
        w = width / 2;
        w -= w % 2 - 1; /* force odd */
-@@ -1108,7 +1090,7 @@
+@@ -1062,7 +1044,7 @@ gtk_spin_button_button_press (GtkWidget 
  	  if (GTK_ENTRY (widget)->editable)
  	    gtk_spin_button_update (spin);
  	  
@@ -78,7 +80,7 @@
  	    {
  	      if (event->button == 1)
  		start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment);
-@@ -1143,44 +1125,11 @@
+@@ -1097,44 +1079,11 @@ gtk_spin_button_button_release (GtkWidge
  
    arrow_size = spin_button_get_arrow_size (spin);
  
@@ -121,7 +123,7 @@
 -      return TRUE;
 -    }
 -  else
--    return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
+-    return GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->button_release_event (widget, event);
 +  return TRUE;
  }
  
diff --git a/packages/gtk+/gtk+_2.10.6.bb b/packages/gtk+/gtk+_2.10.6.bb
index 30b6642988..f54ad6d683 100644
--- a/packages/gtk+/gtk+_2.10.6.bb
+++ b/packages/gtk+/gtk+_2.10.6.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups"
-PR = "r3"
+PR = "r4"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1" 
@@ -24,10 +24,10 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://disable-print.patch;patch=1 \
            file://hardcoded_libtool.patch;patch=1 \
            file://no-demos.patch;patch=1 \
-           file://pangoxft2.10.6.diff;patch=1"
+           file://pangoxft2.10.6.diff;patch=1 \
+	   file://single-click.patch;patch=1 \
+	   file://spinbutton.patch;patch=1"
 #           file://gtk+-handhelds.patch;patch=1
-#	   file://single-click.patch;patch=1
-#	   file://spinbutton.patch;patch=1 \
 
 inherit autotools pkgconfig