mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
kconfig: gconf: avoid hardcoding model* in on_treeview*_button_press_event()
It is better not to hardcode model1 or model2 for consistency. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
parent
e6991e8004
commit
59adbcd805
@ -591,6 +591,7 @@ static gboolean on_treeview2_button_press_event(GtkWidget *widget,
|
|||||||
gpointer user_data)
|
gpointer user_data)
|
||||||
{
|
{
|
||||||
GtkTreeView *view = GTK_TREE_VIEW(widget);
|
GtkTreeView *view = GTK_TREE_VIEW(widget);
|
||||||
|
GtkTreeModel *model = gtk_tree_view_get_model(view);
|
||||||
GtkTreePath *path;
|
GtkTreePath *path;
|
||||||
GtkTreeViewColumn *column;
|
GtkTreeViewColumn *column;
|
||||||
GtkTreeIter iter;
|
GtkTreeIter iter;
|
||||||
@ -603,9 +604,9 @@ static gboolean on_treeview2_button_press_event(GtkWidget *widget,
|
|||||||
if (path == NULL)
|
if (path == NULL)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (!gtk_tree_model_get_iter(model2, &iter, path))
|
if (!gtk_tree_model_get_iter(model, &iter, path))
|
||||||
return FALSE;
|
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);
|
col = column2index(column);
|
||||||
if (event->type == GDK_2BUTTON_PRESS) {
|
if (event->type == GDK_2BUTTON_PRESS) {
|
||||||
@ -699,6 +700,7 @@ static gboolean on_treeview1_button_press_event(GtkWidget *widget,
|
|||||||
gpointer user_data)
|
gpointer user_data)
|
||||||
{
|
{
|
||||||
GtkTreeView *view = GTK_TREE_VIEW(widget);
|
GtkTreeView *view = GTK_TREE_VIEW(widget);
|
||||||
|
GtkTreeModel *model = gtk_tree_view_get_model(view);
|
||||||
GtkTreePath *path;
|
GtkTreePath *path;
|
||||||
GtkTreeIter iter;
|
GtkTreeIter iter;
|
||||||
struct menu *menu;
|
struct menu *menu;
|
||||||
@ -709,8 +711,8 @@ static gboolean on_treeview1_button_press_event(GtkWidget *widget,
|
|||||||
if (path == NULL)
|
if (path == NULL)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
gtk_tree_model_get_iter(model1, &iter, path);
|
gtk_tree_model_get_iter(model, &iter, path);
|
||||||
gtk_tree_model_get(model1, &iter, COL_MENU, &menu, -1);
|
gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1);
|
||||||
|
|
||||||
if (event->type == GDK_2BUTTON_PRESS) {
|
if (event->type == GDK_2BUTTON_PRESS) {
|
||||||
toggle_sym_value(menu);
|
toggle_sym_value(menu);
|
||||||
|
Loading…
Reference in New Issue
Block a user