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

List:       kde-commits
Subject:    KDE/kdepimlibs/gpgme++
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-08-26 14:50:16
Message-ID: 20100826145016.16BFFAC86C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1168399 by mutz:

GpgME::Exception: use gpgme_str* instead of gpg_str* here, too

 M  +0 -4      editinteractor.cpp  
 M  +3 -3      exception.cpp  


--- trunk/KDE/kdepimlibs/gpgme++/editinteractor.cpp #1168398:1168399
@@ -156,11 +156,7 @@
 
         if ( ei->debug )
             std::fprintf( ei->debug, "EditInteractor: error now %u (%s)\n",
-#ifdef HAVE_GPGME_GPG_ERROR_WRAPPERS
                           ei->error.encodedError(), gpgme_strerror( ei->error.encodedError() ) );
-#else
-                          ei->error.encodedError(), gpg_strerror( ei->error.encodedError() ) );
-#endif
 
         return ei->error.encodedError();
     }
--- trunk/KDE/kdepimlibs/gpgme++/exception.cpp #1168398:1168399
@@ -23,7 +23,7 @@
 // -*- c++ -*-
 #include "exception.h"
 
-#include <gpg-error.h>
+#include <gpgme.h>
 
 #include <sstream>
 
@@ -43,10 +43,10 @@
         return msg;
     char error_string[128];
     error_string[0] = '\0';
-    gpg_strerror_r( err.encodedError(), error_string, sizeof error_string );
+    gpgme_strerror_r( err.encodedError(), error_string, sizeof error_string );
     error_string[sizeof error_string - 1] = '\0';
     stringstream ss;
-    ss << gpg_strsource( err.encodedError() ) << ": ";
+    ss << gpgme_strsource( err.encodedError() ) << ": ";
     if ( !msg.empty() )
         ss << msg << ": ";
     ss << error_string << " (" << static_cast<unsigned long>( err.encodedError() ) << ')';
[prev in list] [next in list] [prev in thread] [next in thread]