Merge lp:~mterry/appmenu-gtk/let-shotwell-be-free into lp:appmenu-gtk/0.4

[Michael Terry]

This is part of bug 649340. Once [1] and [2] are merged, shotwell will behave great with appmenus. So we can unblacklist it.

[1] lp:~mterry/dbusmenu/disconnect-when-done
[2] lp:~mterry/indicator-appmenu/less-racy-window-closing

=== modified file 'src/bridge.c'
--- src/bridge.c	2011-01-24 21:19:22 +0000
+++ src/bridge.c	2011-02-03 13:59:52 +0000
@@ -804,7 +804,6 @@
       || (g_strcmp0 (prg, "midori") == 0)
       || (g_strcmp0 (prg, "firefox-bin") == 0)
       || (g_strcmp0 (prg, "thunderbird-bin") == 0)
-      || (g_strcmp0 (prg, "shotwell") == 0)
       || (g_strcmp0 (prg, "gnome-panel") == 0))
     {
       return TRUE;