From 4d8e1684371a60a9cf9bbf358a24941e84985b1f Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Wed, 29 Aug 2012 22:23:00 +0300 Subject: [PATCH] telepathy: make TpSimplePasswordManager work If we don't tell anyone we support Requests, people like mission-control will not connect to the NewChannels signal and so won't notice any new channels, like any SASL channels appearing on connection. --- src/telepathy/telepathy-connection.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/telepathy/telepathy-connection.c b/src/telepathy/telepathy-connection.c index 3a083dc5..87575108 100644 --- a/src/telepathy/telepathy-connection.c +++ b/src/telepathy/telepathy-connection.c @@ -253,9 +253,7 @@ static gboolean start_connecting(TpBaseConnection *base, if (self->password) rc = connect_to_core(self, error); else { - /* @TODO: this doesn't work, i.e. UI doesn't show a dialog */ - SIPE_DEBUG_INFO("SipeConnection::start_connecting: requesting password from user: %p", - self->password_manager); + SIPE_DEBUG_INFO_NOFORMAT("SipeConnection::start_connecting: requesting password from user"); tp_simple_password_manager_prompt_async(self->password_manager, password_manager_cb, self); @@ -306,8 +304,6 @@ static GPtrArray *create_channel_managers(TpBaseConnection *base) self->password_manager = tp_simple_password_manager_new(base); g_ptr_array_add(channel_managers, self->password_manager); - SIPE_DEBUG_INFO("SipeConnection::create_channel_managers: password %p", - self->password_manager); return(channel_managers); } @@ -332,6 +328,12 @@ static void sipe_connection_finalize(GObject *object) /* * Connection class - type implementation */ +static const gchar *interfaces_always_present[] = { + /* @TODO */ + TP_IFACE_CONNECTION_INTERFACE_REQUESTS, + NULL +}; + static void sipe_connection_class_init(SipeConnectionClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); @@ -345,6 +347,8 @@ static void sipe_connection_class_init(SipeConnectionClass *klass) base_class->start_connecting = start_connecting; base_class->shut_down = shut_down; base_class->create_channel_managers = create_channel_managers; + + base_class->interfaces_always_present = interfaces_always_present; } static void sipe_connection_init(SIPE_UNUSED_PARAMETER SipeConnection *self) -- 2.11.4.GIT