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

[William Hua]

Disable unity-gtk-module on non-Unity desktops.

Disable unity-gtk-module on non-Unity desktops.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'data/unity-gtk-module.conf'
--- data/unity-gtk-module.conf	2013-07-02 20:30:21 +0000
+++ data/unity-gtk-module.conf	2014-04-15 12:51:20 +0000
@@ -2,6 +2,14 @@
 
 start on starting dbus
 
+pre-start script
+    if [ "x$XDG_CURRENT_DESKTOP" != "xUnity" ]
+    then
+      stop
+      exit 0
+    fi
+end script
+
 script
     if [ -n "$GTK_MODULES" ]
     then
@@ -10,11 +18,5 @@
       GTK_MODULES="unity-gtk-module"
     fi
 
-    if [ -z "$UBUNTU_MENUPROXY" ]
-    then
-      UBUNTU_MENUPROXY=1
-    fi
-
     initctl set-env --global GTK_MODULES=$GTK_MODULES
-    initctl set-env --global UBUNTU_MENUPROXY=$UBUNTU_MENUPROXY
 end script