[Telepathy-commits] [telepathy-qt4/master] Tame the Q_ASSERTs in StatefulDBusProxy invalidation code a bit.

[George Goldberg]

---
 TelepathyQt4/Client/dbus-proxy.cpp |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/TelepathyQt4/Client/dbus-proxy.cpp b/TelepathyQt4/Client/dbus-proxy.cpp
index 0e80e1d..7915ec4 100644
--- a/TelepathyQt4/Client/dbus-proxy.cpp
+++ b/TelepathyQt4/Client/dbus-proxy.cpp
@@ -129,12 +129,8 @@ QString StatefulDBusProxy::invalidationMessage() const
 
 void StatefulDBusProxy::invalidate(const QString& reason, const QString& message)
 {
-    // FIXME: Which of these should be warnings instead?
     Q_ASSERT(isValid());
-    Q_ASSERT(mPriv->invalidationReason.isEmpty());
-    Q_ASSERT(mPriv->invalidationMessage.isEmpty());
     Q_ASSERT(!reason.isEmpty());
-    // FIXME: can message be empty?
 
     mPriv->invalidationReason = reason;
     mPriv->invalidationMessage = message;
@@ -149,7 +145,7 @@ void StatefulDBusProxy::invalidate(const QString& reason, const QString& message
 void StatefulDBusProxy::emitInvalidated()
 {
     Q_ASSERT(!isValid());
-    Q_ASSERT(!mPriv->invalidationReason.isEmpty());
+
     emit invalidated(this, mPriv->invalidationReason, mPriv->invalidationMessage);
 }
 
-- 
1.5.6.5