kconfig: gconf: avoid hardcoding model2 in on_treeview2_cursor_changed()
[ Upstream commit cae9cdbcd9af044810bcceeb43a87accca47c71d ] The on_treeview2_cursor_changed() handler is connected to both the left and right tree views, but it hardcodes model2 (the GtkTreeModel of the right tree view). This is incorrect. Get the associated model from the view. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
6f6958846e
commit
327877f082
@@ -981,13 +981,14 @@ on_treeview2_key_press_event(GtkWidget * widget,
|
||||
void
|
||||
on_treeview2_cursor_changed(GtkTreeView * treeview, gpointer user_data)
|
||||
{
|
||||
GtkTreeModel *model = gtk_tree_view_get_model(treeview);
|
||||
GtkTreeSelection *selection;
|
||||
GtkTreeIter iter;
|
||||
struct menu *menu;
|
||||
|
||||
selection = gtk_tree_view_get_selection(treeview);
|
||||
if (gtk_tree_selection_get_selected(selection, &model2, &iter)) {
|
||||
gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1);
|
||||
if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
|
||||
gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1);
|
||||
text_insert_help(menu);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user