Hello community,
here is the log from the commit of package kitchensync
checked in at Mon Nov 6 22:13:22 CET 2006.
--------
--- KDE/kitchensync/kitchensync.changes 2006-10-25 11:59:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/kitchensync/kitchensync.changes 2006-11-06 21:12:17.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Nov 6 18:07:59 CET 2006 - cstender@suse.de
+
+- updated to version 0.01svn602778
+ o added support for filtering object types
+
+-------------------------------------------------------------------
Old:
----
kitchensync-0.01svn597185.tar.bz2
New:
----
kitchensync-0.01svn602778.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kitchensync.spec ++++++
--- /var/tmp/diff_new_pack.kb8mRF/_old 2006-11-06 22:13:13.000000000 +0100
+++ /var/tmp/diff_new_pack.kb8mRF/_new 2006-11-06 22:13:13.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kitchensync (Version 0.01svn597185)
+# spec file for package kitchensync (Version 0.01svn602778)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,17 +13,17 @@
Name: kitchensync
BuildRequires: kdebase3 kdelibs3-devel kdepim3-devel libopensync-devel
URL: http://kdepim.kde.org/
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: Productivity/Other
Summary: KDE Synchronization application based on OpenSync.
-Version: 0.01svn597185
-Release: 6
+Version: 0.01svn602778
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-%version.tar.bz2
Patch0: kitchensync-desktop.diff
Provides: kdepim3-sync
Obsoletes: kdepim3-sync
-Requires: libopensync >= 0.19
+Requires: libopensync >= 0.20
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` )
Requires: kdebase3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` )
@@ -60,6 +60,10 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
%files
%defattr(-,root,root)
/opt/kde3/bin/kitchensync
@@ -70,6 +74,9 @@
/opt/kde3/share/icons/*/*/*/kitchensync.*
%changelog -n kitchensync
+* Mon Nov 06 2006 - cstender@suse.de
+- updated to version 0.01svn602778
+ o added support for filtering object types
* Wed Oct 25 2006 - dmueller@suse.de
- add provides/obsoletes (#214878)
* Mon Oct 23 2006 - dgollub@suse.de
++++++ kitchensync-0.01svn597185.tar.bz2 -> kitchensync-0.01svn602778.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kitchensync-0.01svn597185/.emacs-dirvars new/kitchensync-0.01svn602778/.emacs-dirvars
--- old/kitchensync-0.01svn597185/.emacs-dirvars 1970-01-01 01:00:00.000000000 +0100
+++ new/kitchensync-0.01svn602778/.emacs-dirvars 2006-11-06 21:06:13.000000000 +0100
@@ -0,0 +1,9 @@
+;; -*- emacs-lisp -*-
+;;
+;; This file is processed by the dirvars emacs package. Each variable
+;; setting below is performed when this dirvars file is loaded.
+;;
+indent-tabs-mode: nil
+tab-width: 8
+c-basic-offset: 2
+evaluate: (c-set-offset 'innamespace '0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kitchensync-0.01svn597185/kitchensync/libqopensync/Makefile.am new/kitchensync-0.01svn602778/kitchensync/libqopensync/Makefile.am
--- old/kitchensync-0.01svn597185/kitchensync/libqopensync/Makefile.am 2006-01-15 17:06:52.000000000 +0100
+++ new/kitchensync-0.01svn602778/kitchensync/libqopensync/Makefile.am 2006-11-05 15:21:46.000000000 +0100
@@ -7,7 +7,7 @@
lib_LTLIBRARIES = libqopensync.la
-libqopensync_la_SOURCES = callbackhandler.cpp engine.cpp environment.cpp filter.cpp group.cpp \
+libqopensync_la_SOURCES = callbackhandler.cpp conversion.cpp engine.cpp environment.cpp filter.cpp group.cpp \
member.cpp plugin.cpp result.cpp syncmapping.cpp syncupdates.cpp \
syncchange.cpp
libqopensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kitchensync-0.01svn597185/kitchensync/libqopensync/conversion.cpp new/kitchensync-0.01svn602778/kitchensync/libqopensync/conversion.cpp
--- old/kitchensync-0.01svn597185/kitchensync/libqopensync/conversion.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/kitchensync-0.01svn602778/kitchensync/libqopensync/conversion.cpp 2006-11-05 15:21:46.000000000 +0100
@@ -0,0 +1,58 @@
+/*
+ This file is part of libqopensync.
+
+ Copyright (c) 2006 Tobias Koenig
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include
+
+#include "conversion.h"
+
+using namespace QSync;
+
+Conversion::Conversion()
+ : mEnvironment( 0 )
+{
+}
+
+Conversion::~Conversion()
+{
+}
+
+bool Conversion::isValid() const
+{
+ return mEnvironment != 0;
+}
+
+QStringList Conversion::objectTypes() const
+{
+ Q_ASSERT( mEnvironment );
+
+ OSyncFormatEnv *formatEnv = osync_conv_env_new( mEnvironment );
+ Q_ASSERT( formatEnv );
+
+ QStringList types;
+ for ( int i = 0; i < osync_conv_num_objtypes( formatEnv ); i++ ) {
+ OSyncObjType *type = osync_conv_nth_objtype( formatEnv, i );
+ types.append( QString::fromUtf8( osync_objtype_get_name( type ) ) );
+ }
+
+ osync_conv_env_free( formatEnv );
+
+ return types;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kitchensync-0.01svn597185/kitchensync/libqopensync/conversion.h new/kitchensync-0.01svn602778/kitchensync/libqopensync/conversion.h
--- old/kitchensync-0.01svn597185/kitchensync/libqopensync/conversion.h 1970-01-01 01:00:00.000000000 +0100
+++ new/kitchensync-0.01svn602778/kitchensync/libqopensync/conversion.h 2006-11-05 15:21:46.000000000 +0100
@@ -0,0 +1,56 @@
+/*
+ This file is part of libqopensync.
+
+ Copyright (c) 2006 Tobias Koenig
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef QSYNC_CONVERSION_H
+#define QSYNC_CONVERSION_H
+
+#include
+
+class OSyncEnv;
+
+namespace QSync {
+
+class Conversion
+{
+ friend class Environment;
+
+ public:
+ Conversion();
+ ~Conversion();
+
+ /**
+ Returns whether the object is a valid conversion.
+ */
+ bool isValid() const;
+
+ /**
+ Returns the list of names of supported object types.
+ */
+ QStringList objectTypes() const;
+
+ private:
+ OSyncEnv *mEnvironment;
+};
+
+}
+
+#endif
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kitchensync-0.01svn597185/kitchensync/libqopensync/environment.cpp new/kitchensync-0.01svn602778/kitchensync/libqopensync/environment.cpp
--- old/kitchensync-0.01svn597185/kitchensync/libqopensync/environment.cpp 2006-01-15 17:09:39.000000000 +0100
+++ new/kitchensync-0.01svn602778/kitchensync/libqopensync/environment.cpp 2006-11-05 15:21:46.000000000 +0100
@@ -162,3 +162,11 @@
return plugin;
}
+
+Conversion Environment::conversion() const
+{
+ Conversion conversion;
+ conversion.mEnvironment = mEnvironment;
+
+ return conversion;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kitchensync-0.01svn597185/kitchensync/libqopensync/environment.h new/kitchensync-0.01svn602778/kitchensync/libqopensync/environment.h
--- old/kitchensync-0.01svn597185/kitchensync/libqopensync/environment.h 2006-01-15 17:09:39.000000000 +0100
+++ new/kitchensync-0.01svn602778/kitchensync/libqopensync/environment.h 2006-11-05 15:21:46.000000000 +0100
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
struct OSyncEnv;
@@ -184,6 +185,11 @@
*/
Plugin pluginByName( const QString &name ) const;
+ /**
+ Returns the conversion object of this environment.
+ */
+ Conversion conversion() const;
+
private:
OSyncEnv *mEnvironment;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kitchensync-0.01svn597185/kitchensync/libqopensync/group.cpp new/kitchensync-0.01svn602778/kitchensync/libqopensync/group.cpp
--- old/kitchensync-0.01svn597185/kitchensync/libqopensync/group.cpp 2006-01-15 17:09:39.000000000 +0100
+++ new/kitchensync-0.01svn602778/kitchensync/libqopensync/group.cpp 2006-11-05 15:21:46.000000000 +0100
@@ -19,12 +19,92 @@
Boston, MA 02110-1301, USA.
*/
+/** hack includes **/
+#include
+#include
+/** hack includes **/
+
#include
+#include "conversion.h"
#include "group.h"
using namespace QSync;
+/**
+ This class is a quick hack for OpenSync 0.19 and 0.20 because
+ the engine doesn't stores the filter settings itself when calling
+ osync_group_set_objtype_enabled(), so we have to store it for every
+ group in a separated config file. This class encapsulates it.
+ */
+GroupConfig::GroupConfig()
+ : mGroup( 0 )
+{
+}
+
+QStringList GroupConfig::activeObjectTypes() const
+{
+ Q_ASSERT( mGroup );
+
+ const QString fileName = QString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) );
+
+ QFile file( fileName );
+ if ( !file.open( IO_ReadOnly ) )
+ return QStringList();
+
+ QDomDocument document;
+
+ QString message;
+ if ( !document.setContent( &file, &message ) ) {
+ qDebug( "Error on loading %s: %s", fileName.latin1(), message.latin1() );
+ return QStringList();
+ }
+ file.close();
+
+ QStringList objectTypes;
+
+ QDomElement element = document.documentElement();
+ QDomNode node = element.firstChild();
+ while ( !node.isNull() ) {
+ QDomElement childElement = node.toElement();
+ if ( !childElement.isNull() )
+ objectTypes.append( childElement.tagName() );
+
+ node = node.nextSibling();
+ }
+
+ return objectTypes;
+}
+
+void GroupConfig::setActiveObjectTypes( const QStringList &objectTypes )
+{
+ Q_ASSERT( mGroup );
+
+ QDomDocument document( "Filter" );
+ document.appendChild( document.createProcessingInstruction(
+ "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
+
+ QDomElement element = document.createElement( "filter" );
+ document.appendChild( element );
+
+ for ( uint i = 0; i < objectTypes.count(); ++i ) {
+ QDomElement entry = document.createElement( objectTypes[ i ] );
+ element.appendChild( entry );
+ }
+
+ const QString fileName = QString( "%1/filter.conf" ).arg( osync_group_get_configdir( mGroup ) );
+
+ QFile file( fileName );
+ if ( !file.open( IO_WriteOnly ) )
+ return;
+
+ QTextStream s( &file );
+ s.setEncoding( QTextStream::UnicodeUTF8 );
+ s << document.toString();
+ file.close();
+}
+
+
Group::Group()
: mGroup( 0 )
{
@@ -188,3 +268,25 @@
else
return Result();
}
+
+void Group::setObjectTypeEnabled( const QString &objectType, bool enabled )
+{
+ Q_ASSERT( mGroup );
+
+ osync_group_set_objtype_enabled( mGroup, objectType.utf8(), enabled );
+}
+
+bool Group::isObjectTypeEnabled( const QString &objectType ) const
+{
+ return osync_group_objtype_enabled( mGroup, objectType.utf8() );
+}
+
+GroupConfig Group::config() const
+{
+ Q_ASSERT( mGroup );
+
+ GroupConfig config;
+ config.mGroup = mGroup;
+
+ return config;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kitchensync-0.01svn597185/kitchensync/libqopensync/group.h new/kitchensync-0.01svn602778/kitchensync/libqopensync/group.h
--- old/kitchensync-0.01svn597185/kitchensync/libqopensync/group.h 2006-01-15 17:09:39.000000000 +0100
+++ new/kitchensync-0.01svn602778/kitchensync/libqopensync/group.h 2006-11-05 15:21:46.000000000 +0100
@@ -23,6 +23,7 @@
#define QSYNC_GROUP_H
#include
+#include
#include
#include
@@ -31,6 +32,24 @@
namespace QSync {
+/**
+ @internal
+ */
+class GroupConfig
+{
+ friend class Group;
+
+ public:
+ GroupConfig();
+
+ QStringList activeObjectTypes() const;
+ void setActiveObjectTypes( const QStringList &objectTypes );
+
+ private:
+ OSyncGroup *mGroup;
+};
+
+
class Group
{
friend class Engine;
@@ -164,10 +183,29 @@
Filter filterAt( int pos );
/**
+ Set, if the object type with given name is enabled for synchronisation for
+ this group.
+ */
+ void setObjectTypeEnabled( const QString &objectType, bool enabled );
+
+ /**
+ Returns whether the object type with given name is enabled for synchronisation for
+ this group.
+ */
+ bool isObjectTypeEnabled( const QString &objectType ) const;
+
+ /**
Saves the configuration to hard disc.
*/
Result save();
+ /**
+ Returns the config object of this group.
+
+ Note: This method is only available for OpenSync 0.19 and 0.20.
+ */
+ GroupConfig config() const;
+
bool operator==( const Group &group ) const { return mGroup == group.mGroup; }
private:
@@ -177,4 +215,3 @@
}
#endif
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kitchensync-0.01svn597185/kitchensync/src/groupconfigcommon.cpp new/kitchensync-0.01svn602778/kitchensync/src/groupconfigcommon.cpp
--- old/kitchensync-0.01svn597185/kitchensync/src/groupconfigcommon.cpp 2006-01-15 14:51:46.000000000 +0100
+++ new/kitchensync-0.01svn602778/kitchensync/src/groupconfigcommon.cpp 2006-11-06 19:19:04.000000000 +0100
@@ -23,16 +23,96 @@
#include
#include
#include
+#include
#include
#include
+#include
#include
+#include
+#include
#include "syncprocess.h"
+#include "syncprocessmanager.h"
#include "groupconfigcommon.h"
+ObjectTypeSelector::ObjectTypeSelector( QWidget *parent )
+ : QWidget( parent )
+{
+ QGridLayout *layout = new QGridLayout( this );
+ layout->setMargin( 0 );
+
+ const QSync::Conversion conversion = SyncProcessManager::self()->environment()->conversion();
+
+ QMap objectTypeMap;
+ objectTypeMap.insert( "contact", i18n( "Contacts" ) );
+ objectTypeMap.insert( "event", i18n( "Events" ) );
+ objectTypeMap.insert( "todo", i18n( "To-dos" ) );
+ objectTypeMap.insert( "note", i18n( "Notes" ) );
+ objectTypeMap.insert( "data", i18n( "Custom Data" ) );
+
+ QStringList objectTypes = conversion.objectTypes();
+
+ // reorder the entries so that contact and event are the first one
+ qHeapSort( objectTypes );
+
+ QStringList reoderedObjectTypes, stack;
+ for ( uint i = 0; i < objectTypes.count(); ++i ) {
+ if ( objectTypes[ i ] == "contact" || objectTypes[ i ] == "event" )
+ reoderedObjectTypes.append( objectTypes[ i ] );
+ else
+ stack.append( objectTypes[ i ] );
+ }
+ reoderedObjectTypes += stack;
+
+ QStringList::ConstIterator it;
+
+ int row = 0;
+ int col = 0;
+ for( it = reoderedObjectTypes.begin(); it != reoderedObjectTypes.end(); ++it ) {
+ QString objectType = *it;
+ QCheckBox *objectCheckBox = new QCheckBox( objectTypeMap[ objectType ], this );
+ layout->addWidget( objectCheckBox, row, col );
+ mObjectTypeChecks.insert( objectType, objectCheckBox );
+
+ col++;
+ if ( (row == 0 && col == 2) || col == 3 ) {
+ col = 0;
+ row++;
+ }
+ }
+}
+
+void ObjectTypeSelector::load( const QSync::Group &group )
+{
+ const QSync::GroupConfig config = group.config();
+
+ const QStringList objectTypes = config.activeObjectTypes();
+
+ QMap::ConstIterator it;
+ for( it = mObjectTypeChecks.begin(); it != mObjectTypeChecks.end(); ++it ) {
+ QCheckBox *check = it.data();
+ check->setChecked( objectTypes.contains( it.key() ) );
+ }
+}
+
+void ObjectTypeSelector::save( QSync::Group group )
+{
+ QStringList objectTypes;
+
+ QMap::ConstIterator it;
+ for( it = mObjectTypeChecks.begin(); it != mObjectTypeChecks.end(); ++it ) {
+ QCheckBox *check = it.data();
+ if ( check->isChecked() )
+ objectTypes.append( it.key() );
+ }
+
+ QSync::GroupConfig config = group.config();
+ config.setActiveObjectTypes( objectTypes );
+}
+
GroupConfigCommon::GroupConfigCommon( QWidget *parent )
: QWidget( parent )
{
@@ -43,7 +123,12 @@
mGroupName = new KLineEdit( this );
layout->addWidget( mGroupName, 0, 1 );
- layout->setRowStretch( 1, 1 );
+ layout->addWidget( new QLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, Qt::AlignTop );
+
+ mObjectTypeSelector = new ObjectTypeSelector( this );
+ layout->addWidget( mObjectTypeSelector, 1, 1 );
+
+ layout->setRowStretch( 2, 1 );
}
void GroupConfigCommon::setSyncProcess( SyncProcess *syncProcess )
@@ -51,9 +136,11 @@
mSyncProcess = syncProcess;
mGroupName->setText( mSyncProcess->group().name() );
+ mObjectTypeSelector->load( mSyncProcess->group() );
}
void GroupConfigCommon::save()
{
mSyncProcess->group().setName( mGroupName->text() );
+ mObjectTypeSelector->save( mSyncProcess->group() );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kitchensync-0.01svn597185/kitchensync/src/groupconfigcommon.h new/kitchensync-0.01svn602778/kitchensync/src/groupconfigcommon.h
--- old/kitchensync-0.01svn597185/kitchensync/src/groupconfigcommon.h 2005-08-29 12:31:00.000000000 +0200
+++ new/kitchensync-0.01svn602778/kitchensync/src/groupconfigcommon.h 2006-11-05 15:21:46.000000000 +0100
@@ -22,9 +22,25 @@
#define GROUPCONFIGCOMMON_H
#include
+#include
+
+#include
class KLineEdit;
class SyncProcess;
+class QCheckBox;
+
+class ObjectTypeSelector : public QWidget
+{
+ public:
+ ObjectTypeSelector( QWidget *parent );
+
+ void load( const QSync::Group &group );
+ void save( QSync::Group group );
+
+ private:
+ QMap mObjectTypeChecks;
+};
class GroupConfigCommon : public QWidget
{
@@ -36,6 +52,7 @@
private:
KLineEdit *mGroupName;
+ ObjectTypeSelector *mObjectTypeSelector;
SyncProcess *mSyncProcess;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kitchensync-0.01svn597185/kitchensync/src/mainwidget.cpp new/kitchensync-0.01svn602778/kitchensync/src/mainwidget.cpp
--- old/kitchensync-0.01svn597185/kitchensync/src/mainwidget.cpp 2006-01-15 14:51:46.000000000 +0100
+++ new/kitchensync-0.01svn602778/kitchensync/src/mainwidget.cpp 2006-11-05 15:21:46.000000000 +0100
@@ -46,6 +46,13 @@
initGUI();
initActions();
+ /** apply object type filter hack **/
+ int count = SyncProcessManager::self()->count();
+ for ( int i = 0; i < count; ++i ) {
+ SyncProcessManager::self()->at( i )->applyObjectTypeFilter();
+ }
+ /** apply object type filter hack **/
+
mGroupView->updateView();
connect( SyncProcessManager::self(), SIGNAL( changed() ),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kitchensync-0.01svn597185/kitchensync/src/syncprocess.cpp new/kitchensync-0.01svn602778/kitchensync/src/syncprocess.cpp
--- old/kitchensync-0.01svn597185/kitchensync/src/syncprocess.cpp 2006-01-15 14:51:46.000000000 +0100
+++ new/kitchensync-0.01svn602778/kitchensync/src/syncprocess.cpp 2006-11-05 15:21:46.000000000 +0100
@@ -25,6 +25,7 @@
#include
#include "syncprocess.h"
+#include "syncprocessmanager.h"
using namespace QSync;
@@ -77,7 +78,23 @@
if ( result.isError() )
kdDebug() << "SyncProcess::reinitEngine: " << result.message() << endl;
+ applyObjectTypeFilter();
+
emit engineChanged( mEngine );
}
+void SyncProcess::applyObjectTypeFilter()
+{
+ const QSync::Conversion conversion = SyncProcessManager::self()->environment()->conversion();
+ const QStringList objectTypes = conversion.objectTypes();
+ const QStringList activeObjectTypes = mGroup.config().activeObjectTypes();
+
+ for ( uint i = 0; i < objectTypes.count(); ++i ) {
+ if ( activeObjectTypes.contains( objectTypes[ i ] ) )
+ mGroup.setObjectTypeEnabled( objectTypes[ i ], true );
+ else
+ mGroup.setObjectTypeEnabled( objectTypes[ i ], false );
+ }
+}
+
#include "syncprocess.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kitchensync-0.01svn597185/kitchensync/src/syncprocess.h new/kitchensync-0.01svn602778/kitchensync/src/syncprocess.h
--- old/kitchensync-0.01svn597185/kitchensync/src/syncprocess.h 2006-01-15 14:51:46.000000000 +0100
+++ new/kitchensync-0.01svn602778/kitchensync/src/syncprocess.h 2006-11-05 15:21:46.000000000 +0100
@@ -47,6 +47,9 @@
void reinitEngine();
+ /** apply object type filter hack **/
+ void applyObjectTypeFilter();
+
signals:
/**
This signal is emitted whenever the engine has changed ( reinitialized ).
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kitchensync-0.01svn597185/kitchensync/src/syncprocessmanager.cpp new/kitchensync-0.01svn602778/kitchensync/src/syncprocessmanager.cpp
--- old/kitchensync-0.01svn597185/kitchensync/src/syncprocessmanager.cpp 2006-01-15 14:51:46.000000000 +0100
+++ new/kitchensync-0.01svn602778/kitchensync/src/syncprocessmanager.cpp 2006-11-05 15:11:19.000000000 +0100
@@ -117,9 +117,11 @@
{
if ( syncProcess ) {
mProcesses.remove( syncProcess );
- mEnvironment->removeGroup( syncProcess->group() );
+ const QSync::Group group = syncProcess->group();
delete syncProcess;
+ mEnvironment->removeGroup( group );
+
emit changed();
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org