aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-03-12 19:56:32 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-03-12 19:57:06 +0800
commitafcd81098a2134d1421844ebf37a9ba90e1193bf (patch)
treec2bc07b188dd2e0b9ee333b9db1144fda350f622
parent75a991eddf0106916146c30756274bbbd03c5904 (diff)
downloadgsoc2013-empathy-afcd81098a2134d1421844ebf37a9ba90e1193bf.tar
gsoc2013-empathy-afcd81098a2134d1421844ebf37a9ba90e1193bf.tar.gz
gsoc2013-empathy-afcd81098a2134d1421844ebf37a9ba90e1193bf.tar.bz2
gsoc2013-empathy-afcd81098a2134d1421844ebf37a9ba90e1193bf.tar.lz
gsoc2013-empathy-afcd81098a2134d1421844ebf37a9ba90e1193bf.tar.xz
gsoc2013-empathy-afcd81098a2134d1421844ebf37a9ba90e1193bf.tar.zst
gsoc2013-empathy-afcd81098a2134d1421844ebf37a9ba90e1193bf.zip
early return if accounts_dialog_model_get_selected_settings() returns NULL
It can happen, typically if no account is currently selected. https://bugzilla.gnome.org/show_bug.cgi?id=671790
-rw-r--r--src/empathy-accounts-dialog.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index a3cb149b3..189f22b58 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -568,6 +568,8 @@ account_dialog_create_edit_params_dialog (EmpathyAccountsDialog *dialog)
GtkWidget *subdialog, *content, *content_area, *align;
settings = accounts_dialog_model_get_selected_settings (dialog);
+ if (settings == NULL)
+ return;
subdialog = gtk_dialog_new_with_buttons (_("Edit Connection Parameters"),
GTK_WINDOW (dialog),
@@ -701,6 +703,8 @@ account_dialow_show_edit_params_dialog (EmpathyAccountsDialog *dialog,
TpStorageRestrictionFlags storage_restrictions;
settings = accounts_dialog_model_get_selected_settings (dialog);
+ if (settings == NULL)
+ return;
account = empathy_account_settings_get_account (settings);
g_return_if_fail (account != NULL);