Merge lp:~cimi/overlay-scrollbar/fix-window-group into lp:overlay-scrollbar

[Andrea Cimitan]

see commit message

[Ted Gould (ted)]

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-06-08 15:31:21 +0000
+++ os/os-scrollbar.c	2011-06-09 17:14:29 +0000
@@ -2224,10 +2224,10 @@
   scrollbar = OS_SCROLLBAR (widget);
   priv = scrollbar->priv;
 
+  GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->realize (widget);
+
   gtk_window_group_add_window (priv->window_group, GTK_WINDOW (gtk_widget_get_toplevel (widget)));
 
-  GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->realize (widget);
-
   gdk_window_set_events (gtk_widget_get_window (widget),
                          gdk_window_get_events (gtk_widget_get_window (widget)) |
                          GDK_POINTER_MOTION_MASK);
@@ -2365,6 +2365,7 @@
 static void
 os_scrollbar_unrealize (GtkWidget *widget)
 {
+  GList *window_group_list;
   OsScrollbar *scrollbar;
   OsScrollbarPrivate *priv;
 
@@ -2381,7 +2382,12 @@
 
   os_pager_set_parent (OS_PAGER (priv->pager), NULL);
 
-  gtk_window_group_remove_window (priv->window_group, GTK_WINDOW (gtk_widget_get_toplevel (widget)));
+  window_group_list = gtk_window_group_list_windows (priv->window_group);
+
+  if (g_list_find (window_group_list, gtk_widget_get_toplevel (widget)))
+    gtk_window_group_remove_window (priv->window_group, GTK_WINDOW (gtk_widget_get_toplevel (widget)));
+
+  g_list_free (window_group_list);
 
   GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->unrealize (widget);
 }