From a50bfdd4592569391bcc7c3e0193de66be0c88fc Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Wed, 20 Aug 2008 08:54:15 +0000 Subject: check there is an account before accessing it; prevents a segfault when calling up the 'previous conversations' dialog and there is no account configured. svn path=/trunk/; revision=1359 --- libempathy-gtk/empathy-account-chooser.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libempathy-gtk/empathy-account-chooser.c') diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index 13040b0dc..14e6e2786 100644 --- a/libempathy-gtk/empathy-account-chooser.c +++ b/libempathy-gtk/empathy-account-chooser.c @@ -244,7 +244,9 @@ empathy_account_chooser_get_account (EmpathyAccountChooser *chooser) priv = GET_PRIV (chooser); model = gtk_combo_box_get_model (GTK_COMBO_BOX (chooser)); - gtk_combo_box_get_active_iter (GTK_COMBO_BOX (chooser), &iter); + if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (chooser), &iter)) { + return NULL; + } gtk_tree_model_get (model, &iter, COL_ACCOUNT_POINTER, &account, -1); -- cgit v1.2.3