Merge lp:~cimi/overlay-scrollbar/fix-771511 into lp:overlay-scrollbar

[Andrea Cimitan]

the scrollbar's gdkwindow is not always the same of the toplevel, so the check for the active window may fail... let's get the toplevel, and check for the active window from it.

[Jason Smith (jassmith)]

+1 looks good and makes good sense

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-04-26 15:20:49 +0000
+++ os/os-scrollbar.c	2011-04-26 22:20:55 +0000
@@ -1197,7 +1197,7 @@
 
   if (gtk_widget_get_mapped (GTK_WIDGET (scrollbar)))
     {
-      if (gtk_widget_get_window (GTK_WIDGET (scrollbar)) ==
+      if (gtk_widget_get_window (gtk_widget_get_toplevel (GTK_WIDGET (scrollbar))) ==
           gdk_screen_get_active_window (gtk_widget_get_screen (GTK_WIDGET (scrollbar))))
         {
           /* stops potential running timeout. */
@@ -1666,7 +1666,7 @@
   priv->proximity = TRUE;
 
   /* on map, check for the active window. */
-  if (gtk_widget_get_window (widget) ==
+  if (gtk_widget_get_window (gtk_widget_get_toplevel (widget)) ==
       gdk_screen_get_active_window (gtk_widget_get_screen (widget)))
     {
       /* stops potential running timeout. */
 
=== modified file 'os/os-utils.c'
--- os/os-utils.c	2011-04-26 22:09:39 +0000
+++ os/os-utils.c	2011-04-26 22:20:55 +0000
@@ -37,11 +37,8 @@
     "Banshee",
     "codeblocks",
     "codelite",
-    "deja-dup",
     "eclipse",
     "gnucash",
-    "inkscape",
-    "lshw-gtk",
     "meld",
     "pgadmin3",
     "synaptic",