r26958 - in /packages/experimental/gnome-shell/debian: changelog patches/04_gnome_session_quit.patch patches/05_use_dbus_for_shutdown_and_logout.patch patches/series

[fpeters at users.alioth.debian.org]

Author: fpeters
Date: Sat Mar 19 16:22:14 2011
New Revision: 26958

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26958
Log:
* debian/patches/04_gnome_session_quit.patch: remove, replaced by:
* debian/patches/05_use_dbus_for_shutdown_and_logout.patch: use Session
  D-Bus interface for shutdown and logout. (from git) (closes: #618870)


Added:
    packages/experimental/gnome-shell/debian/patches/05_use_dbus_for_shutdown_and_logout.patch
Removed:
    packages/experimental/gnome-shell/debian/patches/04_gnome_session_quit.patch
Modified:
    packages/experimental/gnome-shell/debian/changelog
    packages/experimental/gnome-shell/debian/patches/series

Modified: packages/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/changelog?rev=26958&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/changelog [utf-8] Sat Mar 19 16:22:14 2011
@@ -1,3 +1,11 @@
+gnome-shell (2.91.91-2) experimental; urgency=low
+
+  * debian/patches/04_gnome_session_quit.patch: remove, replaced by:
+  * debian/patches/05_use_dbus_for_shutdown_and_logout.patch: use Session
+    D-Bus interface for shutdown and logout. (from git) (closes: #618870)
+
+ -- Frederic Peters <fpeters at debian.org>  Sat, 19 Mar 2011 13:10:02 +0100
+
 gnome-shell (2.91.91-1) experimental; urgency=low
 
   * New upstream release.

Added: packages/experimental/gnome-shell/debian/patches/05_use_dbus_for_shutdown_and_logout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/patches/05_use_dbus_for_shutdown_and_logout.patch?rev=26958&op=file
==============================================================================
--- packages/experimental/gnome-shell/debian/patches/05_use_dbus_for_shutdown_and_logout.patch (added)
+++ packages/experimental/gnome-shell/debian/patches/05_use_dbus_for_shutdown_and_logout.patch [utf-8] Sat Mar 19 16:22:14 2011
@@ -1,0 +1,73 @@
+commit 73274e201bd7f4617e0d40360b50b1bdc7104512
+Author: Giovanni Campagna <gcampagna at src.gnome.org>
+Date:   Sat Mar 12 21:34:01 2011 +0100
+
+    Status Menu: use Gnome Session DBus for shutdown and logout
+    
+    Around 2.91.90, gnome-session-save was renamed to gnome-session-quit.
+    This commit restores compatibility with the older gnome-session, for
+    those testing under GNOME 2.32 or below, by calling the DBus methods
+    directly.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=644591
+
+diff --git a/js/misc/gnomeSession.js b/js/misc/gnomeSession.js
+index ce4e7e9..1a52a6f 100644
+--- a/js/misc/gnomeSession.js
++++ b/js/misc/gnomeSession.js
+@@ -102,3 +102,24 @@ Inhibitor.prototype = {
+ };
+ DBus.proxifyPrototype(Inhibitor.prototype, InhibitorIface);
+ Signals.addSignalMethods(Inhibitor.prototype);
++
++
++// Not the full interface, only the methods we use
++const SessionManagerIface = {
++    name: 'org.gnome.SessionManager',
++    methods: [
++        { name: 'Logout', inSignature: 'u', outSignature: '' },
++        { name: 'Shutdown', inSignature: '', outSignature: '' }
++    ]
++};
++
++function SessionManager() {
++    this._init();
++}
++
++SessionManager.prototype = {
++    _init: function() {
++        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager');
++    }
++};
++DBus.proxifyPrototype(SessionManager.prototype, SessionManagerIface);
+\ No newline at end of file
+diff --git a/js/ui/statusMenu.js b/js/ui/statusMenu.js
+index 9c251b8..2a04506 100644
+--- a/js/ui/statusMenu.js
++++ b/js/ui/statusMenu.js
+@@ -50,6 +50,7 @@ StatusMenuButton.prototype = {
+         this._user = this._gdm.get_user(GLib.get_user_name());
+         this._presence = new GnomeSession.Presence();
+         this._presenceItems = {};
++        this._session = new GnomeSession.SessionManager();
+ 
+         this._account_mgr = Tp.AccountManager.dup()
+ 
+@@ -210,7 +211,7 @@ StatusMenuButton.prototype = {
+ 
+     _onQuitSessionActivate: function() {
+         Main.overview.hide();
+-        Util.spawn(['gnome-session-quit', '--logout']);
++        this._session.LogoutRemote(0);
+     },
+ 
+     _onSuspendOrPowerOffActivate: function() {
+@@ -222,7 +223,7 @@ StatusMenuButton.prototype = {
+             this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
+             this._upClient.suspend_sync(null);
+         } else {
+-            Util.spawn(['gnome-session-quit', '--power-off']);
++            this._session.ShutdownRemote();
+         }
+     },
+ 

Modified: packages/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/patches/series?rev=26958&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/patches/series [utf-8] Sat Mar 19 16:22:14 2011
@@ -1,3 +1,3 @@
 0001-altTab-fix-incorrect-positioning-with-multiple-monit.patch
 01_favorite_apps.patch
-04_gnome_session_quit.patch
+05_use_dbus_for_shutdown_and_logout.patch