Merge lp:~3v1n0/compiz/gtk-decorator-finalize-menu-0.9.10 into lp:compiz/0.9.10

[Marco Trevisan (Treviño)]

ActionMenu: weak ref the action menu on creation, and unref it on destroy

Also, now the widget destruction automatically unset the menu.
This makes the object to be correctly finalized (not only disposed) making sure
the internal idle into WnckActionMenu gets stopped.

Backporting lp:~3v1n0/compiz/gtk-decorator-finalize-menu...

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3793
http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-team-compiz-0.9.10-saucy-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-team-compiz-0.9.10-ci/14/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3793
http://jenkins.qa.ubuntu.com/job/compiz-0.9.10-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.10-saucy-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.10-saucy-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.10-saucy-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-0.9.10-ci/4/rebuild

review: Approve (continuous-integration)

=== modified file 'gtk/window-decorator/actionmenu.c'
--- gtk/window-decorator/actionmenu.c	2012-11-09 01:21:17 +0000
+++ gtk/window-decorator/actionmenu.c	2013-09-27 18:18:05 +0000
@@ -28,6 +28,16 @@
 }
 
 static void
+action_menu_destroyed (GObject *object)
+{
+    g_signal_handlers_disconnect_by_func (action_menu, action_menu_destroyed, NULL);
+    g_signal_handlers_disconnect_by_func (action_menu, action_menu_unmap, NULL);
+    g_object_unref (action_menu);
+    action_menu = NULL;
+    action_menu_mapped = FALSE;
+}
+
+static void
 position_action_menu (GtkMenu  *menu,
 		      gint     *x,
 		      gint     *y,
@@ -77,8 +87,6 @@
 	if (action_menu_mapped)
 	{
 	    gtk_widget_destroy (action_menu);
-	    action_menu_mapped = FALSE;
-	    action_menu = NULL;
 	    return;
 	}
 	else
@@ -105,13 +113,15 @@
 	break;
     }
 
-    action_menu = wnck_create_window_action_menu (win);
+    action_menu = wnck_action_menu_new (win);
+    g_object_ref_sink (action_menu);
 
     gtk_menu_set_screen (GTK_MENU (action_menu), screen);
 
-    g_signal_connect_object (G_OBJECT (action_menu), "unmap",
-			     G_CALLBACK (action_menu_unmap),
-			     0, 0);
+    g_signal_connect (G_OBJECT (action_menu), "destroy",
+		      G_CALLBACK (action_menu_destroyed), NULL);
+    g_signal_connect (G_OBJECT (action_menu), "unmap",
+		      G_CALLBACK (action_menu_unmap), NULL);
 
     gtk_widget_show (action_menu);
 
 
=== modified file 'gtk/window-decorator/events.c'
--- gtk/window-decorator/events.c	2013-05-15 22:50:49 +0000
+++ gtk/window-decorator/events.c	2013-09-27 18:18:05 +0000
@@ -45,8 +45,6 @@
     if (action_menu_mapped)
     {
 	gtk_object_destroy (GTK_OBJECT (action_menu));
-	action_menu_mapped = FALSE;
-	action_menu = NULL;
 	return;
     }
 
@@ -137,8 +135,6 @@
     if (action_menu_mapped && gtkwd_type == GButtonPress)
     {
 	gtk_object_destroy (GTK_OBJECT (action_menu));
-	action_menu_mapped = FALSE;
-	action_menu = NULL;
     }
 
     common_button_event (win, gtkwd_event, gtkwd_type,
@@ -166,8 +162,6 @@
     if (action_menu_mapped && gtkwd_type == GButtonPress)
     {
 	gtk_object_destroy (GTK_OBJECT (action_menu));
-	action_menu_mapped = FALSE;
-	action_menu = NULL;
     }
 
     if (wnck_window_is_maximized (win))
@@ -227,8 +221,6 @@
     if (action_menu_mapped && gtkwd_type == GButtonPress)
     {
 	gtk_object_destroy (GTK_OBJECT (action_menu));
-	action_menu_mapped = FALSE;
-	action_menu = NULL;
     }
 
     common_button_event (win, gtkwd_event, gtkwd_type,
 
=== modified file 'gtk/window-decorator/wnck.c'
--- gtk/window-decorator/wnck.c	2013-05-13 15:39:25 +0000
+++ gtk/window-decorator/wnck.c	2013-09-27 18:18:05 +0000
@@ -255,8 +255,6 @@
     if (action_menu_mapped)
     {
 	gtk_object_destroy (GTK_OBJECT (action_menu));
-	action_menu_mapped = FALSE;
-	action_menu = NULL;
 	return;
     }