[next] telepathy-glib: simple-conn: don't reimplement dbus-status

Simon McVittie smcv at kemper.freedesktop.org
Thu Apr 10 05:52:14 PDT 2014


Module: telepathy-glib
Branch: next
Commit: d65b48456efc4d3e5a7f3936f33fe8cd48be00ef
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=d65b48456efc4d3e5a7f3936f33fe8cd48be00ef

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Apr  8 13:34:24 2014 +0100

simple-conn: don't reimplement dbus-status

This used to be done so we could emulate a connection manager older
than telepathy-spec 0.19.2, but that functionality was removed in
commit 347307b7.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77187
Reviewed-by: Xavier Claessens

---

 tests/lib/simple-conn.c |   16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/tests/lib/simple-conn.c b/tests/lib/simple-conn.c
index 9acea0a..be1934d 100644
--- a/tests/lib/simple-conn.c
+++ b/tests/lib/simple-conn.c
@@ -33,7 +33,6 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsSimpleConnection, tp_tests_simple_connection,
 enum
 {
   PROP_ACCOUNT = 1,
-  PROP_DBUS_STATUS,
   N_PROPS
 };
 
@@ -70,12 +69,7 @@ get_property (GObject *object,
     case PROP_ACCOUNT:
       g_value_set_string (value, self->priv->account);
       break;
-    case PROP_DBUS_STATUS:
-        {
-          g_value_set_uint (value,
-              tp_base_connection_get_status (TP_BASE_CONNECTION (self)));
-        }
-      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, spec);
   }
@@ -277,14 +271,6 @@ tp_tests_simple_connection_class_init (TpTestsSimpleConnectionClass *klass)
       "The username of this user", NULL,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_ACCOUNT, param_spec);
-
-  param_spec = g_param_spec_uint ("dbus-status",
-      "Connection.Status",
-      "The connection status as visible on D-Bus (overridden so can break it)",
-      TP_CONNECTION_STATUS_CONNECTED, G_MAXUINT,
-      TP_CONNECTION_STATUS_DISCONNECTED,
-      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_DBUS_STATUS, param_spec);
 }
 
 void



More information about the telepathy-commits mailing list