[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/kresources/kolab/shared
From: Laurent Montel <montel () kde ! org>
Date: 2007-06-22 16:44:50
Message-ID: 1182530690.069981.21613.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 678958 by mlaurent:
Fix crash
M +5 -3 kmailconnection.cpp
M +3 -3 kmailconnection.h
M +1 -2 resourcekolabbase.cpp
--- trunk/KDE/kdepim/kresources/kolab/shared/kmailconnection.cpp #678957:678958
@@ -44,9 +44,8 @@
using namespace Kolab;
-KMailConnection::KMailConnection( ResourceKolabBase* resource )
- : QDBusAbstractAdaptor( this )
- , mResource( resource )
+KMailConnection::KMailConnection( ResourceKolabBase* resource, const QString &uniq )
+ : mResource( resource )
, mKmailGroupwareInterface( 0 )
{
// Make the connection to KMail ready
@@ -56,8 +55,11 @@
SLOT(dbusServiceOwnerChanged(QString,QString,QString)) );
#endif
// TODO connect to the dbus signals from kmail here
+ kDebug()<<" uniq :"<<uniq<<endl;
+ QDBusConnection::sessionBus().registerObject( \
uniq,this,QDBusConnection::ExportScriptableSlots|QDBusConnection::ExportScriptableSignals ); }
+
KMailConnection::~KMailConnection()
{
delete mKmailGroupwareInterface;
--- trunk/KDE/kdepim/kresources/kolab/shared/kmailconnection.h #678957:678958
@@ -50,9 +50,9 @@
/**
This class provides the kmail connectivity for IMAP resources.
*/
-class KOLABSHARED_EXPORT KMailConnection : public QDBusAbstractAdaptor {
+class KOLABSHARED_EXPORT KMailConnection : public QObject {
Q_OBJECT
-
+ Q_CLASSINFO("D-Bus Interface", "org.kde.kmail.GroupWare")
// These are the methods called by KMail when the resource changes
public Q_SLOTS:
Q_SCRIPTABLE bool fromKMailAddIncidence( const QString& type, const QString& resource,
@@ -68,7 +68,7 @@
const QString& folder );
public:
- KMailConnection( ResourceKolabBase* resource );
+ KMailConnection( ResourceKolabBase* resource, const QString&uniq );
virtual ~KMailConnection();
/**
--- trunk/KDE/kdepim/kresources/kolab/shared/resourcekolabbase.cpp #678957:678958
@@ -55,8 +55,7 @@
KGlobal::locale()->insertCatalog( "kres_kolab" );
KGlobal::locale()->insertCatalog( "libkcal" );
QString uniqueObjId = "/Kolabresource_" +objId + QString::number( uniquifier++ ).toLatin1();
- mConnection = new KMailConnection( this ); //Rename it to adaptor.
- //QDBusConnection::sessionBus().registerObject( uniqueObjId, \
this,QDBusConnection::ExportScriptableSlots|QDBusConnection::ExportScriptableSignals ); + mConnection = \
new KMailConnection( this, uniqueObjId ); //Rename it to adaptor. }
ResourceKolabBase::~ResourceKolabBase()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic