Sun Dec 30 01:50:38 PST 2012

2 files changed, 55 insertions, 1 deletions

diff --git a/community/awn-extras-applets/PKGBUILD b/community/awn-extras-applets/PKGBUILD
index 59fd1bcdd..7ce9fca85 100644
--- a/community/awn-extras-applets/PKGBUILD
+++ b/community/awn-extras-applets/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=awn-extras-applets
 _pkgname=awn-extras
 pkgver=0.4.0
-pkgrel=14
+pkgrel=15
 pkgdesc="Collection of applets for avant-window-navigator"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/awn-extras"
@@ -37,6 +37,7 @@ source=(http://launchpad.net/$_pkgname/0.4/$pkgver/+download/$_pkgname-$pkgver.t
         fix-shinyswitcher-scrolling.patch
         fix-weather-applet.patch
         awn-extras-glib2.32.patch
+        cairo-menu-upower.patch
         check-dependencies.patch)
 md5sums=('b559d68cd6ad295c961c20fcc5d9f9c0'
          '2df8dfd8f0f1d458c09b56983c7d049f'
@@ -45,6 +46,7 @@ md5sums=('b559d68cd6ad295c961c20fcc5d9f9c0'
          '755c57dfbb65a314f247277918ec95ac'
          'bc22bb3e81aca0f651ae8acee1ce2f00'
          '1cfcd1e5dc92c4c7c306472d42a21c2d'
+         'f9715f531947967d6549a358ea8d2979'
          '8f920c7dde987d66eef7d3739df1051d')
 
 build() {
@@ -55,6 +57,7 @@ build() {
   patch -Np0 -i "$srcdir/fix-shinyswitcher-scrolling.patch"
   patch -Np1 -i "$srcdir/fix-weather-applet.patch"
   patch -Np0 -i "$srcdir/awn-extras-glib2.32.patch"
+  patch -Np1 -i "$srcdir/cairo-menu-upower.patch"
   patch -Np1 -i "$srcdir/check-dependencies.patch"
 
   # Python2 fix
diff --git a/community/awn-extras-applets/cairo-menu-upower.patch b/community/awn-extras-applets/cairo-menu-upower.patch
new file mode 100644
index 000000000..08e79a68d
--- /dev/null
+++ b/community/awn-extras-applets/cairo-menu-upower.patch
@@ -0,0 +1,51 @@
+diff -Naur awn-extras-0.4.0.orig/applets/maintained/cairo-menu/gnome-menu-builder.c awn-extras-0.4.0/applets/maintained/cairo-menu/gnome-menu-builder.c
+--- awn-extras-0.4.0.orig/applets/maintained/cairo-menu/gnome-menu-builder.c	2010-04-10 01:26:19.000000000 +0200
++++ awn-extras-0.4.0/applets/maintained/cairo-menu/gnome-menu-builder.c	2012-12-29 05:46:45.971364855 +0100
+@@ -104,7 +104,7 @@
+ 
+   if (have_gnome_session_manager)
+   {
+-    add_special_item (menu,_("Logout"),"gnome-logout","gnome-session-save","--logout-dialog --gui");
++    add_special_item (menu,_("Logout"),"gnome-logout","gnome-session-quit","--logout");
+   }
+   else if (dbus_service_exists ("org.xfce.SessionManager") )
+   {
+@@ -121,35 +121,13 @@
+   {
+     add_special_item (menu,_("Lock Screen"),"system-lock-screen","xscreensaver-command","-lock");
+   }
+-  if (dbus_service_exists ("org.freedesktop.PowerManagement"))
+-  {
+-    if (!add_special_item (menu,_("Suspend"),"gnome-session-suspend","gnome-power-cmd","suspend"))
+-    {
+-      add_special_item (menu,_("Suspend"),"gnome-session-suspend","dbus-send","--session --dest=org.freedesktop.PowerManagement --type=method_call --print-reply --reply-timeout=2000 /org/freedesktop/PowerManagement org.freedesktop.PowerManagement.Suspend");
+-    }
+-    
+-    if (!add_special_item (menu,_("Hibernate"),"gnome-session-hibernate","gnome-power-cmd","hibernate"))
+-    {
+-      add_special_item (menu,_("Hibernate"),"gnome-session-hibernate","dbus-send","--session --dest=org.freedesktop.PowerManagement --type=method_call --print-reply --reply-timeout=2000 /org/freedesktop/PowerManagement org.freedesktop.PowerManagement.Hibernate");
+-    }
+ 
+-  }
+-  else if (dbus_service_exists ("org.gnome.PowerManagement"))
+-  {
+-    if (!add_special_item (menu,_("Suspend"),"gnome-session-suspend","gnome-power-cmd","suspend"))
+-    {
+-
+-    }
+-      
+-    if (!add_special_item (menu,_("Hibernate"),"gnome-session-hibernate","gnome-power-cmd","hibernate"))
+-    {
++  add_special_item (menu,_("Suspend"),"gnome-session-suspend","dbus-send","--system --dest=org.freedesktop.UPower --type=method_call --print-reply --reply-timeout=2000 /org/freedesktop/UPower org.freedesktop.UPower.Suspend");
++  add_special_item (menu,_("Hibernate"),"gnome-session-hibernate","dbus-send","--system --dest=org.freedesktop.UPower --type=method_call --print-reply --reply-timeout=2000 /org/freedesktop/UPower org.freedesktop.UPower.Hibernate");
+ 
+-    }
+-  }
+-  
+   if (have_gnome_session_manager)
+   {
+-    add_special_item (menu,_("Shutdown"),"gnome-logout","gnome-session-save","--shutdown-dialog --gui");  
++    add_special_item (menu,_("Shutdown"),"gnome-shutdown","gnome-session-quit","--power-off");  
+   }
+   gtk_widget_show_all (menu);
+   return FALSE;