Index: kleopatra/tests/test_uiserver.cpp
===================================================================
--- kleopatra/tests/test_uiserver.cpp	(revision 1156316)
+++ kleopatra/tests/test_uiserver.cpp	(working copy)
@@ -122,7 +122,7 @@
         return gpg_error( GPG_ERR_NOT_IMPLEMENTED );
 
     if ( const gpg_error_t err = assuan_send_data( ctx, it->second.c_str(), it->second.size() ) ) {
-        qDebug( "assuan_write_data: %s", gpg_strerror( err ) );
+        qDebug( "assuan_write_data: %s", gpgme_strerror( err ) );
         return err;
     }
 
Index: kleopatra/tests/test_useridlistmodels.cpp
===================================================================
--- kleopatra/tests/test_useridlistmodels.cpp	(revision 1156316)
+++ kleopatra/tests/test_useridlistmodels.cpp	(working copy)
@@ -129,10 +129,10 @@
     KeyResolveJob job( proto );
 
     if ( const GpgME::Error err = job.start( arg ) )
-        throw std::runtime_error( std::string( "startKeyListing: " ) + gpg_strerror( err.encodedError() ) );
+        throw std::runtime_error( std::string( "startKeyListing: " ) + gpgme_strerror( err.encodedError() ) );
 
     if ( const GpgME::Error err = job.waitForDone() )
-        throw std::runtime_error( std::string( "nextKey: " ) + gpg_strerror( err.encodedError() ) );
+        throw std::runtime_error( std::string( "nextKey: " ) + gpgme_strerror( err.encodedError() ) );
 
     const Key key = job.keys().front();
 
Index: kleopatra/uiserver/assuanserverconnection.cpp
===================================================================
--- kleopatra/uiserver/assuanserverconnection.cpp	(revision 1156316)
+++ kleopatra/uiserver/assuanserverconnection.cpp	(working copy)
@@ -1314,7 +1314,7 @@
     const gpg_error_t rc = assuan_process_done( d->ctx.get(), err.encodedError() );
     if ( gpg_err_code( rc ) != GPG_ERR_NO_ERROR )
         qFatal( "AssuanCommand::done: assuan_process_done returned error %d (%s)",
-                static_cast<int>(rc), gpg_strerror(rc) );
+                static_cast<int>(rc), gpgme_strerror(rc) );
 
     d->utf8ErrorKeepAlive.clear();
 
Index: kleopatra/libkleopatraclient/core/command.cpp
===================================================================
--- kleopatra/libkleopatraclient/core/command.cpp	(revision 1156316)
+++ kleopatra/libkleopatraclient/core/command.cpp	(working copy)
@@ -383,8 +383,8 @@
 
 static QString to_error_string( int err ) {
     char buffer[1024];
-    gpg_strerror_r( static_cast<gpg_error_t>(err), 
-                    buffer, sizeof buffer );
+    gpgme_strerror_r( static_cast<gpg_error_t>(err), 
+                      buffer, sizeof buffer );
     buffer[sizeof buffer - 1] = '\0';
     return QString::fromLocal8Bit( buffer );
 }