[Kroupware] kdepim/kpilot/kpilot
Reinhold Kainhofer
kroupware@mail.kde.org
Fri, 28 Mar 2003 20:38:23 +0100
CVS commit by kainhofe:
Removed the dependence of kpilot and kpilotDaemon on libkabc. It was only
used in one spot, and there the filename of the standard Addressbook was just
written to the log. However, this filename has no meaning any more due to the
resource framework. It is just the default filename that would be used if no
resource ws yet created.
Please note that I don't have kroupware installed, so I don't know if this
breaks something. If so, please just revert my patch (and drop me a note so
that I know that this is really needed).
M +3 -3 Makefile.am 1.63
M +25 -31 kroupware.cc 1.6
--- kdepim/kpilot/kpilot/Makefile.am #1.62:1.63
@@ -70,6 +70,6 @@
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
-kpilot_LDADD = $(LIB_KFILE) $(PISOCK_LIB) ../lib/libkpilot.la
$(LIB_KABC)
-kpilotDaemon_LDADD = $(LIB_KFILE) $(PISOCK_LIB) ../lib/libkpilot.la
$(LIB_KABC)
+kpilot_LDADD = $(LIB_KFILE) $(PISOCK_LIB) ../lib/libkpilot.la
+kpilotDaemon_LDADD = $(LIB_KFILE) $(PISOCK_LIB) ../lib/libkpilot.la
kpilotTest_LDADD = $(LIB_KFILE) $(PISOCK_LIB) ../lib/libkpilot.la
kpilotConfig_LDADD = $(LIB_KFILE) $(PISOCK_LIB) ../lib/libkpilot.la
--- kdepim/kpilot/kpilot/kroupware.cc #1.5:1.6
@@ -36,8 +36,4 @@
#include <ktempfile.h>
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
-#include <kabc/stdaddressbook.h>
-
#include <kapplication.h>
@@ -158,6 +154,4 @@ void KroupwareSync::start_syncAddWithKMa
QByteArray data, reply_data;
QCString reply_type;
- QString name = KABC::StdAddressBook::fileName();
- logMessage( name );
QDataStream arg(data, IO_WriteOnly);
arg << filename;