[orca] Fix for bgo#580423 - Remove deprecated libgnomeui dependency
- From: William Walker <wwalker src gnome org>
- To: svn-commits-list gnome org
- Subject: [orca] Fix for bgo#580423 - Remove deprecated libgnomeui dependency
- Date: Sat, 2 May 2009 20:51:54 -0400 (EDT)
commit 920ac4b86b158d1438bfeb04857001573cc5d645
Author: Willie Walker <william walker sun com>
Date: Sat May 2 20:36:27 2009 -0400
Fix for bgo#580423 - Remove deprecated libgnomeui dependency
Use DBus org.gnome.SessionManager.Logout instead of
gnome.ui.master_client().request_save.
---
src/orca/orca_console_prefs.py | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/orca/orca_console_prefs.py b/src/orca/orca_console_prefs.py
index 032059e..d841e3d 100644
--- a/src/orca/orca_console_prefs.py
+++ b/src/orca/orca_console_prefs.py
@@ -33,7 +33,6 @@ import settings
import speech
import speechserver
import orca_prefs
-import platform
import time
desktopRunning = False
@@ -416,19 +415,13 @@ def setupSpeech(prefsDict):
return True
def logoutUser():
- """Automatically log the user out of the GNOME desktop."""
+ """Log the user out of the desktop."""
- import gnome
- import gnome.ui
-
- gnome.init(platform.package, platform.version)
- client = gnome.ui.master_client()
-
- client.request_save(gnome.ui.SAVE_GLOBAL, # Save style
- True, # Shutdown
- gnome.ui.INTERACT_ANY, # Allow user interaction
- False, # Fast
- True) # All apps save state
+ import dbus
+ bus = dbus.SessionBus()
+ sessionManager = bus.get_object('org.gnome.SessionManager',
+ '/org/gnome/SessionManager')
+ sessionManager.Logout(dbus.types.UInt32(1))
def showPreferencesUI(commandLineSettings):
"""Uses the console to query the user for Orca preferences."""
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]