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>

diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 4097999127315591631d6b345b892a3267cce337..50c1340cf6360db6e6e5b4de5ef32eb50c6f10ea 100644 (file)
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -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);
        }
 }