diff -r 050c5dc5ec76 -r 61aa25e4f18a gtk/plugins/gevolution/add_buddy_dialog.c
--- a/gtk/plugins/gevolution/add_buddy_dialog.c	Fri Oct 06 18:25:18 2006 +0000
+++ b/gtk/plugins/gevolution/add_buddy_dialog.c	Sat Oct 07 17:01:58 2006 +0000
@@ -95,7 +95,8 @@
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->treeview));
 
-	gtk_tree_selection_get_selected(selection, NULL, &iter);
+	if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
+		return;
 
 	gtk_tree_model_get(GTK_TREE_MODEL(dialog->model), &iter,
 					   COLUMN_NAME, &fullname,
@@ -343,7 +344,11 @@
 static void
 selected_cb(GtkTreeSelection *sel, GevoAddBuddyDialog *dialog)
 {
-	gtk_widget_set_sensitive(dialog->select_button, TRUE);
+	GtkTreeSelection *selection;
+
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->treeview));
+	gtk_widget_set_sensitive(dialog->select_button,
+							 gtk_tree_selection_get_selected(selection, NULL, NULL));
 }
 
 static void