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

[Andrea Cimitan]

Check if the widget is mapped before adding the map.
(In the review, please think about other possible checks I could add)

[Ted Gould (ted)]

review: Approve

=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2011-05-12 23:39:33 +0000
+++ os/os-thumb.c	2011-05-17 22:13:54 +0000
@@ -720,7 +720,7 @@
 
   priv->use_tolerance = FALSE;
 
-  if (priv->grabbed_widget != NULL)
+  if (priv->grabbed_widget != NULL && gtk_widget_get_mapped (priv->grabbed_widget))
     gtk_grab_add (priv->grabbed_widget);
 
   GTK_WIDGET_CLASS (os_thumb_parent_class)->unmap (widget);
@@ -754,14 +754,14 @@
   priv = thumb->priv;
 
   switch (prop_id)
-    {
-      case PROP_ORIENTATION:
-        g_value_set_enum (value, priv->orientation);
-        break;
+  {
+    case PROP_ORIENTATION:
+      g_value_set_enum (value, priv->orientation);
+      break;
 
-      default:
-        break;
-    }
+    default:
+      break;
+  }
 }
 
 static void
@@ -777,8 +777,9 @@
   priv = thumb->priv;
 
   switch (prop_id)
-    {
-      case PROP_ORIENTATION: {
+  {
+    case PROP_ORIENTATION:
+      {
         priv->orientation = g_value_get_enum (value);
         if (priv->orientation == GTK_ORIENTATION_VERTICAL)
           {
@@ -793,9 +794,9 @@
         break;
       }
 
-      default:
-        break;
-    }
+    default:
+      break;
+  }
 }
 
 /* Public functions. */