lp://staging/~attente/unity-gtk-module/1258669

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/unity-gtk-module/14.04 at revision 316

Charles Kerr (community): Approve on 2014-03-06

PS Jenkins bot (community): Approve (continuous-integration) on 2014-03-06

Diff: 45 lines (+28/-1)

1 file modified

lib/unity-gtk-menu-shell.c (+28/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1258669: Threaded Programs Hang When Disposing Dialogs Created Via the Global Menu

High

Fix Committed

Link a bug report

Related blueprints

317. By William Hua on 2014-03-06

Merge trunk.

316. By William Hua on 2014-03-06

Describe why the deadlock occurs.

315. By William Hua on 2014-03-03

Dispatch gtk_menu_item_activate () in a GDK idle.

314. By PS Jenkins bot on 2014-02-13

Releasing 0.0.0+14.04.20140213.2-0ubuntu1 (revision 313 from lp:unity-gtk-module).

Approved by PS Jenkins bot.

313. By William Hua on 2014-01-13

Remove our g_ptr_array_insert (), it's added in GLib 2.40.

Approved by PS Jenkins bot, Lars Uebernickel.

312. By William Hua on 2013-12-13

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. Fixes: https://bugs.launchpad.net/bugs/1198471.

Approved by Lars Uebernickel, PS Jenkins bot.

311. By William Hua on 2013-12-13

Use Multi-Arch: foreign in debian/control.

Approved by Sebastien Bacher, PS Jenkins bot.

310. By William Hua on 2013-12-13

Fix regression on GtkRecentChooserMenus. (LP: #1243974). Fixes: https://bugs.launchpad.net/bugs/1243974.

Approved by Ted Gould, PS Jenkins bot.

309. By PS Jenkins bot on 2013-11-25

Releasing 0.0.0+14.04.20131125-0ubuntu1 (revision 308 from lp:unity-gtk-module).

Approved by PS Jenkins bot.

308. By William Hua on 2013-11-18

Add a GSettings schema that allows the user to set a blacklist and whitelist for unity-gtk-module (LP: #1243413). Fixes: https://bugs.launchpad.net/bugs/1243413.

Approved by Charles Kerr, PS Jenkins bot.