From: <nos...@us...> - 2006-10-07 17:02:19
|
Revision: 17437 http://svn.sourceforge.net/gaim/?rev=17437&view=rev Author: nosnilmot Date: 2006-10-07 10:01:58 -0700 (Sat, 07 Oct 2006) Log Message: ----------- Fix Coverity CIDs 141 & 142 - the return value of gtk_tree_selection_get_selected() should be checked to ensure something is selected. I also sensitized/desensitized the buttons as appropriate, which probably renders the return checking redundant, but I'm playing safe. Modified Paths: -------------- trunk/gtk/plugins/gevolution/add_buddy_dialog.c trunk/gtk/plugins/gevolution/assoc-buddy.c Modified: trunk/gtk/plugins/gevolution/add_buddy_dialog.c =================================================================== --- trunk/gtk/plugins/gevolution/add_buddy_dialog.c 2006-10-06 18:25:18 UTC (rev 17436) +++ trunk/gtk/plugins/gevolution/add_buddy_dialog.c 2006-10-07 17:01:58 UTC (rev 17437) @@ -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 Modified: trunk/gtk/plugins/gevolution/assoc-buddy.c =================================================================== --- trunk/gtk/plugins/gevolution/assoc-buddy.c 2006-10-06 18:25:18 UTC (rev 17436) +++ trunk/gtk/plugins/gevolution/assoc-buddy.c 2006-10-07 17:01:58 UTC (rev 17437) @@ -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, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |