]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
kconfig: gconf: avoid hardcoding model* in on_treeview*_button_press_event()
authorMasahiro Yamada <masahiroy@kernel.org>
Tue, 24 Jun 2025 15:05:22 +0000 (00:05 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Wed, 2 Jul 2025 01:36:15 +0000 (10:36 +0900)
It is better not to hardcode model1 or model2 for consistency.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
scripts/kconfig/gconf.c

index df822f4e13c5d511ed117394607d2676c3cd3542..f03e94cd5fa3c41edcec079cbf326a99d98bd541 100644 (file)
@@ -591,6 +591,7 @@ static gboolean on_treeview2_button_press_event(GtkWidget *widget,
                                                gpointer user_data)
 {
        GtkTreeView *view = GTK_TREE_VIEW(widget);
+       GtkTreeModel *model = gtk_tree_view_get_model(view);
        GtkTreePath *path;
        GtkTreeViewColumn *column;
        GtkTreeIter iter;
@@ -603,9 +604,9 @@ static gboolean on_treeview2_button_press_event(GtkWidget *widget,
        if (path == NULL)
                return FALSE;
 
-       if (!gtk_tree_model_get_iter(model2, &iter, path))
+       if (!gtk_tree_model_get_iter(model, &iter, path))
                return FALSE;
-       gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1);
+       gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1);
 
        col = column2index(column);
        if (event->type == GDK_2BUTTON_PRESS) {
@@ -699,6 +700,7 @@ static gboolean on_treeview1_button_press_event(GtkWidget *widget,
                                                gpointer user_data)
 {
        GtkTreeView *view = GTK_TREE_VIEW(widget);
+       GtkTreeModel *model = gtk_tree_view_get_model(view);
        GtkTreePath *path;
        GtkTreeIter iter;
        struct menu *menu;
@@ -709,8 +711,8 @@ static gboolean on_treeview1_button_press_event(GtkWidget *widget,
        if (path == NULL)
                return FALSE;
 
-       gtk_tree_model_get_iter(model1, &iter, path);
-       gtk_tree_model_get(model1, &iter, COL_MENU, &menu, -1);
+       gtk_tree_model_get_iter(model, &iter, path);
+       gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1);
 
        if (event->type == GDK_2BUTTON_PRESS) {
                toggle_sym_value(menu);