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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/tray
From:       Tom Albers <tomalbers () kde ! nl>
Date:       2008-12-31 12:28:53
Message-ID: 1230726533.733264.9438.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 903718 by toma:

Already woke up two nights ago, realising this bugfix was slightly off. You can not \
pass multiple command line options in one string, these have to be splitted. Use \
                QStringList instead of QString for passing the options. Can you try \
                again?
BUG: 178185


 M  +5 -5      global.cpp  
 M  +3 -3      global.h  


--- trunk/KDE/kdepim/akonadi/tray/global.cpp #903717:903718
@@ -44,11 +44,11 @@
     if ( host.isEmpty() ) {
         const QString options = settings.value( "Options", "" ).toString();
         const QStringList list = options.split( "=" );
-        m_dboptions = "--socket=" + list.at( 1 );
+        m_dboptions.append( "--socket=" + list.at( 1 ) );
     } else {
-        m_dboptions = "--host=" + host;
-        m_dboptions.append( " --user=" + settings.value( "User", "" ).toString() );
-        m_dboptions.append( " --password=" + settings.value( "Password", "" \
).toString() ); +        m_dboptions.append( "--host=" + host );
+        m_dboptions.append( "--user=" + settings.value( "User", "" ).toString() );
+        m_dboptions.append( "--password=" + settings.value( "Password", "" \
).toString() );  }
     m_dbname = settings.value( "Name", "akonadi" ).toString();
     settings.endGroup();
@@ -56,7 +56,7 @@
     m_parsed = true;
 }
 
-const QString Global::dboptions()
+const QStringList Global::dboptions()
 {
     if ( !m_parsed )
         init();
--- trunk/KDE/kdepim/akonadi/tray/global.h #903717:903718
@@ -22,7 +22,7 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
 
-#include <QString>
+#include <QStringList>
 #include <QObject>
 
 namespace Tray
@@ -36,7 +36,7 @@
     /**
      * Returns a string usuable to connect to the akonadiserver.
      */
-    const QString dboptions();
+    const QStringList dboptions();
 
     /**
      * Returns the database to connect to.
@@ -47,7 +47,7 @@
     void init();
 
     bool m_parsed;
-    QString m_dboptions;
+    QStringList m_dboptions;
     QString m_dbname;
 };
 


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