From 74457246bd9b7ccf020e242d0daab56bdbaac7f6 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Wed, 5 Dec 2007 09:49:37 +0000
Subject: gtk: update 2.12.2 to 2.12.3

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3309 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../gtk+/gtk+-2.12.2/range-no-redraw.patch         | 127 ---------------------
 1 file changed, 127 deletions(-)
 delete mode 100644 meta/packages/gtk+/gtk+-2.12.2/range-no-redraw.patch

(limited to 'meta/packages/gtk+/gtk+-2.12.2/range-no-redraw.patch')

diff --git a/meta/packages/gtk+/gtk+-2.12.2/range-no-redraw.patch b/meta/packages/gtk+/gtk+-2.12.2/range-no-redraw.patch
deleted file mode 100644
index 14387b8a2..000000000
--- a/meta/packages/gtk+/gtk+-2.12.2/range-no-redraw.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-5f084ea0849d5967a3c22821542ecaaa8accb398
-diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
-index bd95351..64e0e59 100644
---- gtk/gtkrange.c
-+++ gtk/gtkrange.c
-@@ -109,6 +109,8 @@ struct _GtkRangeLayout
-   GtkSensitivityType upper_sensitivity;
- 
-   gdouble fill_level;
-+
-+  guint motion_idle_id;
- };
- 
- 
-@@ -205,6 +207,8 @@ static gboolean      gtk_range_real_change_value        (GtkRange      *range,
- static void          gtk_range_update_value             (GtkRange      *range);
- static gboolean      gtk_range_key_press                (GtkWidget     *range,
- 							 GdkEventKey   *event);
-+static void          gtk_range_add_motion_idle          (GtkRange *range);
-+static void          gtk_range_remove_motion_idle       (GtkRange *range);
- 
- 
- static guint signals[LAST_SIGNAL];
-@@ -1167,6 +1171,7 @@ gtk_range_destroy (GtkObject *object)
- 
-   gtk_range_remove_step_timer (range);
-   gtk_range_remove_update_timer (range);
-+  gtk_range_remove_motion_idle (range);
-   
-   if (range->adjustment)
-     {
-@@ -1276,6 +1281,7 @@ gtk_range_unrealize (GtkWidget *widget)
- 
-   gtk_range_remove_step_timer (range);
-   gtk_range_remove_update_timer (range);
-+  gtk_range_remove_motion_idle (range);
-   
-   gdk_window_set_user_data (range->event_window, NULL);
-   gdk_window_destroy (range->event_window);
-@@ -2165,7 +2171,7 @@ gtk_range_motion_notify (GtkWidget      *widget,
-     gtk_widget_queue_draw (widget);
- 
-   if (range->layout->grab_location == MOUSE_SLIDER)
--    update_slider_position (range, x, y);
-+    gtk_range_add_motion_idle (range);
- 
-   /* We handled the event if the mouse was in the range_rect */
-   return range->layout->mouse_location != MOUSE_OUTSIDE;
-@@ -3335,9 +3341,10 @@ initial_timeout (gpointer data)
-   g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
- 
-   range = GTK_RANGE (data);
--  range->timer->timeout_id = gdk_threads_add_timeout (timeout * SCROLL_DELAY_FACTOR,
--                                            second_timeout,
--                                            range);
-+  range->timer->timeout_id =
-+    gdk_threads_add_timeout (timeout * SCROLL_DELAY_FACTOR,
-+                             second_timeout,
-+                             range);
-   /* remove self */
-   return FALSE;
- }
-@@ -3357,9 +3364,8 @@ gtk_range_add_step_timer (GtkRange      *range,
- 
-   range->timer = g_new (GtkRangeStepTimer, 1);
- 
--  range->timer->timeout_id = gdk_threads_add_timeout (timeout,
--                                            initial_timeout,
--                                            range);
-+  range->timer->timeout_id =
-+    gdk_threads_add_timeout (timeout, initial_timeout, range);
-   range->timer->step = step;
- 
-   gtk_range_scroll (range, range->timer->step);
-@@ -3397,9 +3403,8 @@ gtk_range_reset_update_timer (GtkRange *range)
- {
-   gtk_range_remove_update_timer (range);
- 
--  range->update_timeout_id = gdk_threads_add_timeout (UPDATE_DELAY,
--                                            update_timeout,
--                                            range);
-+  range->update_timeout_id =
-+    gdk_threads_add_timeout (UPDATE_DELAY, update_timeout, range);
- }
- 
- static void
-@@ -3412,5 +3417,40 @@ gtk_range_remove_update_timer (GtkRange *range)
-     }
- }
- 
-+static gboolean
-+motion_idle (gpointer data)
-+{
-+  GtkRange *range = data;
-+  GtkRangeLayout *layout = range->layout;
-+
-+  update_slider_position (range, layout->mouse_x, layout->mouse_y); 
-+
-+  layout->motion_idle_id = 0;
-+
-+  return FALSE;
-+}
-+
-+static void
-+gtk_range_add_motion_idle (GtkRange *range)
-+{
-+  if (!range->layout->motion_idle_id)
-+    {
-+      range->layout->motion_idle_id =
-+        gdk_threads_add_idle_full (GDK_PRIORITY_REDRAW,
-+                                   motion_idle, range,
-+                                   NULL);
-+    }
-+}
-+
-+static void
-+gtk_range_remove_motion_idle (GtkRange *range)
-+{
-+  if (range->layout->motion_idle_id != 0)
-+    {
-+      g_source_remove (range->layout->motion_idle_id);
-+      range->layout->motion_idle_id = 0;
-+    }
-+}
-+
- #define __GTK_RANGE_C__
- #include "gtkaliasdef.c"
-- 
cgit v1.2.3