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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/uiserver
From:       Marc Mutz <mutz () kde ! org>
Date:       2008-05-19 13:25:37
Message-ID: 1211203537.575038.1406.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 809791 by mutz:

Use gnupg-helper.h, and use the same algorithm to make a socket name on Windows and \
Unix (for now)

 M  +4 -1      uiserver_unix.cpp  
 M  +3 -3      uiserver_win.cpp  


--- trunk/KDE/kdepim/kleopatra/uiserver/uiserver_unix.cpp #809790:809791
@@ -34,6 +34,8 @@
 
 #include "uiserver_p.h"
 
+#include "utils/gnupg-helper.h"
+
 #include <KLocalizedString>
 
 #include <QFile>
@@ -62,7 +64,8 @@
         return socket;
     if ( tmpDir.status() != 0 )
         throw_<std::runtime_error>( i18n( "Couldn't create directory %1: %2", \
                tmpDirPrefix() + "XXXXXXXX", system_error_string() ) );
-    const QDir dir( tmpDir.name() );
+    const QString gnupgHome = gnupgHomeDirectory();
+    const QDir dir( gnupgHome.isEmpty() ? tmpDir.name() : gnupgHome );
     assert( dir.exists() );
     return dir.absoluteFilePath( "S.uiserver" );
 }
--- trunk/KDE/kdepim/kleopatra/uiserver/uiserver_win.cpp #809790:809791
@@ -34,7 +34,7 @@
 
 #include "uiserver_p.h"
 
-#include "utils/gnupg-registry.h"
+#include "utils/gnupg-helper.h"
 
 #include <KLocalizedString>
 
@@ -66,8 +66,8 @@
         return socket;
     if ( tmpDir.status() != 0 )
         throw_<std::runtime_error>( i18n( "Couldn't create directory %1: %2", \
                tmpDirPrefix() + "XXXXXXXX", system_error_string() ) );
-    const char * const gnupg_home = default_homedir();
-    const QDir dir( gnupg_home ? QFile::decodeName( gnupg_home ) : tmpDir.name() );
+    const QString gnupgHome = gnupgHomeDirectory();
+    const QDir dir( gnupgHome.isEmpty() ? tmpDir.name() : gnupgHome );
     assert( dir.exists() );
     return dir.absoluteFilePath( "S.uiserver" );
 }


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