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

List:       kde-commits
Subject:    KDE/kdepim
From:       Thomas McGuire <Thomas.McGuire () gmx ! net>
Date:       2008-07-25 22:06:47
Message-ID: 1217023607.258748.1487.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 837866 by tmcguire:

Merged revisions 836295 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r836295 | mutz | 2008-07-22 07:36:08 +0200 (Tue, 22 Jul 2008) | 2 lines
  
  Fix typo.
  CCMAIL: txemaq@gmail.com
........


 _M            . (directory)  
 M  +6 -6      kleopatra/kleopatraapplication.cpp  


** trunk/KDE/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise4/kdepim:1-809779,809818-812631,812633-813585,813587-8 \
13603,813605-813670,813672-816390,816392-817226,817228-817261,817263-817679,817681-818 \
695,818697-819956,819958-819963,819965-823883,823885-827552,827723,827832-829047,82904 \
9-829050,829052-833251,833747,834308,834950-834951,834955-834958,834961-834968,834977- \
834992,835010,835023,835028-835042,835049,835071,835074,835078-835080,835083,835085,83 \
5088-835093,835096,835107,835112-835342,835353,835355,835357-835363,835365-835380,8353 \
82-835383,835395,835397,835400-835403,835408-835411,835415,835426,835430-835432,835434-835435,835437,835439-835440,835447,835451-835938,836472 \
/branches/kdepim/kmail-soc:1-809833,812465,826213-826424  + \
/branches/kdepim/enterprise4/kdepim:1-809779,809818-812631,812633-813585,813587-813603 \
,813605-813670,813672-816390,816392-817226,817228-817261,817263-817679,817681-818695,8 \
18697-819956,819958-819963,819965-823883,823885-827552,827723,827832-829047,829049-829 \
050,829052-833251,833747,834308,834950-834951,834955-834958,834961-834968,834977-83499 \
2,835010,835023,835028-835042,835049,835071,835074,835078-835080,835083,835085,835088- \
835093,835096,835107,835112-835342,835353,835355,835357-835363,835365-835380,835382-83 \
5383,835395,835397,835400-835403,835408-835411,835415,835426,835430-835432,835434-835435,835437,835439-835440,835447,835451-835938,836295,836472 \
                /branches/kdepim/kmail-soc:1-809833,812465,826213-826424
--- trunk/KDE/kdepim/kleopatra/kleopatraapplication.cpp #837865:837866
@@ -93,11 +93,11 @@
     { "encrypt-sign",       I18N_NOOP("Encrypt and/or sign file(s)"),             \
                "E" },
     { "decrypt",            I18N_NOOP("Decrypt file(s)"),                         \
                "d" },
     { "verify",             I18N_NOOP("Verify file/signature"),                   \
                "V" },
-    { "decrypt-verify",     I18N_NOOP("Decrypt and/or verify files(s)"),          \
"D" }, +    { "decrypt-verify",     I18N_NOOP("Decrypt and/or verify file(s)"),       \
                "D" },
     //{ "show-certificate",   I18N_NOOP("Show Certificate(s) by fingerprint(s)"),   \
""  },  };
-    
 
+
 static KCmdLineOptions make_kleopatra_args() {
     KCmdLineOptions options;
 #ifdef HAVE_USABLE_ASSUAN
@@ -139,7 +139,7 @@
     void setupKeyCache() {
         keyCache = KeyCache::mutableInstance();
         watcher.reset( new FileSystemWatcher );
-  
+
         watcher->addPaths( gnupgFileWatchList() );
         watcher->setDelay( 1000 );
         keyCache->addFileSystemWatcher( watcher );
@@ -151,7 +151,7 @@
         const QByteArray envOptions = qgetenv( "KLEOPATRA_LOGOPTIONS" );
         const bool logAll = envOptions.trimmed() == "all";
         const QList<QByteArray> options = envOptions.isEmpty() ? \
                default_logging_options() : envOptions.split( ',' ) ;
-        
+
         const QByteArray dirNative = qgetenv( "KLEOPATRA_LOGDIR" );
         if ( dirNative.isEmpty() )
             return;
@@ -162,12 +162,12 @@
             kDebug() << "Could not open file for logging: " << logFileName << \
"\nLogging disabled";  return;
         }
-        
+
         log->setOutputDirectory( dir );
         if ( logAll || options.contains( "io" ) )
             log->setIOLoggingEnabled( true );
         qInstallMsgHandler( Log::messageHandler );
-    
+
 #ifdef HAVE_USABLE_ASSUAN
         if ( logAll || options.contains( "pipeio" ) )
             KDPipeIODevice::setDebugLevel( KDPipeIODevice::Debug );


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