summaryrefslogtreecommitdiffstats
path: root/kitchensync/src/memberconfig.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-08 01:37:34 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-08 01:37:34 +0000
commitd4f48636cc2631625434326e146d04f503d0247a (patch)
treea371a2337bddce3de3fa3fcac52275a8204570d9 /kitchensync/src/memberconfig.cpp
parentd8b40941f9d1a221add0b9094eb09405a91a8aab (diff)
downloadtdepim-d4f48636cc2631625434326e146d04f503d0247a.tar.gz
tdepim-d4f48636cc2631625434326e146d04f503d0247a.zip
Reverse OpenSync patch as it causes a build failure on Debian
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172771 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kitchensync/src/memberconfig.cpp')
-rw-r--r--kitchensync/src/memberconfig.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp
index d3d08a63..37755a50 100644
--- a/kitchensync/src/memberconfig.cpp
+++ b/kitchensync/src/memberconfig.cpp
@@ -23,8 +23,6 @@
#include "configgui.h"
#include "memberinfo.h"
-#include <libqopensync/result.h>
-
#include <klocale.h>
#include <kmessagebox.h>
@@ -69,16 +67,13 @@ void MemberConfig::saveData()
if ( txt.isEmpty() ) {
KMessageBox::sorry( this, i18n("Configuration of %1 is empty.").arg( mMember.pluginName() ) );
} else {
- mMember.setConfiguration( txt.utf8() );
+ TQByteArray cfg = txt.utf8();
+ cfg.truncate(cfg.size() - 1); /* discard NUL terminator */
+ mMember.setConfiguration( cfg );
mMember.setName( mGui->instanceName() );
// TODO: Check for save() error.
mMember.save();
}
}
-QSync::Member MemberConfig::member() const
-{
- return mMember;
-}
-
#include "memberconfig.moc"