--- a/gtk/plugins/gevolution/assoc-buddy.c Fri Oct 06 18:25:18 2006 +0000 +++ b/gtk/plugins/gevolution/assoc-buddy.c Sat Oct 07 17:01:58 2006 +0000 @@ -105,7 +105,11 @@ static void selected_cb(GtkTreeSelection *sel, GevoAssociateBuddyDialog *dialog) { - gtk_widget_set_sensitive(dialog->assoc_button, TRUE); + GtkTreeSelection *selection; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->treeview)); + gtk_widget_set_sensitive(dialog->assoc_button, + gtk_tree_selection_get_selected(selection, NULL, NULL)); } static void @@ -276,7 +280,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,