pull/21/head
Timothy Pearson 12 years ago
parent 4535df08c5
commit 10251f9a2a

@ -5,9 +5,9 @@ INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
kde_module_LTLIBRARIES = kcal_kabc.la
kcal_kabc_la_SOURCES = resourcekabc.cpp resourcekabcconfig.cpp
kcal_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kcal_kabc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
kcal_tdeabc_la_SOURCES = resourcekabc.cpp resourcekabcconfig.cpp
kcal_tdeabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kcal_tdeabc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/kaddressbook/common/libkabcommon.la
libkcalincludedir = $(includedir)/libkcal

@ -36,7 +36,7 @@ typedef KRES::PluginFactory<ResourceCardDav, ResourceCardDavConfig> CardDavFacto
extern "C"
{
void *init_kabc_carddav()
void *init_tdeabc_carddav()
{
TDEGlobal::locale()->insertCatalogue( "tdepimresources" );
TDEGlobal::locale()->insertCatalogue( "kres_caldav" );

@ -1,5 +1,5 @@
# Code generation options for tdeconfig_compiler
File=tderesources_kabc_egroupware.kcfg
File=tderesources_tdeabc_egroupware.kcfg
ClassName=EGroupwarePrefs
NameSpace=KABC
Singleton=false

@ -32,7 +32,7 @@ typedef KRES::PluginFactory< ResourceXMLRPC, ResourceXMLRPCConfig > XMLRPCFactor
// Problem: How to insert the catalogue!
extern "C"
{
void *init_kabc_xmlrpc()
void *init_tdeabc_xmlrpc()
{
TDEGlobal::locale()->insertCatalogue( "kres_xmlrpc" );
return new XMLRPCFactory;

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="tderesources_kabc_egroupwarerc"/>
<kcfgfile name="tderesources_tdeabc_egroupwarerc"/>
<group name="General">
<entry type="String" name="Url">

@ -33,7 +33,7 @@ typedef KRES::PluginFactory< ResourceGroupDav, ResourceGroupwareBaseConfig > Gro
// Problem: How do I insert the catalogue???
extern "C"
{
void *init_kabc_groupdav()
void *init_tdeabc_groupdav()
{
TDEGlobal::locale()->insertCatalogue( "tdepimresources" );
TDEGlobal::locale()->insertCatalogue( "kres_groupdav" );

@ -1,5 +1,5 @@
ClassName=GroupwarePrefs
File=tderesources_kabc_groupware.kcfg
File=tderesources_tdeabc_groupware.kcfg
GlobalEnums=true
IncludeFiles=libtdepim/kresourceprefs.h
Inherits=KResourcePrefs

@ -30,7 +30,7 @@ typedef KRES::PluginFactory<ResourceGroupware, ResourceGroupwareConfig> Groupwar
extern "C"
{
void *init_kabc_groupware()
void *init_tdeabc_groupware()
{
TDEGlobal::locale()->insertCatalogue( "libkcal" );
TDEGlobal::locale()->insertCatalogue( "kres_groupware" );

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="tderesources_kabc_groupwarerc" />
<kcfgfile name="tderesources_tdeabc_groupwarerc" />
<group name="General" >
<entry key="Url" type="String" >
<label>Server URL</label>

@ -1,5 +1,5 @@
ClassName=GroupwisePrefs
File=tderesources_kabc_groupwise.kcfg
File=tderesources_tdeabc_groupwise.kcfg
GlobalEnums=true
IncludeFiles=libtdepim/kresourceprefs.h
Inherits=KResourcePrefs

@ -31,7 +31,7 @@ typedef KRES::PluginFactory<ResourceGroupwise, ResourceGroupwiseConfig> Groupwis
// Problem: How do I insert the catalogue???
extern "C"
{
void *init_kabc_groupwise()
void *init_tdeabc_groupwise()
{
TDEGlobal::locale()->insertCatalogue( "libkcal" );
TDEGlobal::locale()->insertCatalogue( "kres_groupwise" );

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="tderesources_kabc_groupwiserc" />
<kcfgfile name="tderesources_tdeabc_groupwiserc" />
<group name="General" >
<entry key="Url" type="String" >
<label>Server URL</label>

@ -243,7 +243,7 @@ void ResourceSlox::slotResult( TDEIO::Job *job )
TQValueList<SloxItem>::ConstIterator it;
for( it = items.begin(); it != items.end(); ++it ) {
SloxItem item = *it;
TQString uid = "tderesources_slox_kabc_" + item.sloxId;
TQString uid = "tderesources_slox_tdeabc_" + item.sloxId;
if ( item.status == SloxItem::Delete ) {
TQMap<TQString,Addressee>::Iterator it;
it = mAddrMap.find( uid );
@ -317,7 +317,7 @@ void ResourceSlox::slotUploadResult( TDEIO::Job *job )
// use the id provided by the server
Addressee a = *search_res;
mAddrMap.remove( search_res );
a.setUid( "tderesources_slox_kabc_" + item.sloxId );
a.setUid( "tderesources_slox_tdeabc_" + item.sloxId );
a.setResource( this );
a.setChanged( false );
mAddrMap.replace( a.uid(), a );
@ -494,7 +494,7 @@ void ResourceSlox::uploadContacts()
} else if ( !changedAddr.isEmpty() ) {
mUploadAddressee = changedAddr.first();
WebdavHandler::addSloxElement( this, doc, prop, fieldName( ObjectId ),
mUploadAddressee.uid().remove( 0, sizeof("tderesources_slox_kabc_") - 1) );
mUploadAddressee.uid().remove( 0, sizeof("tderesources_slox_tdeabc_") - 1) );
} else if ( !deletedAddr.isEmpty() ) {
mUploadAddressee = deletedAddr.first();
isDelete = true;
@ -507,7 +507,7 @@ void ResourceSlox::uploadContacts()
if ( !isDelete ) {
createAddresseeFields( doc, prop, mUploadAddressee );
} else {
TQString tmp_uid = mUploadAddressee.uid().remove( 0, sizeof("tderesources_slox_kabc_") - 1); // remove prefix from uid
TQString tmp_uid = mUploadAddressee.uid().remove( 0, sizeof("tderesources_slox_tdeabc_") - 1); // remove prefix from uid
WebdavHandler::addSloxElement( this, doc, prop, fieldName( ObjectId ), tmp_uid );
WebdavHandler::addSloxElement( this, doc, prop, "method", "DELETE" );
}

@ -30,7 +30,7 @@ typedef KRES::PluginFactory< ResourceSlox, ResourceSloxConfig > SloxFactory;
extern "C"
{
void *init_kabc_slox()
void *init_tdeabc_slox()
{
TDEGlobal::locale()->insertCatalogue( "libkcal" );
TDEGlobal::locale()->insertCatalogue( "kabc_slox" );

@ -1,5 +1,5 @@
# Code generation options for tdeconfig_compiler
File=tderesources_kabc_slox.kcfg
File=tderesources_tdeabc_slox.kcfg
ClassName=SloxPrefs
NameSpace=KABC
Singleton=false

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="tderesources_kabc_sloxrc"/>
<kcfgfile name="tderesources_tdeabc_sloxrc"/>
<group name="General">
<entry type="String" name="Url">
Loading…
Cancel
Save