Merge lp:~jjardon/overlay-scrollbar/ayatana-scrollbar into lp:overlay-scrollbar

[Javier Jardón]

Little performance optimizations: Do not use G_TYPE_INSTANCE_GET_PRIVATE() macro all the time, but a private pointer instead

[Andrea Cimitan (cimi)]

seems fine, approved and thx

review: Approve

=== modified file 'os/os-pager.c'
--- os/os-pager.c	2011-03-09 18:05:48 +0000
+++ os/os-pager.c	2011-03-14 16:04:37 +0000
@@ -28,10 +28,6 @@
 #include <gdk/gdkx.h>
 #include "os-private.h"
 
-#define OS_PAGER_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OS_TYPE_PAGER, OsPagerPrivate))
-
-typedef struct _OsPagerPrivate OsPagerPrivate;
 
 struct _OsPagerPrivate {
   GdkWindow *pager_window;
@@ -59,7 +55,7 @@
 {
   OsPagerPrivate *priv;
 
-  priv = OS_PAGER_GET_PRIVATE (pager);
+  priv = pager->priv;
 
   if (priv->pager_window != NULL)
     {
@@ -95,7 +91,7 @@
   OsPagerPrivate *priv;
   GtkStyle *style;
 
-  priv = OS_PAGER_GET_PRIVATE (pager);
+  priv = pager->priv;
 
   style = gtk_widget_get_style (priv->parent);
 
@@ -113,7 +109,7 @@
   GdkBitmap *bitmap;
   OsPagerPrivate *priv;
 
-  priv = OS_PAGER_GET_PRIVATE (pager);
+  priv = pager->priv;
 
   bitmap = gdk_pixmap_new (NULL, MAX (1, priv->mask.width),
                            MAX (1, priv->mask.height), 1);
@@ -169,7 +165,10 @@
   GdkRectangle allocation, mask;
   OsPagerPrivate *priv;
 
-  priv = OS_PAGER_GET_PRIVATE (pager);
+  pager->priv = G_TYPE_INSTANCE_GET_PRIVATE (pager,
+                                             OS_TYPE_PAGER,
+                                             OsPagerPrivate);
+  priv = pager->priv;
 
   allocation.x = 0;
   allocation.y = 0;
@@ -229,7 +228,7 @@
 
   g_return_if_fail (OS_PAGER (pager));
 
-  priv = OS_PAGER_GET_PRIVATE (pager);
+  priv = pager->priv;
 
   priv->visible = FALSE;
 
@@ -254,7 +253,7 @@
 
   g_return_if_fail (OS_PAGER (pager));
 
-  priv = OS_PAGER_GET_PRIVATE (pager);
+  priv = pager->priv;
 
   priv->mask = mask;
 
@@ -279,7 +278,7 @@
 
   g_return_if_fail (OS_PAGER (pager));
 
-  priv = OS_PAGER_GET_PRIVATE (pager);
+  priv = pager->priv;
 
   if (priv->active != active)
     {
@@ -307,7 +306,7 @@
 
   g_return_if_fail (OS_PAGER (pager));
 
-  priv = OS_PAGER_GET_PRIVATE (pager);
+  priv = pager->priv;
 
   if (priv->parent != NULL)
     {
@@ -348,7 +347,7 @@
 
   g_return_if_fail (OS_PAGER (pager));
 
-  priv = OS_PAGER_GET_PRIVATE (pager);
+  priv = pager->priv;
 
   priv->visible = TRUE;
 
@@ -373,7 +372,7 @@
 
   g_return_if_fail (OS_PAGER (pager));
 
-  priv = OS_PAGER_GET_PRIVATE (pager);
+  priv = pager->priv;
 
   priv->allocation = rectangle;
 

=== modified file 'os/os-private.h'
--- os/os-private.h	2011-03-08 11:35:48 +0000
+++ os/os-private.h	2011-03-14 16:04:37 +0000
@@ -104,10 +104,13 @@
   (G_TYPE_INSTANCE_GET_CLASS ((obj),  OS_TYPE_THUMB, OsThumbClass))
 
 typedef struct _OsThumb      OsThumb;
+typedef struct _OsThumbPrivate OsThumbPrivate;
 typedef struct _OsThumbClass OsThumbClass;
 
 struct _OsThumb {
   GtkWindow parent_object;
+
+  OsThumbPrivate *priv;
 };
 
 struct _OsThumbClass {
@@ -133,10 +136,13 @@
   (G_TYPE_INSTANCE_GET_CLASS ((obj),  OS_TYPE_PAGER, OsPagerClass))
 
 typedef struct _OsPager OsPager;
+typedef struct _OsPagerPrivate OsPagerPrivate;
 typedef struct _OsPagerClass OsPagerClass;
 
 struct _OsPager {
   GObject parent_instance;
+
+  OsPagerPrivate *priv;
 };
 
 struct _OsPagerClass {

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-03-11 11:17:56 +0000
+++ os/os-scrollbar.c	2011-03-14 16:04:37 +0000
@@ -41,11 +41,6 @@
 /* Timeout before hiding in milliseconds. */
 #define TIMEOUT_HIDE 1000
 
-#define OS_SCROLLBAR_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OS_TYPE_SCROLLBAR, OsScrollbarPrivate))
-
-typedef struct _OsScrollbarPrivate OsScrollbarPrivate;
-
 struct _OsScrollbarPrivate
 {
   GdkRectangle trough;
@@ -178,7 +173,7 @@
 {
   OsScrollbarPrivate *priv;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
     {
@@ -265,7 +260,7 @@
 {
   OsScrollbarPrivate *priv;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
     {
@@ -325,7 +320,7 @@
   gint    trough_start;
   gint    slider_length;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
     {
@@ -361,7 +356,7 @@
 {
   OsScrollbarPrivate *priv;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   if (priv->can_hide)
     {
@@ -391,7 +386,7 @@
   gint c;
   gdouble new_value;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
     delta = mouse_y - priv->slide_initial_coordinate;
@@ -412,7 +407,7 @@
 {
   OsScrollbarPrivate *priv;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   gtk_window_move (GTK_WINDOW (priv->thumb),
                    os_scrollbar_sanitize_x (scrollbar, x),
@@ -423,24 +418,28 @@
 os_scrollbar_notify_adjustment_cb (GObject *object,
                                    gpointer user_data)
 {
+  OsScrollbar *scrollbar;
   OsScrollbarPrivate *priv;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (OS_SCROLLBAR (object));
+  scrollbar = OS_SCROLLBAR (object);
+  priv = scrollbar->priv;
 
-  os_scrollbar_swap_adjustment (OS_SCROLLBAR (object), gtk_range_get_adjustment (GTK_RANGE (object)));
+  os_scrollbar_swap_adjustment (scrollbar, gtk_range_get_adjustment (GTK_RANGE (object)));
 }
 
 static void
 os_scrollbar_notify_orientation_cb (GObject *object,
                                     gpointer user_data)
 {
+  OsScrollbar *scrollbar;
   OsScrollbarPrivate *priv;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (OS_SCROLLBAR (object));
+  scrollbar = OS_SCROLLBAR (object);
+  priv = scrollbar->priv;
 
   priv->orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (object));
 
-  os_scrollbar_swap_thumb (OS_SCROLLBAR (object), os_thumb_new (priv->orientation));
+  os_scrollbar_swap_thumb (scrollbar, os_thumb_new (priv->orientation));
 }
 
 static gint
@@ -450,7 +449,7 @@
   OsScrollbarPrivate *priv;
   gint screen_width;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   /* FIXME we could store screen_width in priv
    * and change it at screen-changed signal */
@@ -472,7 +471,7 @@
   OsScrollbarPrivate *priv;
   gint screen_height;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   /* FIXME we could store screen_height in priv
    * and change it at screen-changed signal */
@@ -494,7 +493,7 @@
   OsScrollbarPrivate *priv;
   gint win_x, win_y;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   gdk_window_get_position (gtk_widget_get_window (priv->parent), &win_x, &win_y);
 
@@ -515,7 +514,9 @@
 os_scrollbar_swap_adjustment (OsScrollbar   *scrollbar,
                               GtkAdjustment *adjustment)
 {
-  OsScrollbarPrivate *priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  OsScrollbarPrivate *priv;
+
+  priv = scrollbar->priv;
 
   if (priv->adjustment != NULL)
     {
@@ -545,7 +546,9 @@
 os_scrollbar_swap_parent (OsScrollbar *scrollbar,
                           GtkWidget   *parent)
 {
-  OsScrollbarPrivate *priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  OsScrollbarPrivate *priv;
+
+  priv = scrollbar->priv;
 
   if (priv->parent != NULL)
     {
@@ -579,7 +582,9 @@
 os_scrollbar_swap_thumb (OsScrollbar *scrollbar,
                          GtkWidget   *thumb)
 {
-  OsScrollbarPrivate *priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  OsScrollbarPrivate *priv;
+
+  priv = scrollbar->priv;
 
   if (priv->thumb != NULL)
     {
@@ -629,7 +634,7 @@
           OsScrollbarPrivate *priv;
 
           scrollbar = OS_SCROLLBAR (user_data);
-          priv = OS_SCROLLBAR_GET_PRIVATE (OS_SCROLLBAR (scrollbar));
+          priv = scrollbar->priv;
 
 /*          os_scrollbar_map (widget);*/
           gtk_window_set_transient_for (GTK_WINDOW (widget), GTK_WINDOW (gtk_widget_get_toplevel (priv->parent)));
@@ -672,7 +677,7 @@
           OsScrollbarPrivate *priv;
 
           scrollbar = OS_SCROLLBAR (user_data);
-          priv = OS_SCROLLBAR_GET_PRIVATE (OS_SCROLLBAR (scrollbar));
+          priv = scrollbar->priv;
 
           gtk_window_set_transient_for (GTK_WINDOW (widget), NULL);
 
@@ -715,7 +720,7 @@
   OsScrollbarPrivate *priv;
 
   scrollbar = OS_SCROLLBAR (user_data);
-  priv = OS_SCROLLBAR_GET_PRIVATE (OS_SCROLLBAR (scrollbar));
+  priv = scrollbar->priv;
 
   priv->enter_notify_event = TRUE;
   priv->can_hide = FALSE;
@@ -732,7 +737,7 @@
   OsScrollbarPrivate *priv;
 
   scrollbar = OS_SCROLLBAR (user_data);
-  priv = OS_SCROLLBAR_GET_PRIVATE (OS_SCROLLBAR (scrollbar));
+  priv = scrollbar->priv;
 
   if (!priv->button_press_event)
     priv->can_hide = TRUE;
@@ -752,7 +757,7 @@
   OsScrollbarPrivate *priv;
 
   scrollbar = OS_SCROLLBAR (user_data);
-  priv = OS_SCROLLBAR_GET_PRIVATE (OS_SCROLLBAR (scrollbar));
+  priv = scrollbar->priv;
 
   /* XXX improve speed by not rendering when moving */
   if (priv->button_press_event)
@@ -850,7 +855,7 @@
   GdkRectangle mask;
   OsScrollbarPrivate *priv;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
     {
@@ -877,7 +882,7 @@
   GdkRectangle rect;
   OsScrollbarPrivate *priv;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
     {
@@ -902,7 +907,7 @@
 {
   OsScrollbarPrivate *priv;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   if (gdk_screen_get_active_window (gtk_widget_get_screen (priv->parent)) !=
       gtk_widget_get_window (priv->parent))
@@ -919,7 +924,7 @@
   OsScrollbarPrivate *priv;
 
   scrollbar = OS_SCROLLBAR (user_data);
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   /* FIXME(Cimi) we should control each time os_pager_show()/hide()
    * is called here and in map()/unmap().
@@ -949,7 +954,7 @@
   OsScrollbarPrivate *priv;
 
   scrollbar = OS_SCROLLBAR (user_data);
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   os_scrollbar_calc_layout_pager (scrollbar, adjustment->value);
   os_scrollbar_calc_layout_slider (scrollbar, adjustment->value);
@@ -968,7 +973,7 @@
   OsScrollbarPrivate *priv;
 
   scrollbar = OS_SCROLLBAR (user_data);
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   if (priv->filter == FALSE && priv->proximity == TRUE)
     {
@@ -997,7 +1002,7 @@
   OsScrollbarPrivate *priv;
 
   scrollbar = OS_SCROLLBAR (user_data);
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   priv->trough.x = 0;
   priv->trough.y = 0;
@@ -1043,7 +1048,7 @@
   OsScrollbarPrivate *priv;
 
   scrollbar = OS_SCROLLBAR (user_data);
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   /* FIXME(Cimi) check if
    * gtk_widget_get_window (priv->parent) and
@@ -1069,7 +1074,7 @@
   OsScrollbarPrivate *priv;
 
   scrollbar = OS_SCROLLBAR (user_data);
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   gtk_widget_hide (GTK_WIDGET (priv->thumb));
 
@@ -1101,7 +1106,7 @@
 
   scrollbar = OS_SCROLLBAR (user_data);
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
   xevent = gdkxevent;
 
   g_return_val_if_fail (priv->parent != NULL, GDK_FILTER_CONTINUE);
@@ -1222,7 +1227,7 @@
   OsScrollbarPrivate *priv;
 
   scrollbar = OS_SCROLLBAR (user_data);
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  priv = scrollbar->priv;
 
   g_timeout_add (TIMEOUT_HIDE, os_scrollbar_hide_thumb_cb,
                  g_object_ref (scrollbar));
@@ -1263,7 +1268,10 @@
 {
   OsScrollbarPrivate *priv;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+  scrollbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (scrollbar,
+                                                 OS_TYPE_SCROLLBAR,
+                                                 OsScrollbarPrivate);
+  priv = scrollbar->priv;
 
   priv->can_hide = TRUE;
   priv->can_rgba = FALSE;
@@ -1289,11 +1297,15 @@
 static void
 os_scrollbar_finalize (GObject *object)
 {
-  OsScrollbarPrivate *priv = OS_SCROLLBAR_GET_PRIVATE (object);
-
-  os_scrollbar_swap_adjustment (OS_SCROLLBAR (object), NULL);
-  os_scrollbar_swap_parent (OS_SCROLLBAR (object), NULL);
-  os_scrollbar_swap_thumb (OS_SCROLLBAR (object), NULL);
+  OsScrollbar *scrollbar;
+  OsScrollbarPrivate *priv;
+
+  scrollbar = OS_SCROLLBAR (object);
+  priv = scrollbar->priv;
+
+  os_scrollbar_swap_adjustment (scrollbar, NULL);
+  os_scrollbar_swap_parent (scrollbar, NULL);
+  os_scrollbar_swap_thumb (scrollbar, NULL);
 
   if (priv->pager != NULL)
     {
@@ -1320,15 +1332,17 @@
 static void
 os_scrollbar_map (GtkWidget *widget)
 {
+  OsScrollbar *scrollbar;
   OsScrollbarPrivate *priv;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (OS_SCROLLBAR (widget));
+  scrollbar = OS_SCROLLBAR (widget);
+  priv = scrollbar->priv;
 
   GTK_WIDGET_CLASS (os_scrollbar_parent_class)->map (widget);
 
   priv->proximity = TRUE;
 
-  pager_set_state (OS_SCROLLBAR (widget));
+  pager_set_state (scrollbar);
 
   if (priv->fullsize == FALSE)
     os_pager_show (OS_PAGER (priv->pager));
@@ -1336,7 +1350,7 @@
   if (gtk_widget_get_realized (priv->parent) && priv->filter == FALSE)
     {
       priv->filter = TRUE;
-      gdk_window_add_filter (gtk_widget_get_window (priv->parent), toplevel_filter_func, OS_SCROLLBAR (widget));
+      gdk_window_add_filter (gtk_widget_get_window (priv->parent), toplevel_filter_func, scrollbar);
     }
 
 #if 0
@@ -1411,9 +1425,11 @@
 static void
 os_scrollbar_unmap (GtkWidget *widget)
 {
+  OsScrollbar *scrollbar;
   OsScrollbarPrivate *priv;
 
-  priv = OS_SCROLLBAR_GET_PRIVATE (OS_SCROLLBAR (widget));
+  scrollbar = OS_SCROLLBAR (widget);
+  priv = scrollbar->priv;
 
   GTK_WIDGET_CLASS (os_scrollbar_parent_class)->unmap (widget);
 
@@ -1424,7 +1440,7 @@
   if (gtk_widget_get_realized (priv->parent) && priv->filter == TRUE)
     {
       priv->filter = FALSE;
-      gdk_window_remove_filter (gtk_widget_get_window (priv->parent), toplevel_filter_func, OS_SCROLLBAR (widget));
+      gdk_window_remove_filter (gtk_widget_get_window (priv->parent), toplevel_filter_func, scrollbar);
     }
 }
 

=== modified file 'os/os-scrollbar.h'
--- os/os-scrollbar.h	2011-03-02 15:29:56 +0000
+++ os/os-scrollbar.h	2011-03-14 16:04:37 +0000
@@ -44,10 +44,13 @@
   (G_TYPE_INSTANCE_GET_CLASS ((obj), OS_TYPE_SCROLLBAR, OsScrollbarClass))
 
 typedef struct _OsScrollbar      OsScrollbar;
+typedef struct _OsScrollbarPrivate OsScrollbarPrivate;
 typedef struct _OsScrollbarClass OsScrollbarClass;
 
 struct _OsScrollbar {
   GtkScrollbar parent_object;
+
+  OsScrollbarPrivate *priv;
 };
 
 struct _OsScrollbarClass {

=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2011-03-03 18:02:45 +0000
+++ os/os-thumb.c	2011-03-14 16:04:37 +0000
@@ -30,11 +30,6 @@
 #define DEFAULT_THUMB_WIDTH  15
 #define DEFAULT_THUMB_HEIGHT 80
 
-#define OS_THUMB_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OS_TYPE_THUMB, OsThumbPrivate))
-
-typedef struct _OsThumbPrivate OsThumbPrivate;
-
 struct _OsThumbPrivate {
   GtkOrientation orientation;
   gboolean button_press_event;
@@ -137,7 +132,10 @@
 {
   OsThumbPrivate *priv;
 
-  priv = OS_THUMB_GET_PRIVATE (thumb);
+  thumb->priv = G_TYPE_INSTANCE_GET_PRIVATE (thumb,
+                                             OS_TYPE_THUMB,
+                                             OsThumbPrivate);
+  priv = thumb->priv;
 
   priv->can_hide = TRUE;
   priv->can_rgba = FALSE;
@@ -178,9 +176,11 @@
     {
       if (event->button == 1)
         {
+          OsThumb *thumb;
           OsThumbPrivate *priv;
 
-          priv = OS_THUMB_GET_PRIVATE (OS_THUMB (widget));
+          thumb = OS_THUMB (widget);
+          priv = thumb->priv;
 
           priv->pointer_x = event->x;
           priv->pointer_y = event->y;
@@ -201,9 +201,11 @@
     {
       if (event->button == 1)
         {
+          OsThumb *thumb;
           OsThumbPrivate *priv;
 
-          priv = OS_THUMB_GET_PRIVATE (OS_THUMB (widget));
+          thumb = OS_THUMB (widget);
+          priv = thumb->priv;
 
           priv->button_press_event = FALSE;
           priv->motion_notify_event = FALSE;
@@ -222,9 +224,11 @@
 
   if (gdk_screen_is_composited (screen))
     {
+      OsThumb *thumb;
       OsThumbPrivate *priv;
 
-      priv = OS_THUMB_GET_PRIVATE (OS_THUMB (widget));
+      thumb = OS_THUMB (widget);
+      priv = thumb->priv;
 
       priv->can_rgba = TRUE;
     }
@@ -236,9 +240,11 @@
 os_thumb_enter_notify_event (GtkWidget        *widget,
                              GdkEventCrossing *event)
 {
+  OsThumb *thumb;
   OsThumbPrivate *priv;
 
-  priv = OS_THUMB_GET_PRIVATE (OS_THUMB (widget));
+  thumb = OS_THUMB (widget);
+  priv = thumb->priv;
 
   priv->enter_notify_event = TRUE;
   priv->can_hide = FALSE;
@@ -252,13 +258,15 @@
 {
   GtkAllocation allocation;
   GtkStateType state_type_down, state_type_up;
+  OsThumb *thumb;
   OsThumbPrivate *priv;
   cairo_pattern_t *pat;
   cairo_t *cr;
   gint x, y, width, height;
   gint radius;
 
-  priv = OS_THUMB_GET_PRIVATE (OS_THUMB (widget));
+  thumb = OS_THUMB (widget);
+  priv = thumb->priv;;
 
   state_type_down = GTK_STATE_NORMAL;
   state_type_up = GTK_STATE_NORMAL;
@@ -455,9 +463,11 @@
 os_thumb_leave_notify_event (GtkWidget        *widget,
                              GdkEventCrossing *event)
 {
+  OsThumb *thumb;
   OsThumbPrivate *priv;
 
-  priv = OS_THUMB_GET_PRIVATE (OS_THUMB (widget));
+  thumb = OS_THUMB (widget);
+  priv = thumb->priv;
 
   if (!priv->button_press_event)
     priv->can_hide = TRUE;
@@ -471,9 +481,11 @@
 os_thumb_motion_notify_event (GtkWidget      *widget,
                               GdkEventMotion *event)
 {
+  OsThumb *thumb;
   OsThumbPrivate *priv;
 
-  priv = OS_THUMB_GET_PRIVATE (OS_THUMB (widget));
+  thumb = OS_THUMB (widget);
+  priv = thumb->priv;
 
   if (priv->button_press_event)
     {
@@ -521,9 +533,11 @@
                        GValue     *value,
                        GParamSpec *pspec)
 {
+  OsThumb *thumb;
   OsThumbPrivate *priv;
 
-  priv = OS_THUMB_GET_PRIVATE (OS_THUMB (object));
+  thumb = OS_THUMB (object);
+  priv = thumb->priv;
 
   switch (prop_id)
     {
@@ -542,9 +556,11 @@
                        const GValue *value,
                        GParamSpec   *pspec)
 {
+  OsThumb *thumb;
   OsThumbPrivate *priv;
 
-  priv = OS_THUMB_GET_PRIVATE (OS_THUMB (object));
+  thumb = OS_THUMB (object);
+  priv = thumb->priv;
 
   switch (prop_id)
     {