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

List:       kde-commits
Subject:    KDE/kdepim/wizards
From:       Laurent Montel <montel () kde ! org>
Date:       2007-06-22 13:57:12
Message-ID: 1182520632.970924.725.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 678892 by mlaurent:

Add kcalkolab


 M  +2 -3      CMakeLists.txt  
 M  +1 -12     kolabwizard.cpp  


--- trunk/KDE/kdepim/wizards/CMakeLists.txt #678891:678892
@@ -23,7 +23,7 @@
 kabc_xmlrpc kcal_xmlrpc knotes_xmlrpc
 kcal_slox kabc_slox
 kabckolab knoteskolab
-#kcalkolab
+kcalkolab
 kabc kcal kdepim kpimidentities
 )
 
@@ -74,8 +74,7 @@
 
 kde4_add_executable(kolabwizard ${kolabwizard_SRCS})
 
-# port me: add kcalkolab again below
-target_link_libraries(kolabwizard  ${KDE4_KDECORE_LIBS} ${KDE4_KCAL_LIBS} kdepim \
kpimidentities kabckolab knoteskolab) +target_link_libraries(kolabwizard  \
${KDE4_KDECORE_LIBS} ${KDE4_KCAL_LIBS} kdepim kpimidentities kabckolab knoteskolab \
kcalkolab)  
 install(TARGETS kolabwizard  DESTINATION ${BIN_INSTALL_DIR})
 
--- trunk/KDE/kdepim/wizards/kolabwizard.cpp #678891:678892
@@ -25,13 +25,7 @@
 
 #include "kolabkmailchanges.h"
 
-#ifdef __GNUC__
-#warning Port me!
-#endif
-#if 0
 #include "kresources/kolab/kcal/resourcekolab.h"
-#endif
-
 #include "kresources/kolab/knotes/resourcekolab.h"
 #include "kresources/kolab/kabc/resourcekolab.h"
 
@@ -114,7 +108,7 @@
 #ifdef __GNUC__
 #warning Port me!
 #endif
-#if 0
+#if 0      
       KCal::ResourceKolab *r = new KCal::ResourceKolab();
       r->setResourceName( i18n("Kolab Server") );
       m.add( r );
@@ -136,15 +130,10 @@
     {
       KRES::Manager<KABC::Resource> m( "contact" );
       m.readConfig();
-#ifdef __GNUC__
-#warning Port me!
-#endif
-#if 0
       KABC::ResourceKolab *r = new KABC::ResourceKolab();
       r->setResourceName( i18n("Kolab Server") );
       m.add( r );
       m.setStandardResource( r );
-#endif
       m.writeConfig();
     }
 


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