diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-11-13 23:44:46 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-11-16 18:13:36 +0800 |
| commit | 28c8aaa95db1f26e18f8542458d6ff690fd2da49 (patch) | |
| tree | d9cd742eb307ee94f34a60dc10f57242eb031d45 | |
| parent | edf18bab031a39dfa79d54833f774b5acce64ba8 (diff) | |
| download | gsoc2013-empathy-28c8aaa95db1f26e18f8542458d6ff690fd2da49.tar gsoc2013-empathy-28c8aaa95db1f26e18f8542458d6ff690fd2da49.tar.gz gsoc2013-empathy-28c8aaa95db1f26e18f8542458d6ff690fd2da49.tar.bz2 gsoc2013-empathy-28c8aaa95db1f26e18f8542458d6ff690fd2da49.tar.lz gsoc2013-empathy-28c8aaa95db1f26e18f8542458d6ff690fd2da49.tar.xz gsoc2013-empathy-28c8aaa95db1f26e18f8542458d6ff690fd2da49.tar.zst gsoc2013-empathy-28c8aaa95db1f26e18f8542458d6ff690fd2da49.zip | |
log-window: check if the account chooser isn't already ready
If not we could wait forever if the chooser became ready right away.
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index f6f6ef17f..09b3abd34 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -285,13 +285,17 @@ empathy_log_window_show (TpAccount *account, log_window_chats_setup (window); log_window_chats_populate (window); - /* Chat will be selected once the account chooser is ready */ if (account && chat_id) { - g_signal_connect (account_chooser, "ready", - G_CALLBACK (account_chooser_ready_cb), window); window->selected_account = account; window->selected_chat_id = g_strdup (chat_id); window->selected_is_chatroom = is_chatroom; + + if (empathy_account_chooser_is_ready (account_chooser)) + account_chooser_ready_cb (account_chooser, window); + else + /* Chat will be selected once the account chooser is ready */ + g_signal_connect (account_chooser, "ready", + G_CALLBACK (account_chooser_ready_cb), window); } if (parent) { |