[Pkg-owncloud-commits] [qtkeychain] 105/115: Detect older GNOME variants

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository qtkeychain.

commit 1a4c6ad1e4d46f74426ef74e977722b8993d700d
Author: Daniel Molkentin <daniel at molkentin.de>
Date:   Wed Mar 12 16:21:17 2014 +0100

    Detect older GNOME variants
    
    Those use a different environment variable
---
 keychain_unix.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keychain_unix.cpp b/keychain_unix.cpp
index c464697..0827600 100644
--- a/keychain_unix.cpp
+++ b/keychain_unix.cpp
@@ -32,7 +32,7 @@ enum KeyringBackend {
 
 static KeyringBackend detectKeyringBackend()
 {
-    if ( !qgetenv( "GNOME_KEYRING_CONTROL" ).isNull() && GnomeKeyring::isSupported() )
+    if ( !( qgetenv( "GNOME_KEYRING_CONTROL" ).isNull() && qgetenv("GNOME_KEYRING_SOCKET").isNull() ) && GnomeKeyring::isSupported() )
         return Backend_GnomeKeyring;
     else
         return Backend_Kwallet;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/qtkeychain.git