[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/qca/plugins/qca-gnupg
From:       Justin Karneges <infiniti () affinix ! com>
Date:       2008-09-26 2:49:06
Message-ID: 1222397346.099916.31963.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 864920 by infiniti:

monitor canonical paths.  this should fix the bug where we monitor for a 
path with backslashes on windows, but get reports about a path with 
forward slashes.  simply running the path through QFileInfo is enough to 
fix the separators, but we additionally use canonical paths for good 
measure.


 M  +4 -3      qca-gnupg.cpp  


--- trunk/kdesupport/qca/plugins/qca-gnupg/qca-gnupg.cpp #864919:864920
@@ -622,7 +622,8 @@
 //   problem, we'll watch the directories containing the keyring files
 //   instead of watching the actual files themselves.
 //
-// FIXME: consider moving this logic into FileWatch
+// FIXME: qca 2.0.1 FileWatch has this logic already, so we can probably
+//   simplify this class.
 class RingWatch : public QObject
 {
 	Q_OBJECT
@@ -1150,7 +1151,7 @@
 			// secret keyring filename
 			else if(init_step == 1)
 			{
-				secring = gpg.keyringFile();
+				secring = QFileInfo(gpg.keyringFile()).canonicalFilePath();
 
 				if(qt_buggy_fsw())
 					fprintf(stderr, "qca-gnupg: disabling keyring monitoring in Qt version < 4.3.5 or 4.4.1\n");
@@ -1168,7 +1169,7 @@
 			// public keyring filename
 			else if(init_step == 2)
 			{
-				pubring = gpg.keyringFile();
+				pubring = QFileInfo(gpg.keyringFile()).canonicalFilePath();
 				if(!pubring.isEmpty())
 				{
 					if(!qt_buggy_fsw())
[prev in list] [next in list] [prev in thread] [next in thread]