clean up, compacting, aesthetics

12 files changed, 71 insertions, 86 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a362efa4667..3bde232587ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 # Generated by makepkg 5.0.1
-# Sat Apr  9 10:36:49 UTC 2016
+# Sat Apr  9 20:46:19 UTC 2016
 pkgbase = compiz-manjaro
 	pkgdesc = OpenGL compositing window manager. Includes friendly defaults, GWD theme selector and autostart for Xfce & MATE.
 	pkgver = 0.9.12.2
-	pkgrel = 4
+	pkgrel = 5
 	url = https://launchpad.net/compiz
-	install = compiz.install
+	install = compiz-manjaro.install
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -67,13 +67,11 @@ pkgbase = compiz-manjaro
 	source = compiz-manjaro-defaults.patch
 	source = compiz-manjaro.gschema.override
 	source = compiz-gtk-decorator-theme-selector
-	source = compiz-gtk-decorator-theme.desktop
-	source = compiz-xfce-autostart
-	source = compiz-xfce-autostart.desktop
+	source = compiz-gtk-decorator-theme-selector.desktop
+	source = compiz-xfce-autostart-setup
+	source = compiz-xfce-autostart-setup.desktop
 	source = compiz-xfce-uninstall-helper
 	source = compiz-xfce-uninstall-helper.desktop
-	source = compiz-manjaro-xfce-decoratortheme
-	source = compiz-manjaro-xfce-decoratortheme.desktop
 	source = greybird-1.6.2.tar.gz::https://github.com/shimmerproject/Greybird/archive/v1.6.2.tar.gz
 	sha256sums = 8917ac9e6dfdacc740780e1995e932ed865d293ae87821e7a280da5325daec80
 	sha256sums = f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b
@@ -86,14 +84,12 @@ pkgbase = compiz-manjaro
 	sha256sums = 0d7474aee60c1a482cf26d5d0be6ec2e1b1067fa1d601fdf4aa19a71b07e41d3
 	sha256sums = cdc9eeaa213dbde3bceb2d0a73171ed319929b6a5146ff55fcd4f17df7b25d13
 	sha256sums = 443f85eae424e8aa993f786f3f90dcf92a5454f728f574a5311bb4747ac54288
-	sha256sums = 0679b0f336b765171c1ee0317065dfe33f6beb93f74d8e3282bd4a3e61e4a819
+	sha256sums = 04c7d417602c144313e808d5e1bde198ee677412c97d7405cf6092e8794f95b7
 	sha256sums = 0faaf9e9df28d2857108ccd0910d50ba631c34c2b1659b8860da8c2b552fc889
-	sha256sums = 85940c9c84443fd6229630f4dca9859d8db5146ea21ab76d55d99b2d763cf740
-	sha256sums = 8938f927c0f0ee5a9e83489dd66939588ebe4ad65bb59b483a54991421836a53
-	sha256sums = cd179e08cef8e34f5aeb9629d5050ff263ccdb20f7df4a4e0fa195867b6bd1b9
-	sha256sums = 6f982de454f190235fd6577c1b3719a570569b9b024ebafe9fec1f1e2004326b
-	sha256sums = de94d4f1239ba263c2fdc7d4b168ee30d585f5aedccd2ad45fa63cb913e44cbc
-	sha256sums = 185b5db74729997c63c0a873eb08961414dade7755efaea95e4fe7e1b2821e18
+	sha256sums = a9caa25aa72c1d28e7f3660ac89404e0bae8085b71626fc1c97db1956eea8bec
+	sha256sums = d23b8633186bb3a2a841734ad0b917500f3536a67046f5d8fbb08818eab59160
+	sha256sums = 38ef826430307958722fa6d3553adf5a6e2bc793d7f1b55d4c66c5e51a60b385
+	sha256sums = 02eec20f75eb1f9571a2cf92013fc3c78d13c155a8ede0467cc10b83cdeba43c
 	sha256sums = 473a38b379381311b68dcc579005c0d5bbfbabefe1de7107d897c68b81e6b460
 
 pkgname = compiz-manjaro
