[arch-commits] Commit in cinnamon/trunk (PKGBUILD)

[Balló György]

    Date: Wednesday, December 4, 2013 @ 22:06:15
  Author: bgyorgy
Revision: 102085

The workaround for nm-applet is no longer needed

Modified:
  cinnamon/trunk/PKGBUILD

----------+
 PKGBUILD |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-04 20:54:53 UTC (rev 102084)
+++ PKGBUILD	2013-12-04 21:06:15 UTC (rev 102085)
@@ -49,8 +49,7 @@
   patch -Np1 -i ../cinnamon-gstreamer1.patch
 
   # Fix required components
-  sed -i 's/cinnamon-fallback-mount-helper;/polkit-gnome-authentication-agent-1;/
-          s/nm-applet;/cinnamon-nm-applet;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
+  sed -i 's/cinnamon-fallback-mount-helper;/polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
 
   # fix for the python2 PAM module  
   sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
@@ -87,10 +86,6 @@
   cd ${srcdir}/Cinnamon*
   make DESTDIR="${pkgdir}" install
 
-  # Install cinnamon-nm-applet.desktop file
-  sed 's/^NotShowIn=.*/OnlyShowIn=GNOME/' /usr/share/applications/nm-applet.desktop \
-    > "${pkgdir}/usr/share/applications/cinnamon-nm-applet.desktop"
-
   # Install policy file
   install -Dm644 "${srcdir}/org.archlinux.pkexec.cinnamon-settings-users.policy" \
                  "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.cinnamon-settings-users.policy"