aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-04-28 14:25:10 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2011-04-28 14:30:12 +0800
commit8a5cc3dbf497e0ed99bb7254dcf584d832647d0a (patch)
treef5328f23fc315bde1cbe8a6c9a479e518255c3f1
parent0f3a239c71f4f9fab63ab32c637f4aaa4a811417 (diff)
downloadgsoc2013-empathy-8a5cc3dbf497e0ed99bb7254dcf584d832647d0a.tar
gsoc2013-empathy-8a5cc3dbf497e0ed99bb7254dcf584d832647d0a.tar.gz
gsoc2013-empathy-8a5cc3dbf497e0ed99bb7254dcf584d832647d0a.tar.bz2
gsoc2013-empathy-8a5cc3dbf497e0ed99bb7254dcf584d832647d0a.tar.lz
gsoc2013-empathy-8a5cc3dbf497e0ed99bb7254dcf584d832647d0a.tar.xz
gsoc2013-empathy-8a5cc3dbf497e0ed99bb7254dcf584d832647d0a.tar.zst
gsoc2013-empathy-8a5cc3dbf497e0ed99bb7254dcf584d832647d0a.zip
Set the parent and check the return value correctly
The parent is currently unused, but it's nice to set it correctly anyway.
-rw-r--r--libempathy-gtk/empathy-account-widget.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index c78bcb7b8..ef764fb5d 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -866,7 +866,16 @@ static void
account_widget_apply_clicked_cb (GtkWidget *button,
EmpathyAccountWidget *self)
{
- empathy_accounts_dialog_skype_disable_other_accounts (NULL, NULL);
+ GtkWidget *parent;
+
+ parent = gtk_widget_get_toplevel (button);
+ if (!GTK_IS_WINDOW (parent) || !gtk_widget_is_toplevel (parent))
+ parent = NULL;
+
+ if (!empathy_accounts_dialog_skype_disable_other_accounts (NULL,
+ GTK_WINDOW (parent)))
+ /* the user chose not to proceed */
+ return;
account_widget_apply_and_log_in (self);
}