Merge lp:~mkhu/compiz/compiz.fix_1101648 into lp:compiz/0.9.10

[Micheal Hsu]

gtk-window-decorator: destroy action menu when any of the (close, min, max) buttons on the title bar is pressed

destroy action menu when any of the (close, min, max) buttons on the title bar is pressed

[Sam Spilsbury (smspillaz)]

Great, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'gtk/window-decorator/events.c'
--- gtk/window-decorator/events.c	2013-05-13 15:39:25 +0000
+++ gtk/window-decorator/events.c	2013-05-16 01:14:25 +0000
@@ -134,6 +134,13 @@
     decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
     guint   state = d->button_states[BUTTON_CLOSE];
 
+    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,
 			 BUTTON_CLOSE, 1, _("Close Window"));
 
@@ -156,6 +163,13 @@
     decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
     guint   state = d->button_states[BUTTON_MAX];
 
+    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))
 	common_button_event (win, gtkwd_event, gtkwd_type, BUTTON_MAX,
 			     3, _("Unmaximize Window"));
@@ -210,6 +224,13 @@
     decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
     guint   state = d->button_states[BUTTON_MIN];
 
+    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,
 			 BUTTON_MIN, 1, _("Minimize Window"));
 
@@ -991,9 +1012,9 @@
 	    GdkScreen  *g_screen = gdk_display_get_default_screen (gdkdisplay);
 	    Window     root = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (g_screen));
 	    WnckScreen *screen;
-	    
+
 	    screen = wnck_screen_get_for_root (root);
-	    
+
 	    if (screen)
 	    {
 		if (gwd_process_decor_shadow_property_update ())