Merge lp:~bregma/libgrip/lp-872022 into lp:libgrip

[Stephen M. Webb]

Removes multiple deletes of an object due to a signal handler being called
multiple times when it should be called only once when walking backward up the
container-widget tree as it's created.

Fixed lp:872022. See bug description for steps to reproduce the problem.

[Jussi Pakkanen (jpakkane)]

I can't claim that I fully understand the total logic flow between GTK and libgrip, but Stephen's explanation on IRC was reasonable and this fixes a serious bug without side-effects so approving.

review: Approve

=== modified file 'src/gripgesturemanager.c'
--- src/gripgesturemanager.c	2011-10-06 19:38:39 +0000
+++ src/gripgesturemanager.c	2012-05-29 20:51:17 +0000
@@ -1253,12 +1253,12 @@
       GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
       GripRegistrationRequest *req = (GripRegistrationRequest *)user_data;
 
+      g_signal_handlers_disconnect_by_func (widget,
+                                            G_CALLBACK (toplevel_notify_cb),
+                                            user_data);
+
       if (gtk_widget_is_toplevel (toplevel))
         {
-          g_signal_handlers_disconnect_by_func (widget,
-                                                G_CALLBACK (toplevel_notify_cb),
-                                                user_data);
-
           if (gtk_widget_get_mapped (GTK_WIDGET (toplevel)))
             {
               register_internal (req->manager,