diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-06-27 17:05:18 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-06-27 17:41:26 +0800 |
| commit | c3c7502b206eb550c08e8a9271a4087d855038df (patch) | |
| tree | a1d1400a8cf2a9279c20241a0aeba37c1b12d4c5 /libempathy/empathy-client-factory.c | |
| parent | 81a65a9ab520396d5ba6eb4085b4ab653bec547c (diff) | |
| download | gsoc2013-empathy-c3c7502b206eb550c08e8a9271a4087d855038df.tar gsoc2013-empathy-c3c7502b206eb550c08e8a9271a4087d855038df.tar.gz gsoc2013-empathy-c3c7502b206eb550c08e8a9271a4087d855038df.tar.bz2 gsoc2013-empathy-c3c7502b206eb550c08e8a9271a4087d855038df.tar.lz gsoc2013-empathy-c3c7502b206eb550c08e8a9271a4087d855038df.tar.xz gsoc2013-empathy-c3c7502b206eb550c08e8a9271a4087d855038df.tar.zst gsoc2013-empathy-c3c7502b206eb550c08e8a9271a4087d855038df.zip | |
tp-chat: stop setting the TpAccount during construction
It doesn't have to be a property any more, we can just get it from the
TpConnection when we need it.
Should fix a race crash when the TpAccount of the TpConnection is not set yet;
see fdo#51444.
https://bugzilla.gnome.org/show_bug.cgi?id=678807
Diffstat (limited to 'libempathy/empathy-client-factory.c')
| -rw-r--r-- | libempathy/empathy-client-factory.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c index da647a4d9..9e915f978 100644 --- a/libempathy/empathy-client-factory.c +++ b/libempathy/empathy-client-factory.c @@ -45,12 +45,8 @@ empathy_client_factory_create_channel (TpSimpleClientFactory *factory, if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_TEXT)) { - TpAccount *account; - - account = tp_connection_get_account (conn); - return TP_CHANNEL (empathy_tp_chat_new ( - TP_SIMPLE_CLIENT_FACTORY (factory), account, conn, path, + TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties)); } |