[Telepathy-commits] [telepathy-qt4/master] StatefulDBusProxy: move one more method to its rightful place
Simon McVittie
simon.mcvittie at collabora.co.uk
Thu Jan 22 07:51:33 PST 2009
---
TelepathyQt4/Client/dbus-proxy.cpp | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/TelepathyQt4/Client/dbus-proxy.cpp b/TelepathyQt4/Client/dbus-proxy.cpp
index ebaba0b..72ff01e 100644
--- a/TelepathyQt4/Client/dbus-proxy.cpp
+++ b/TelepathyQt4/Client/dbus-proxy.cpp
@@ -241,16 +241,6 @@ void DBusProxy::emitInvalidated()
emit invalidated(this, mPriv->invalidationReason, mPriv->invalidationMessage);
}
-void StatefulDBusProxy::onServiceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner)
-{
- // We only want to invalidate this object if it is not already invalidated,
- // and its (not any other object's) name owner changed signal is emitted.
- if (isValid() && name == busName() && newOwner == "") {
- invalidate(TELEPATHY_DBUS_ERROR_NAME_HAS_NO_OWNER,
- "Name owner lost (service crashed?)");
- }
-}
-
// ==== StatefulDBusProxy ==============================================
/**
@@ -294,6 +284,16 @@ StatefulDBusProxy::~StatefulDBusProxy()
{
}
+void StatefulDBusProxy::onServiceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner)
+{
+ // We only want to invalidate this object if it is not already invalidated,
+ // and its (not any other object's) name owner changed signal is emitted.
+ if (isValid() && name == busName() && newOwner == "") {
+ invalidate(TELEPATHY_DBUS_ERROR_NAME_HAS_NO_OWNER,
+ "Name owner lost (service crashed?)");
+ }
+}
+
// ==== StatelessDBusProxy =============================================
/**
--
1.5.6.5
More information about the Telepathy-commits
mailing list