QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-05-13 19:19:33 +00:00
Code Issues Projects Releases Wiki Activity

monitor canonical paths. this should fix the bug where we monitor for a

Browse Source 
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.

svn path=/trunk/kdesupport/qca/; revision=864920
This commit is contained in:
Justin Karneges 2008-09-26 02:49:05 +00:00
parent 5a2cde805b
commit 114b849037
1 changed files with 4 additions and 3 deletions

7
plugins/qca-gnupg/qca-gnupg.cpp

@ -622,7 +622,8 @@ public:
// 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 @@ private slots:
// 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 @@ private slots:
// public keyring filename
else if(init_step == 2)
{
pubring = gpg.keyringFile();
pubring = QFileInfo(gpg.keyringFile()).canonicalFilePath();
if(!pubring.isEmpty())
{
if(!qt_buggy_fsw())