[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-29 19:22:07
Message-ID: 1230578527.861853.11376.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 903038 by toma:

Make the tray application somewhat more intelligent: don't assume everyone uses a \
socket, but honor the kcm-settings for akonadi. As I don't have a setup with a remote \
                server, it would be nice if you could test this for me!
BUG: 178185


 M  +1 -1      CMakeLists.txt  
 M  +4 -6      backup.cpp  
 A             global.cpp   [License: GPL (v2+)]
 A             global.h   [License: GPL (v2+)]
 M  +4 -6      restore.cpp  


--- trunk/KDE/kdepim/akonadi/tray/CMakeLists.txt #903037:903038
@@ -1,7 +1,7 @@
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
 ${QT_INCLUDE_DIR} ${QT_QTDBUS_INCLUDE_DIR} )
 
-SET(tray_sources main.cpp dock.cpp backup.cpp backupassistant.cpp restore.cpp \
restoreassistant.cpp) +SET(tray_sources main.cpp dock.cpp backup.cpp \
backupassistant.cpp restore.cpp restoreassistant.cpp global.cpp)  
 qt4_generate_dbus_interface( ${CMAKE_CURRENT_SOURCE_DIR}/dock.h
 org.freedesktop.akonaditray.xml )
--- trunk/KDE/kdepim/akonadi/tray/backup.cpp #903037:903038
@@ -17,6 +17,7 @@
 */
 
 #include "backup.h"
+#include "global.h"
 
 #include <KDebug>
 #include <KProcess>
@@ -95,17 +96,14 @@
 
 
     /* Dump the database */
-    const QString socket = XdgBaseDirs::findResourceDir( "data",
-                           "akonadi" + sep + "db_misc" + sep ) + "mysql.socket";
-    if ( socket.isEmpty() )
-        kFatal() << "No socket found";
-
+    Tray::Global global;
     KProcess *proc = new KProcess( this );
     QStringList params;
     params << "--single-transaction" << "--master-data=2";
     params << "--flush-logs" << "--triggers";
     params << "--result-file=" + tempDir->name() + "db/database.sql";
-    params << "--socket=" + socket << "akonadi";
+    params << global.dboptions() << global.dbname();
+    kDebug() << "Executing: " << KStandardDirs::findExe( "mysqldump" ) << params;
     proc->setProgram( KStandardDirs::findExe( "mysqldump" ), params );
     int result = proc->execute();
     delete proc;
--- trunk/KDE/kdepim/akonadi/tray/restore.cpp #903037:903038
@@ -17,6 +17,7 @@
 */
 
 #include "restore.h"
+#include "global.h"
 
 #include <KDebug>
 #include <KProcess>
@@ -112,14 +113,11 @@
     }
 
     /* Restore the database */
-    const QString socket = XdgBaseDirs::findResourceDir( "data",
-                           "akonadi" + sep + "db_misc" + sep ) + "mysql.socket";
-    if ( socket.isEmpty() )
-        kFatal() << "No socket found";
-
+    Tray::Global global;
     proc = new KProcess( this );
     params.clear();
-    params << "--socket=" + socket << "akonadi";
+    params << global.dboptions() << global.dbname();
+    kDebug() << "Executing:" << KStandardDirs::findExe( "mysql" ) << params;
     proc->setStandardInputFile( tempDir->name() + "db" + sep + "database.sql" );
     proc->setProgram( KStandardDirs::findExe( "mysql" ), params );
     result = proc->execute();


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