aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-10-05 22:07:15 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-10-06 00:58:38 +0800
commit90f62ff1b5f9077482744ec8e218089d07fb8dc2 (patch)
tree092ad2320741a8f70098235d69db7d8c694d9cc3 /src
parent30d4036989990a22b4c40ffc2b805b57291b5548 (diff)
downloadgsoc2013-empathy-90f62ff1b5f9077482744ec8e218089d07fb8dc2.tar
gsoc2013-empathy-90f62ff1b5f9077482744ec8e218089d07fb8dc2.tar.gz
gsoc2013-empathy-90f62ff1b5f9077482744ec8e218089d07fb8dc2.tar.bz2
gsoc2013-empathy-90f62ff1b5f9077482744ec8e218089d07fb8dc2.tar.lz
gsoc2013-empathy-90f62ff1b5f9077482744ec8e218089d07fb8dc2.tar.xz
gsoc2013-empathy-90f62ff1b5f9077482744ec8e218089d07fb8dc2.tar.zst
gsoc2013-empathy-90f62ff1b5f9077482744ec8e218089d07fb8dc2.zip
accounts_dialog_account_display_name_changed_cb: check that accounts_dialog_model_get_selected_settings didn't return NULL (#597416)
All the other callers of this function cope with setting being NULL so this one should do as well.
Diffstat (limited to 'src')
-rw-r--r--src/empathy-accounts-dialog.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index ea61732c4..77bf37414 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -1224,6 +1224,9 @@ accounts_dialog_account_display_name_changed_cb (EmpathyAccount *account,
display_name = empathy_account_get_display_name (account);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
settings = accounts_dialog_model_get_selected_settings (dialog);
+ if (settings == NULL)
+ return;
+
selected_account = empathy_account_settings_get_account (settings);
if (accounts_dialog_get_account_iter (dialog, account, &iter))