empathy r1359 - trunk/libempathy-gtk

[fpeters svn gnome org]

Author: fpeters
Date: Wed Aug 20 08:54:15 2008
New Revision: 1359
URL: http://svn.gnome.org/viewvc/empathy?rev=1359&view=rev

Log:
check there is an account before accessing it; prevents a segfault when calling
up the 'previous conversations' dialog and there is no account configured.


Modified:
   trunk/libempathy-gtk/empathy-account-chooser.c

Modified: trunk/libempathy-gtk/empathy-account-chooser.c
==============================================================================
--- trunk/libempathy-gtk/empathy-account-chooser.c	(original)
+++ trunk/libempathy-gtk/empathy-account-chooser.c	Wed Aug 20 08:54:15 2008
@@ -244,7 +244,9 @@
 	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);