[Telepathy-commits] [telepathy-glib/master] TpConnectionManager: don't support being constructed with no name

[Simon McVittie]

If we were constructed without an object path or a bus name,
TpProxy would already have asserted. So, we can safely assume that
we have a CM name.
---
 telepathy-glib/connection-manager.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index 6f8a0e2..93cd4b6 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -877,17 +877,18 @@ tp_connection_manager_constructor (GType type,
   TpProxy *as_proxy = (TpProxy *) self;
   const gchar *object_path = as_proxy->object_path;
 
+  g_return_val_if_fail (object_path != NULL, NULL);
+  g_return_val_if_fail (bus_name != NULL, NULL);
+
   /* Watch my D-Bus name */
   tp_dbus_daemon_watch_name_owner (as_proxy->dbus_daemon,
       as_proxy->bus_name, tp_connection_manager_name_owner_changed_cb, self,
       NULL);
 
-  if (object_path == NULL || object_path[0] != '/')
-    self->name = NULL;
-  else
-    self->name = strrchr (object_path, '/') + 1;
+  self->name = strrchr (object_path, '/') + 1;
+  g_assert (self->name != NULL);
 
-  if (self->priv->manager_file == NULL && self->name != NULL)
+  if (self->priv->manager_file == NULL)
     {
       self->priv->manager_file =
           tp_connection_manager_find_manager_file (self->name);
-- 
1.5.6.5