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

[William Hua]

Freeciv uses multiple menu bars in its UI. When unity-gtk-module tries to export its menus, it becomes really cramped in the global menu to the point of being unusable. It's better to allow Freeciv to keep its menus where they are in this case.

Freeciv uses multiple menu bars in its UI. When unity-gtk-module tries to export its menus, it becomes really cramped in the global menu to the point of being unusable. It's better to allow Freeciv to keep its menus where they are in this case.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:306
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/15/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-trusty-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-trusty-armhf-ci/1/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-gtk-module-ci/15/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

Looks like Jenkins hiccuped again. Rebuilding.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-gtk-module-ci/16/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/main.c'
--- src/main.c	2013-03-14 17:09:54 +0000
+++ src/main.c	2013-10-22 21:26:14 +0000
@@ -99,6 +99,8 @@
          g_strcmp0 (name, "emacs23-lucid") == 0 ||
          g_strcmp0 (name, "emacs24") == 0 ||
          g_strcmp0 (name, "emacs24-lucid") == 0 ||
+         g_strcmp0 (name, "freeciv") == 0 ||
+         g_strcmp0 (name, "freeciv-gtk2") == 0 ||
          g_strcmp0 (name, "glade") == 0 ||
          g_strcmp0 (name, "gwyddion") == 0;
 }