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

List:       kde-commits
Subject:    playground/pim/syncml
From:       Sascha Peilicke <sasch.pe () gmx ! de>
Date:       2009-07-14 15:33:38
Message-ID: 1247585618.068328.607.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 996630 by saschpe:

More stuff for the Funambol client and FindFunambol.cmake

 M  +9 -19     CMakeLists.txt  
 M  +10 -12    clientagent-funambol/clientagent.cpp  
 M  +1 -1      clientagent-funambol/clientagent.h  
 M  +2 -2      clientagent-funambol/clientagent.kcfg  
 A             cmake/modules/FindFunambol.cmake   \
cmake/modules/FindLibFunambol.cmake#995415  D             \
cmake/modules/FindLibFunambol.cmake  


--- trunk/playground/pim/syncml/CMakeLists.txt #996629:996630
@@ -12,18 +12,9 @@
 find_package(KdepimLibs REQUIRED)
 find_package(Akonadi REQUIRED)
 find_program(XSLTPROC_EXECUTABLE xsltproc)
-#macro_log_feature(XSLTPROC_EXECUTABLE "xsltproc" "The command line XSLT processor \
from libxslt" "http://xmlsoft.org/XSLT/" TRUE "" "Needed for building this Akonadi \
                agent.")
-#find_package(LibSoup2 REQUIRED)
-#find_package(BlueZ REQUIRED)
-#find_package(OpenObex REQUIRED)
-#macro_log_feature(LIBWBXML2_FOUND "LibOpenObex" "LibOpenObex Library" \
"http://sourceforge.net/projects/openobex" TRUE "1.3" "Enables SyncML Bluetooth/OBEX \
                transport.")
-#find_package(LibWbxml2 REQUIRED)
-#macro_log_feature(LIBWBXML2_FOUND "LibWbxml2" "LibWbxml2 Library" \
                "http://libwbxml.opensync.org" TRUE "0.10.7" "Enables SyncML message \
                compression.")
-find_package(LibSyncMl REQUIRED)
-#macro_log_feature(LIBSYNCML_FOUND "LibSyncML" "LibSyncML Library" \
"http://libsyncml.opensync.org" TRUE "0.5.3" "Needed for building this Akonadi \
agent.") +find_package(LibSyncMl)
+find_package(Funambol)
 
-find_package(LibFunambol)
-
 if(XSLTPROC_EXECUTABLE)
   # generates a D-Bus interface description from a KConfigXT file
   macro(kcfg_generate_dbus_interface _kcfg _name)
@@ -40,23 +31,22 @@
 endif(XSLTPROC_EXECUTABLE)
 
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-
 include_directories(
     ${KDE4_INCLUDES}
     ${KDEPIMLIBS_INCLUDE_DIRS}
     ${AKONADI_INCLUDE_DIR}
     ${QT_QTDBUS_INCLUDE_DIR}
     ${LIBSYNCML_INCLUDE_DIRS}
-    ${LIBFUNAMBOL_INCLUDE_DIRS}
+    ${FUNAMBOL_INCLUDE_DIRS}
 )
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-
 macro_display_feature_log()
 
-add_subdirectory(serveragent)
-#add_subdirectory(clientagent)
-if(LIBFUNAMBOL_FOUND)
+if(LIBSYNCML_FOUND)
+    add_subdirectory(serveragent)
+    #add_subdirectory(clientagent)
+endif(LIBSYNCML_FOUND)
+if(FUNAMBOL_FOUND)
     add_subdirectory(clientagent-funambol)
-endif(LIBFUNAMBOL_FOUND)
+endif(FUNAMBOL_FOUND)
 #add_subdirectory(kcm)
--- trunk/playground/pim/syncml/clientagent-funambol/clientagent.cpp #996629:996630
@@ -32,7 +32,6 @@
 #include <kwindowsystem.h>
 
 #include <QtDBus/QDBusConnection>
-#include <QUuid>
 
 using namespace Akonadi;
 
@@ -89,7 +88,7 @@
     QUuid id = QUuid(Settings::self()->uuid());
     if (id.isNull()) {
         id = QUuid::createUuid();
-        Settings::self()->setUuid(id);
+        Settings::self()->setUuid(id.toString());
     }
 
     AccessConfig* ac = new AccessConfig();
@@ -114,29 +113,28 @@
     ac->setClientNonce("");
     ac->setMaxMsgSize(10000);
     ac->setReadBufferSize(0);
-    ac->setUserAgent("Akonadi");
+    ac->setUserAgent("Akonadi SyncML client agent");
     ac->setCheckConn(TRUE);
     ac->setResponseTimeout(0);
     m_managerConfig->setAccessConfig(*ac);
     delete ac;
 
-    // Customize for specific device
     DeviceConfig* dc = new DeviceConfig();
     //dc->setVerDTD("1.1");
-    dc->setMan("KDE");
+    dc->setMan("KDE");                                  // Manufacturer
     dc->setMod("Akonadi");
-    dc->setOem("KDE");
+    dc->setOem("KDE");                                  // OEM
     dc->setFwv("");
     dc->setSwv("");
     dc->setHwv("");
-    dc->setDevID(id.toString().toAscii());  // This should be a GUID
-    dc->setDevType("workstation");          // Or \
pda,handheld,server,workstation,pager,phone +    \
dc->setDevID(Settings::self()->uuid().toLatin1());  // This should be a GUID +    \
dc->setDevType("workstation");                      // Or \
pda,handheld,server,workstation,pager,phone  dc->setDsV("");
-    dc->setUtc(TRUE);                       // UTC support
-    dc->setLoSupport(FALSE);                // Large object support
+    dc->setUtc(FALSE);                                  // UTC support
+    dc->setLoSupport(FALSE);                            // Large object support
     dc->setNocSupport(FALSE);
-    dc->setLogLevel(LOG_LEVEL_NONE);
-    //dc->setLogLevel(LOG_LEVEL_DEBUG);
+    //dc->setLogLevel(LOG_LEVEL_NONE);
+    dc->setLogLevel(LOG_LEVEL_DEBUG);
     dc->setMaxObjSize(0);
     dc->setDevInfHash("");
     m_managerConfig->setDeviceConfig(*dc);
--- trunk/playground/pim/syncml/clientagent-funambol/clientagent.h #996629:996630
@@ -22,7 +22,7 @@
 
 #include <akonadi/agentbase.h>
 
-#include <client/SyncClient.h>
+#include <funambol/common/client/SyncClient.h>
 
 /**
  *
--- trunk/playground/pim/syncml/clientagent-funambol/clientagent.kcfg #996629:996630
@@ -7,13 +7,13 @@
     <group name="General">
         <entry name="Name" type="String">
             <label></label>
-            <default>My Funambol SyncML client agent</default>
+            <default>My simple SyncML client agent</default>
         </entry>
         <entry name="FirstRun" type="Bool">
             <default>true</default>
         </entry>
         <entry name="uuid" type="String">
-            <label>Unique user ID, used to identify this SyncML client</label>
+            <label>Globally unique identifier for this SyncML client</label>
             <default></default>
         </entry>
     </group>


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