diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-05-04 15:38:25 +0100 |
|---|---|---|
| committer | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2010-06-29 20:31:57 -0300 |
| commit | 84f06d14d87d892b652a91d713f75dd64dcb0979 (patch) | |
| tree | acfca3f82a84471a1967b9346f5f52217e86a9ca /telepathy-glib/connection-manager.c | |
| parent | aa8e3c7e23ecb90ea976281dedae7ce0006ebe33 (diff) | |
| download | telepathy-glib-84f06d14d87d892b652a91d713f75dd64dcb0979.tar.gz | |
TpProtocol: track our own name rather than having it poked in from outside
Diffstat (limited to 'telepathy-glib/connection-manager.c')
| -rw-r--r-- | telepathy-glib/connection-manager.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c index d86054a2c..f7ec9d3cc 100644 --- a/telepathy-glib/connection-manager.c +++ b/telepathy-glib/connection-manager.c @@ -681,12 +681,11 @@ tp_connection_manager_got_parameters (TpConnectionManager *self, g_assert (proto_object != NULL); proto_struct = _tp_protocol_get_struct (proto_object); - /* just constructed, so these should be true (implementation detail + g_assert (!tp_strdiff (proto_struct->name, protocol)); + /* just constructed, so this should be true (implementation detail * of TpProtocol) */ - g_assert (proto_struct->name == NULL); g_assert (proto_struct->params == NULL); - proto_struct->name = g_strdup (protocol); proto_struct->params = (TpConnectionManagerParam *) g_array_free (output, FALSE); @@ -1253,9 +1252,9 @@ tp_connection_manager_read_file (TpDBusDaemon *dbus_daemon, } proto_struct = _tp_protocol_get_struct (proto_object); - /* just constructed, so these should be true (implementation detail + g_assert (!tp_strdiff (proto_struct->name, name)); + /* just constructed, so this should be true (implementation detail * of TpProtocol) */ - g_assert (proto_struct->name == NULL); g_assert (proto_struct->params == NULL); proto_struct->name = g_strdup (name); |