diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-04-03 16:09:56 +0800 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-04-03 16:09:56 +0800 |
| commit | f5d311ec7a8e609dbd94914e15d2bd983f05224c (patch) | |
| tree | 022dc017c88b590e66f7d3bd6eecab68b6f7851c | |
| parent | 0ad138fa1c21e7f58b617fe34506ee3dc3bdc695 (diff) | |
| parent | 3af2b86ec550ae1f37f25504afb95c590e7dd085 (diff) | |
| download | gsoc2013-empathy-f5d311ec7a8e609dbd94914e15d2bd983f05224c.tar gsoc2013-empathy-f5d311ec7a8e609dbd94914e15d2bd983f05224c.tar.gz gsoc2013-empathy-f5d311ec7a8e609dbd94914e15d2bd983f05224c.tar.bz2 gsoc2013-empathy-f5d311ec7a8e609dbd94914e15d2bd983f05224c.tar.lz gsoc2013-empathy-f5d311ec7a8e609dbd94914e15d2bd983f05224c.tar.xz gsoc2013-empathy-f5d311ec7a8e609dbd94914e15d2bd983f05224c.tar.zst gsoc2013-empathy-f5d311ec7a8e609dbd94914e15d2bd983f05224c.zip | |
Merge branch 'gnome-3-8'
| -rw-r--r-- | ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c index d6713f286..58074eecf 100644 --- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c +++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c @@ -147,6 +147,12 @@ response_cb (GtkWidget *widget, gint response, EmpathyAccountsPluginWidget *self) { + if (!self->priv->account_widget) + { + // widget might not be ready yet + g_signal_emit (self, signals[SIG_DONE], 0); + return; + } if (response == GTK_RESPONSE_OK) { empathy_account_widget_apply_and_log_in (self->priv->account_widget); @@ -279,8 +285,8 @@ maybe_add_account_widget (EmpathyAccountsPluginWidget *self) } else { - g_signal_connect_swapped (self->priv->settings, "notify::ready", - G_CALLBACK (add_account_widget), self); + tp_g_signal_connect_object (self->priv->settings, "notify::ready", + G_CALLBACK (add_account_widget), self, G_CONNECT_SWAPPED); } } |