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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/uiserver
From:       Guy Maurel <guy-kde () maurel ! de>
Date:       2009-11-11 17:31:42
Message-ID: 1257960702.655813.4452.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1047643 by guymaurel:

complete with some more parentheses

 M  +4 -2      assuanserverconnection.cpp  


--- trunk/KDE/kdepim/kleopatra/uiserver/assuanserverconnection.cpp #1047642:1047643
@@ -612,7 +612,7 @@
             const bool cms = proto != GpgME::OpenPGP && kdtools::any( seckeys, bind( \
&GpgME::Key::protocol, _1 ) == GpgME::CMS );  if ( cms != pgp )
                 proto = pgp ? GpgME::OpenPGP : GpgME::CMS ;
-            if ( cms && pgp )
+            if ( cms && pgp ) {
                 if ( conn.bias != GpgME::UnknownProtocol ) {
                     proto = conn.bias;
                 } else {
@@ -640,6 +640,7 @@
                             ? GpgME::OpenPGP
                             : GpgME::CMS ;
                 }
+            }
             conn.bias = proto;
             switch ( proto ) {
             case GpgME::OpenPGP:
@@ -1336,11 +1337,12 @@
 
     try {
 
-        if ( const int err = cmd->start() )
+        if ( const int err = cmd->start() ) {
             if ( cmd->isDone() )
                 return err;
             else
                 return assuan_process_done( ctx.get(), err );
+        }
 
         if ( cmd->isDone() )
             return 0;


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