summaryrefslogtreecommitdiff
path: root/telepathy-glib/base-connection-manager.c
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-07-14 18:02:05 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-07-15 12:30:45 +0100
commit688e2d2446b28f574ee3b9505c1defb423ee0c34 (patch)
tree2763d813b4b9d7b9d7f1848fab8f3710e75c871c /telepathy-glib/base-connection-manager.c
parentab2d8cfc97bd5f49f79b89ce859aa23dc6ffd9e0 (diff)
tp_base_connection_manager_register: check for valid protocol names
Diffstat (limited to 'telepathy-glib/base-connection-manager.c')
-rw-r--r--telepathy-glib/base-connection-manager.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/telepathy-glib/base-connection-manager.c b/telepathy-glib/base-connection-manager.c
index 3b5418b58..c90cd438c 100644
--- a/telepathy-glib/base-connection-manager.c
+++ b/telepathy-glib/base-connection-manager.c
@@ -1070,6 +1070,12 @@ tp_base_connection_manager_register (TpBaseConnectionManager *self)
TpBaseProtocolClass *protocol_class =
TP_BASE_PROTOCOL_GET_CLASS (protocol);
+ if (!tp_connection_manager_check_valid_protocol_name (name, &error))
+ {
+ g_critical ("%s", error->message);
+ goto except;
+ }
+
/* don't export uninformative "stub" protocol objects on D-Bus */
if (protocol_class->is_stub)
continue;