Skip to content

Commit

Permalink
gnome-keyring no longer sets a GNOME_KEYRING_CONTROL
Browse files Browse the repository at this point in the history
environment variable.

It has used DBus for years now, and this was an old vestige
of the previous ancient protocol.

See: https://bugzilla.gnome.org/show_bug.cgi?id=725801

https://mail.gnome.org/archives/gnome-keyring-list/2014-March/msg00000.html
  • Loading branch information
stefwalter committed Mar 6, 2014
1 parent fc04e40 commit a51018e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
1 change: 0 additions & 1 deletion keyring/backends/Gnome.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ class Keyring(KeyringBackend):
KEYRING_NAME = None

requisite_vars = [
'GNOME_KEYRING_CONTROL',
'DISPLAY',
'DBUS_SESSION_BUS_ADDRESS',
]
Expand Down
9 changes: 1 addition & 8 deletions keyring/tests/backends/test_Gnome.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ def ImportBlesser(*names, **changes):
class GnomeKeyringTestCase(BackendBasicTests, unittest.TestCase):

def environ(self):
return dict(GNOME_KEYRING_CONTROL='1',
DISPLAY='1',
return dict(DISPLAY='1',
DBUS_SESSION_BUS_ADDRESS='1')

def init_keyring(self):
Expand All @@ -41,12 +40,6 @@ def test_supported_no_module(self):
with Environ(**self.environ()):
self.assertFalse(Gnome.Keyring.viable)

def test_supported_no_keyring(self):
environ = self.environ()
environ['GNOME_KEYRING_CONTROL'] = None
with Environ(**environ):
self.assertFalse(Gnome.Keyring.viable)

def test_supported_no_display(self):
environ = self.environ()
environ['DISPLAY'] = None
Expand Down

0 comments on commit a51018e

Please sign in to comment.