copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove session mnagement broken support

This commit is contained in:
Yann Leboulanger 2012-12-26 23:55:53 +01:00
parent 7ebde173bc
commit caf56d7ad9
2 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/features_window.py
View File

@ -67,10 +67,6 @@ class FeaturesWindow:
_('Autodetection of network status.'),
_('Requires gnome-network-manager and python-dbus.'),
_('Feature not available under Windows.')),
_('Session Management'): (self.session_management_available,
_('Gajim session is stored on logout and restored on login.'),
_('Requires python-gnome2.'),
_('Feature not available under Windows.')),
_('Password encryption'): (self.some_keyring_available,
_('Passwords can be stored securely and not just in plaintext.'),
_('Requires gnome-keyring and python-gnome2-desktop, or kwalletcli.'),
@ -192,22 +188,13 @@ class FeaturesWindow:
import network_manager_listener
return network_manager_listener.supported
def session_management_available(self):
if os.name == 'nt':
return False
try:
__import__('gnome.ui')
except Exception:
return False
return True
def some_keyring_available(self):
if os.name == 'nt':
return False
if kwalletbinding.kwallet_available():
return True
try:
__import__('gnomekeyring')
from gi.repository import GnomeKeyring
except Exception:
return False
return True

26
src/gajim.py
View File

@ -449,32 +449,6 @@ if __name__ == '__main__':
log.info("Encodings: d:%s, fs:%s, p:%s", sys.getdefaultencoding(), \
sys.getfilesystemencoding(), locale.getpreferredencoding())
#if os.name != 'nt':
## Session Management support
#try:
#import gnome.ui
#raise ImportError
#except ImportError:
#pass
#else:
#def die_cb(dummy):
#gajim.interface.roster.quit_gtkgui_interface()
#gnome.program_init('gajim', gajim.version)
#cli = gnome.ui.master_client()
#cli.connect('die', die_cb)
#path_to_gajim_script = gtkgui_helpers.get_abspath_for_script(
#'gajim')
#if path_to_gajim_script:
#argv = [path_to_gajim_script]
#try:
#cli.set_restart_command(argv)
#except TypeError:
## Fedora systems have a broken gnome-python wrapper for this
## function.
#cli.set_restart_command(len(argv), argv)
check_paths.check_and_possibly_create_paths()
interface = Interface()