Merge lp:~attente/unity-gtk-module/1198471 into lp:unity-gtk-module/14.04

[William Hua]

Relax the preconditions for disconnecting action groups from shells. (LP: #1198471)

If we have this situation:

  Menu A (action group G)
    Menu B (action group G)
      Menu C (action group G) <- about to be destroyed
        Menu D (action group G)
          Menu E (action group G)

and Menu C is destroyed, we get:

  Menu A (action group G)
    Menu B (action group G)
      Menu C (no action group)
        Menu D (no action group)
          Menu E (no action group)

So when Menu A is disconnected from G, this causes the warnings from LP: #1198471.

One thing we could have tried was just removing the tree rooted at Menu C, but then that would break removing the entire tree rooted at Menu A. Also, we'd have to end up doing this by having the Menu C unref itself.

It's really easiest to treat it as a dead sub-tree that will be finalized when the entire tree is finalized. Let's relax the preconditions on the unity_gtk_action_group_disconnect_item and unity_gtk_action_group_disconnect_shell functions, and allow the case where the shell's action group is already set to NULL.

Relax the preconditions for disconnecting action groups from shells. (LP: #1198471)

If we have this situation:

  Menu A (action group G)
    Menu B (action group G)
      Menu C (action group G) <- about to be destroyed
        Menu D (action group G)
          Menu E (action group G)

and Menu C is destroyed, we get:

  Menu A (action group G)
    Menu B (action group G)
      Menu C (no action group)
        Menu D (no action group)
          Menu E (no action group)

So when Menu A is disconnected from G, this causes the warnings from LP: #1198471.

One thing we could have tried was just removing the tree rooted at Menu C, but then that would break removing the entire tree rooted at Menu A. Also, we'd have to end up doing this by having the Menu C unref itself.

It's really easiest to treat it as a dead sub-tree that will be finalized when the entire tree is finalized. Let's relax the preconditions on the unity_gtk_action_group_disconnect_item and unity_gtk_action_group_disconnect_shell functions, and allow the case where the shell's action group is already set to NULL.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:311
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-trusty-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-trusty-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-gtk-module-ci/19/rebuild

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Makes sense to me. Thanks.

review: Approve

=== modified file 'lib/unity-gtk-action-group.c'
--- lib/unity-gtk-action-group.c	2013-02-19 11:55:57 +0000
+++ lib/unity-gtk-action-group.c	2013-11-27 16:49:57 +0000
@@ -903,7 +903,7 @@
 
   g_return_if_fail (UNITY_GTK_IS_ACTION_GROUP (group));
   g_return_if_fail (UNITY_GTK_IS_MENU_ITEM (item));
-  g_warn_if_fail (item->parent_shell != NULL && item->parent_shell->action_group == group);
+  g_warn_if_fail (item->parent_shell != NULL);
 
   action = item->action;
 
@@ -1027,7 +1027,7 @@
 
   g_return_if_fail (UNITY_GTK_IS_ACTION_GROUP (group));
   g_return_if_fail (UNITY_GTK_IS_MENU_SHELL (shell));
-  g_warn_if_fail (shell->action_group == group);
+  g_warn_if_fail (shell->action_group == NULL || shell->action_group == group);
 
   visible_indices = shell->visible_indices;
 

=== modified file 'src/main.c'
--- src/main.c	2013-11-15 19:54:04 +0000
+++ src/main.c	2013-11-27 16:49:57 +0000
@@ -613,9 +613,6 @@
 
   g_return_if_fail (GTK_IS_MENU_BAR (widget));
 
-  if (pre_hijacked_menu_bar_unrealize != NULL)
-    (* pre_hijacked_menu_bar_unrealize) (widget);
-
   menu_shell_data = gtk_menu_shell_get_menu_shell_data (GTK_MENU_SHELL (widget));
 
   if (menu_shell_data->settings_notify_gtk_shell_shows_menubar_handler_id)
@@ -626,6 +623,9 @@
 
   if (menu_shell_data->window != NULL)
     gtk_window_disconnect_menu_shell (menu_shell_data->window, GTK_MENU_SHELL (widget));
+
+  if (pre_hijacked_menu_bar_unrealize != NULL)
+    (* pre_hijacked_menu_bar_unrealize) (widget);
 }
 
 static void