Merge lp:~cimi/overlay-scrollbar/fix-unity-restore-from-maximized into lp:overlay-scrollbar

[Andrea Cimitan]

using gdk_window_get_origin instead gdk_window_get_position

[Javier Jardón (jjardon)]

looks good

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-03-17 11:27:08 +0000
+++ os/os-scrollbar.c	2011-03-17 19:24:26 +0000
@@ -495,7 +495,7 @@
 
   priv = scrollbar->priv;
 
-  gdk_window_get_position (gtk_widget_get_window (priv->parent), &win_x, &win_y);
+  gdk_window_get_origin (gtk_widget_get_window (priv->parent), &win_x, &win_y);
 
   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
     {
@@ -1115,7 +1115,7 @@
                     {
                       gint x, y, x_pos, y_pos;
 
-                      gdk_window_get_position (gtk_widget_get_window (priv->parent), &x_pos, &y_pos);
+                      gdk_window_get_origin (gtk_widget_get_window (priv->parent), &x_pos, &y_pos);
 
                       x = priv->thumb_all.x;
                       y = CLAMP (xevent->xmotion.y - priv->slider.height / 2,
@@ -1151,7 +1151,7 @@
                     {
                       gint x, y, x_pos, y_pos;
 
-                      gdk_window_get_position (gtk_widget_get_window (priv->parent), &x_pos, &y_pos);
+                      gdk_window_get_origin (gtk_widget_get_window (priv->parent), &x_pos, &y_pos);
 
                       x = CLAMP (xevent->xmotion.x - priv->slider.width / 2,
                                  priv->thumb_all.x + priv->overlay.x,