diff --git a/PKGBUILD b/PKGBUILD
index 2445b80f9904..2b4ced82a657 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _name=compiz
 pkgname=compiz-manjaro
 _series=0.9.12
 pkgver=${_series}.2
-pkgrel=4
+pkgrel=5
 _greybirdver=1.6.2
 pkgdesc="OpenGL compositing window manager. Includes friendly defaults, GWD theme selector and autostart for Xfce & MATE."
 arch=('i686' 'x86_64')
@@ -34,13 +34,11 @@ source=("${url}/${_series}/${pkgver}/+download/${_name}-${pkgver}.tar.bz2"
         "${pkgname}-defaults.patch"
         "${pkgname}.gschema.override"
         "compiz-gtk-decorator-theme-selector"
-        "compiz-gtk-decorator-theme.desktop"
-        "compiz-xfce-autostart"
-        "compiz-xfce-autostart.desktop"
+        "compiz-gtk-decorator-theme-selector.desktop"
+        "compiz-xfce-autostart-setup"
+        "compiz-xfce-autostart-setup.desktop"
         "compiz-xfce-uninstall-helper"
         "compiz-xfce-uninstall-helper.desktop"
-        "${pkgname}-xfce-decoratortheme"
-        "${pkgname}-xfce-decoratortheme.desktop"
         "greybird-${_greybirdver}.tar.gz::https://github.com/shimmerproject/Greybird/archive/v${_greybirdver}.tar.gz")
 sha256sums=('8917ac9e6dfdacc740780e1995e932ed865d293ae87821e7a280da5325daec80'
             'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'
@@ -53,16 +51,14 @@ sha256sums=('8917ac9e6dfdacc740780e1995e932ed865d293ae87821e7a280da5325daec80'
             '0d7474aee60c1a482cf26d5d0be6ec2e1b1067fa1d601fdf4aa19a71b07e41d3'
             'cdc9eeaa213dbde3bceb2d0a73171ed319929b6a5146ff55fcd4f17df7b25d13'
             '443f85eae424e8aa993f786f3f90dcf92a5454f728f574a5311bb4747ac54288'
-            '0679b0f336b765171c1ee0317065dfe33f6beb93f74d8e3282bd4a3e61e4a819'
+            '04c7d417602c144313e808d5e1bde198ee677412c97d7405cf6092e8794f95b7'
             '0faaf9e9df28d2857108ccd0910d50ba631c34c2b1659b8860da8c2b552fc889'
-            '85940c9c84443fd6229630f4dca9859d8db5146ea21ab76d55d99b2d763cf740'
-            '8938f927c0f0ee5a9e83489dd66939588ebe4ad65bb59b483a54991421836a53'
-            'cd179e08cef8e34f5aeb9629d5050ff263ccdb20f7df4a4e0fa195867b6bd1b9'
-            '6f982de454f190235fd6577c1b3719a570569b9b024ebafe9fec1f1e2004326b'
-            'de94d4f1239ba263c2fdc7d4b168ee30d585f5aedccd2ad45fa63cb913e44cbc'
-            '185b5db74729997c63c0a873eb08961414dade7755efaea95e4fe7e1b2821e18'
+            'a9caa25aa72c1d28e7f3660ac89404e0bae8085b71626fc1c97db1956eea8bec'
+            'd23b8633186bb3a2a841734ad0b917500f3536a67046f5d8fbb08818eab59160'
+            '38ef826430307958722fa6d3553adf5a6e2bc793d7f1b55d4c66c5e51a60b385'
+            '02eec20f75eb1f9571a2cf92013fc3c78d13c155a8ede0467cc10b83cdeba43c'
             '473a38b379381311b68dcc579005c0d5bbfbabefe1de7107d897c68b81e6b460')
-install="${_name}.install"
+install="${pkgname}.install"
 
 prepare() {
   cd "${_name}-${pkgver}"
@@ -162,14 +158,12 @@ package() {
   sed -i 's|Categories=Settings;DesktopSettings;|Categories=Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-OtherSettings;|' "${pkgdir}/usr/share/applications/ccsm.desktop"
   # Install GWD theme selector app
   install -Dm755 "${srcdir}/compiz-gtk-decorator-theme-selector" "${pkgdir}/usr/bin/compiz-gtk-decorator-theme-selector"
-  install -Dm644 "${srcdir}/compiz-gtk-decorator-theme.desktop" "${pkgdir}/usr/share/applications/compiz-gtk-decorator-theme.desktop"
+  install -Dm644 "${srcdir}/compiz-gtk-decorator-theme-selector.desktop" "${pkgdir}/usr/share/applications/compiz-gtk-decorator-theme.desktop"
   # Place autostart/theme scripts/enablers
-  install -Dm755 "${srcdir}/compiz-xfce-autostart" "${pkgdir}/usr/bin/compiz-xfce-autostart"
-  install -Dm644 "${srcdir}/compiz-xfce-autostart.desktop" "${pkgdir}/etc/xdg/autostart/compiz-xfce-autostart.desktop"
+  install -Dm755 "${srcdir}/compiz-xfce-autostart-setup" "${pkgdir}/usr/bin/compiz-xfce-autostart-setup"
+  install -Dm644 "${srcdir}/compiz-xfce-autostart-setup.desktop" "${pkgdir}/etc/xdg/autostart/compiz-xfce-autostart-setup.desktop"
   install -Dm755 "${srcdir}/compiz-xfce-uninstall-helper" "${pkgdir}/usr/bin/compiz-xfce-uninstall-helper"
   install -Dm644 "${srcdir}/compiz-xfce-uninstall-helper.desktop" "${pkgdir}/etc/xdg/autostart/compiz-xfce-uninstall-helper.desktop"
-  install -Dm755 "${srcdir}/${pkgname}-xfce-decoratortheme" "${pkgdir}/usr/bin/${pkgname}-xfce-decoratortheme"
-  install -Dm644 "${srcdir}/${pkgname}-xfce-decoratortheme.desktop" "${pkgdir}/etc/xdg/autostart/${pkgname}-xfce-decoratortheme.desktop"
   
   # greybird window decorations
   cd "${srcdir}/Greybird-${_greybirdver}"
diff --git a/compiz-gtk-decorator-theme-selector b/compiz-gtk-decorator-theme-selector
index 6524c8f42d97..6604c206e776 100755
--- a/compiz-gtk-decorator-theme-selector
+++ b/compiz-gtk-decorator-theme-selector
@@ -7,15 +7,15 @@ if [ ! -f /usr/bin/metacity ]; then
   zenity --warning --text="<b>You do not appear to have Metacity installed.</b>\n\nThe Compiz GTK window decorator uses Metacity libraries to operate. The Metacity theme is what this tool adjusts.\n\nInstall the metacity package if you would like to use the Compiz GTK window decorator."
 fi
 
-if [ -f ~/.config/compiz-manjaro-gtk-decorator-theme.cfg ]; then
-  rm ~/.config/compiz-manjaro-gtk-decorator-theme.cfg
-  gsettings reset org.gnome.desktop.wm.preferences titlebar-uses-system-font
-fi
-
 main_window() {
   selection=$(
-    zenity --height 450 --width 300 --list --ok-label="Apply" --cancel-label="Close" --title="Compiz GTK decorator theme" \
-    --column="Installed Metacity themes:" "Compiz GWD default" \
+    zenity --height 450 --width 320 --list --ok-label="Apply" --cancel-label="Close" --title="Metacity themes" \
+    --column="Current theme: $( if [ $(gsettings get org.gnome.metacity theme) == "''" ]; then
+        echo Default
+      else
+        gsettings get org.gnome.metacity theme
+      fi)" \
+    "Compiz GWD default" \
     $(
       for d in /usr/share/themes/*/metacity-1; do
         echo $d | sed 's:/usr/share/themes/::' | sed 's:/metacity-1::'
diff --git a/compiz-gtk-decorator-theme.desktop b/compiz-gtk-decorator-theme-selector.desktop
index d044c784d805..d044c784d805 100644
--- a/compiz-gtk-decorator-theme.desktop
+++ b/compiz-gtk-decorator-theme-selector.desktop
diff --git a/compiz-manjaro-xfce-decoratortheme b/compiz-manjaro-xfce-decoratortheme
deleted file mode 100755
index a16a84ebe6a9..000000000000
--- a/compiz-manjaro-xfce-decoratortheme
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-gsettings reset org.gnome.desktop.wm.preferences theme
-
-if [ -f /usr/bin/xfconf-query ] && [ "$(xfconf-query -c xsettings -p /Net/ThemeName)" == "Menda" ]; then
-	gsettings set org.gnome.metacity theme "Menda"
-elif [ -f /usr/bin/xfconf-query ] && [ "$(xfconf-query -c xsettings -p /Net/ThemeName)" == "Vertex-Maia-Square" ]; then
-	gsettings set org.gnome.metacity theme "Vertex-Maia-Square"
-
-fi
-
-mkdir -p ~/.config/autostart
-rm ~/.config/autostart/compiz-manjaro-xfce-decoratortheme.desktop
-cp /etc/xdg/autostart/compiz-manjaro-xfce-decoratortheme.desktop ~/.config/autostart/
-sed -i 's|Hidden=false|Hidden=true|' ~/.config/autostart/compiz-manjaro-xfce-decoratortheme.desktop
diff --git a/compiz-manjaro-xfce-decoratortheme.desktop b/compiz-manjaro-xfce-decoratortheme.desktop
deleted file mode 100644
index bf5a27b8aea3..000000000000
--- a/compiz-manjaro-xfce-decoratortheme.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=Compiz-Manjaro decorator theme enabler
-Comment=
-Exec=compiz-manjaro-xfce-decoratortheme
-OnlyShowIn=XFCE;
-StartupNotify=false
-Terminal=false
-Hidden=false
diff --git a/compiz.install b/compiz-manjaro.install
index 4c346d149f62..150d7a876e8d 100644
--- a/compiz.install
+++ b/compiz-manjaro.install
@@ -9,6 +9,11 @@ post_install() {
         echo "  -> Recompiling the GSettings database... "
         glib-compile-schemas /usr/share/glib-2.0/schemas
     fi
+    
+     echo ""
+     echo "***  Xfce and MATE users just log out    ***"
+     echo "***  and back in, Compiz will autostart  ***"
+     echo ""
 }
 
 pre_upgrade() {
@@ -19,7 +24,16 @@ pre_upgrade() {
 }
 
 post_upgrade() {
-    post_install $1
+    echo "  -> Updating icon cache..."
+    gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
+    echo "  -> Updating XDG menu database..."
+    update-desktop-database -q
+
+    ls /usr/share/glib-2.0/schemas 2>/dev/null | grep -qm1 org.compiz
+    if [ $? -eq 0 ]; then
+        echo "  -> Recompiling the GSettings database... "
+        glib-compile-schemas /usr/share/glib-2.0/schemas
+    fi
 }
 
 post_remove() {
diff --git a/compiz-xfce-autostart b/compiz-xfce-autostart
deleted file mode 100755
index 0774728646d8..000000000000
--- a/compiz-xfce-autostart
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [ -f /usr/bin/xfconf-query ]; then
-    xfconf-query -c xfce4-session -p /sessions/Failsafe/Client0_Command -a -s compiz
-fi
-
-mkdir -p ~/.config/autostart
-rm ~/.config/autostart/compiz-xfce-autostart.desktop
-cp /etc/xdg/autostart/compiz-xfce-autostart.desktop ~/.config/autostart/
-sed -i 's|Hidden=false|Hidden=true|' ~/.config/autostart/compiz-xfce-autostart.desktop
-
-## This first-time run when it's replacing a running xfwm4, we run it twice cause of bugs
-compiz --replace ; exec compiz --replace
diff --git a/compiz-xfce-autostart-setup b/compiz-xfce-autostart-setup
new file mode 100755
index 000000000000..3b5ca29e9c11
--- /dev/null
+++ b/compiz-xfce-autostart-setup
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+xfconf-query -c xfce4-session -p /sessions/Failsafe/Client0_Command -a -s compiz
+
+## Automatic GWD decoration matching for default Manjaro Xfce themes
+if [ "$(xfconf-query -c xsettings -p /Net/ThemeName)" == "Menda" ]; then
+	gsettings set org.gnome.metacity theme "Menda"
+elif [ "$(xfconf-query -c xsettings -p /Net/ThemeName)" == "Vertex-Maia-Square" ]; then
+	gsettings set org.gnome.metacity theme "Vertex-Maia-Square"
+fi
+
+mkdir -p ~/.config/autostart
+rm ~/.config/autostart/compiz-xfce-autostart-setup.desktop
+cp /etc/xdg/autostart/compiz-xfce-autostart-setup.desktop ~/.config/autostart/
+sed -i 's|Hidden=false|Hidden=true|' ~/.config/autostart/compiz-xfce-autostart-setup.desktop
+
+## This first-time run when it's replacing a running xfwm4, we run it twice cause of bugs
+compiz --replace ; exec compiz --replace
diff --git a/compiz-xfce-autostart.desktop b/compiz-xfce-autostart-setup.desktop
index 19839dad2006..7ec2f0a10c80 100644
--- a/compiz-xfce-autostart.desktop
+++ b/compiz-xfce-autostart-setup.desktop
@@ -2,9 +2,9 @@
 Encoding=UTF-8
 Version=0.9.4
 Type=Application
-Name=Compiz-Xfce autostart enabler
+Name=Compiz-Xfce autostart setup
 Comment=
-Exec=compiz-xfce-autostart
+Exec=compiz-xfce-autostart-setup
 OnlyShowIn=XFCE;
 StartupNotify=false
 Terminal=false
diff --git a/compiz-xfce-uninstall-helper b/compiz-xfce-uninstall-helper
index 827da37c10bd..ea37f5749233 100644
--- a/compiz-xfce-uninstall-helper
+++ b/compiz-xfce-uninstall-helper
@@ -3,12 +3,13 @@
 if [ ! -f /usr/bin/compiz ]; then
    xfwm4 --daemon
    xfconf-query -c xfce4-session -p /sessions/Failsafe/Client0_Command -a -s xfwm4
-   rm ~/.config/autostart/compiz-xfce-autostart.desktop
-   rm ~/.config/autostart/compiz-manjaro-xfce-decoratortheme.desktop
+   rm ~/.config/autostart/compiz-xfce-autostart-setup.desktop
    rm ~/.config/autostart/compiz-xfce-uninstall-helper.desktop
    
-   # this one is clean-up for an old filename that is no longer used, some time in the future it should be removed
+   # these ones are clean-up for old filenames that are no longer used, some time in the future they should be removed
    rm ~/.config/autostart/compiz-manjaro-decoratortheme.desktop
+   rm ~/.config/autostart/compiz-manjaro-xfce-decoratortheme.desktop
+   rm ~/.config/autostart/compiz-xfce-autostart.desktop
    
    rm ~/.local/bin/compiz-xfce-uninstall-helper
 elif [ ! -f ~/.config/autostart/compiz-xfce-uninstall-helper.desktop ]; then
diff --git a/compiz-xfce-uninstall-helper.desktop b/compiz-xfce-uninstall-helper.desktop
index e015650f1c25..7301ad2c212e 100644
--- a/compiz-xfce-uninstall-helper.desktop
+++ b/compiz-xfce-uninstall-helper.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Version=0.9.4
 Type=Application
-Name=Compiz-Xfce uninstallation helper
+Name=Compiz-Xfce uninstallation helper (do not untick)
 Comment=
 Exec=compiz-xfce-uninstall-helper
 OnlyShowIn=XFCE;