[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/network/kcall
From:       George Kiagiadakis <gkiagiad () csd ! uoc ! gr>
Date:       2009-07-10 12:14:02
Message-ID: 1247228042.135999.7984.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 994234 by gkiagia:

Fix the approver to work with the latest telepathy-qt4.

 M  +9 -2      abstractclientapprover.cpp  
 M  +4 -2      abstractclientapprover.h  


--- trunk/playground/network/kcall/abstractclientapprover.cpp #994233:994234
@@ -83,13 +83,20 @@
         return;
     }
 
-    connect(d->dispatchOperation.data(), SIGNAL(finished()), SLOT(onDispatchOperationFinished()));
+    connect(d->dispatchOperation.data(), SIGNAL(invalidated(Tp::DBusProxy*, QString, QString)),
+            SLOT(onDispatchOperationInvalidated(Tp::DBusProxy*, QString, QString)));
     emit ready(this);
     d->context->setFinished();
 }
 
-void ApproverRequest::onDispatchOperationFinished()
+void ApproverRequest::onDispatchOperationInvalidated(Tp::DBusProxy *proxy,
+                                                     const QString & errorName,
+                                                     const QString & errorMessage)
 {
+    Q_UNUSED(proxy);
+    if ( errorName != TELEPATHY_QT4_ERROR_OBJECT_REMOVED ) {
+        kError() << errorName << errorMessage;
+    }
     emit finished(this);
 }
 
--- trunk/playground/network/kcall/abstractclientapprover.h #994233:994234
@@ -19,7 +19,7 @@
 
 #include <QtCore/QObject>
 #include <TelepathyQt4/AbstractClientApprover>
-namespace Tp { class PendingOperation; }
+namespace Tp { class PendingOperation; class DBusProxy; }
 
 class ApproverRequest : public QObject
 {
@@ -44,7 +44,9 @@
 
 private slots:
     void onDispatchOperationReady(Tp::PendingOperation *op);
-    void onDispatchOperationFinished();
+    void onDispatchOperationInvalidated(Tp::DBusProxy *proxy,
+                                        const QString & errorName,
+                                        const QString & errorMessage);
     void onClaimFinished(Tp::PendingOperation *op);
 
 private:
[prev in list] [next in list] [prev in thread] [next in thread]