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

List:       kde-commits
Subject:    KDE/kdepimlibs/gpgme++
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-12-27 14:17:00
Message-ID: 1261923420.340227.30243.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1066588 by tmcguire:

Comment out debug output with std::cerr, which is annoying since it
can't be turned off.

If you want debug output, use kDebug.


 M  +5 -5      data.cpp  
 M  +11 -9     util.h  


--- trunk/KDE/kdepimlibs/gpgme++/data.cpp #1066587:1066588
@@ -111,11 +111,11 @@
   if ( e )
     d->data = 0;
 #ifndef NDEBUG
-  std::cerr << "GpgME::Data(): DataProvider supports: "
-	    << ( d->cbs.read ? "read" : "no read" ) << ", "
-	    << ( d->cbs.write ? "write" : "no write" ) << ", "
-	    << ( d->cbs.seek ? "seek" : "no seek" ) << ", "
-	    << ( d->cbs.release ? "release" : "no release" ) << std::endl;
+  //std::cerr << "GpgME::Data(): DataProvider supports: "
+	//    << ( d->cbs.read ? "read" : "no read" ) << ", "
+	//    << ( d->cbs.write ? "write" : "no write" ) << ", "
+	//    << ( d->cbs.seek ? "seek" : "no seek" ) << ", "
+	//    << ( d->cbs.release ? "release" : "no release" ) << std::endl;
 #endif
 }
 
--- trunk/KDE/kdepimlibs/gpgme++/util.h #1066587:1066588
@@ -45,21 +45,22 @@
 #ifdef HAVE_GPGME_KEYLIST_MODE_SIG_NOTATIONS
     oldmode |= GPGME_KEYLIST_MODE_SIG_NOTATIONS;
 #elif !defined(NDEBUG)
-    std::cerr << "GpgME: ignoring SignatureNotations keylist flag (gpgme too old)." \
<< std::endl; +    ;//std::cerr << "GpgME: ignoring SignatureNotations keylist flag \
(gpgme too old)." << std::endl;  #endif
   }
   if ( newmodes & GpgME::Ephemeral ) {
 #ifdef HAVE_GPGME_KEYLIST_MODE_EPHEMERAL
     oldmode |= GPGME_KEYLIST_MODE_EPHEMERAL;
 #elif !defined(NDEBUG)
-    std::cerr << "GpgME: ignoring Ephemeral keylist flag (gpgme too old)." << \
std::endl; +    ;//std::cerr << "GpgME: ignoring Ephemeral keylist flag (gpgme too \
old)." << std::endl;  #endif
   }
   if ( newmodes & GpgME::Validate ) oldmode |= GPGME_KEYLIST_MODE_VALIDATE;
 #ifndef NDEBUG
-  if ( newmodes & ~(GpgME::Local|GpgME::Extern|GpgME::Signatures|GpgME::SignatureNotations|GpgME::Ephemeral|GpgME::Validate) \
                )
-    std::cerr << "GpgME::Context: keylist mode must be one of Local, "
-      "Extern, Signatures, SignatureNotations, or Validate, or a combination \
thereof!" << std::endl; +  if ( newmodes & \
~(GpgME::Local|GpgME::Extern|GpgME::Signatures|GpgME::SignatureNotations|GpgME::Ephemeral|GpgME::Validate) \
) { +     //std::cerr << "GpgME::Context: keylist mode must be one of Local, "
+     //"Extern, Signatures, SignatureNotations, or Validate, or a combination \
thereof!" << std::endl; +  }
 #endif
   return static_cast<gpgme_keylist_mode_t>( oldmode );
 }
@@ -86,8 +87,9 @@
 		GPGME_KEYLIST_MODE_EPHEMERAL|
 #endif
 		GPGME_KEYLIST_MODE_VALIDATE|
-		GPGME_KEYLIST_MODE_SIGS) )
-    std::cerr << "GpgME: WARNING: gpgme_get_keylist_mode() returned an unknown \
flag!" << std::endl; +		GPGME_KEYLIST_MODE_SIGS) ) {
+    //std::cerr << "GpgME: WARNING: gpgme_get_keylist_mode() returned an unknown \
flag!" << std::endl; +    }
 #endif // NDEBUG
   return result;
 }
@@ -113,14 +115,14 @@
 #ifdef HAVE_GPGME_SIG_NOTATION_HUMAN_READABLE
 	result |= GPGME_SIG_NOTATION_HUMAN_READABLE;
 #elif !defined(NDEBUG)
-	std::cerr << "GpgME::Context: ignoring HumanReadable signature notation flag (gpgme \
too old)" << std::endl; +	//std::cerr << "GpgME::Context: ignoring HumanReadable \
signature notation flag (gpgme too old)" << std::endl;  #endif
     }
     if ( newflags & GpgME::Notation::Critical ) {
 #ifdef HAVE_GPGME_SIG_NOTATION_CRITICAL
 	result |= GPGME_SIG_NOTATION_CRITICAL;
 #elif !defined(NDEBUG)
-	std::cerr << "GpgME::Context: ignoring Critical signature notation flag (gpgme too \
old)" << std::endl; +	//std::cerr << "GpgME::Context: ignoring Critical signature \
notation flag (gpgme too old)" << std::endl;  #endif
     }
     return static_cast<gpgme_sig_notation_flags_t>( result );


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