mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
kconfig: gconf: remove init_tree_model()
Move the relevant code into init_left_tree() or init_right_tree(). Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
@@ -1254,17 +1254,13 @@ static gboolean visible_func(GtkTreeModel *model, GtkTreeIter *iter,
|
||||
(opt_mode == OPT_PROMPT && menu_has_prompt(menu));
|
||||
}
|
||||
|
||||
static void init_tree_model(void)
|
||||
static void init_left_tree(void)
|
||||
{
|
||||
tree2 = gtk_tree_store_new(COL_NUMBER,
|
||||
G_TYPE_STRING, G_TYPE_STRING,
|
||||
G_TYPE_STRING, G_TYPE_STRING,
|
||||
G_TYPE_STRING, G_TYPE_STRING,
|
||||
G_TYPE_POINTER, GDK_TYPE_COLOR,
|
||||
G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF,
|
||||
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
|
||||
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
|
||||
G_TYPE_BOOLEAN);
|
||||
GtkTreeView *view = GTK_TREE_VIEW(tree1_w);
|
||||
GtkCellRenderer *renderer;
|
||||
GtkTreeSelection *sel;
|
||||
GtkTreeViewColumn *column;
|
||||
GtkTreeModel *filter;
|
||||
|
||||
tree1 = gtk_tree_store_new(COL_NUMBER,
|
||||
G_TYPE_STRING, G_TYPE_STRING,
|
||||
@@ -1275,15 +1271,6 @@ static void init_tree_model(void)
|
||||
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
|
||||
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
|
||||
G_TYPE_BOOLEAN);
|
||||
}
|
||||
|
||||
static void init_left_tree(void)
|
||||
{
|
||||
GtkTreeView *view = GTK_TREE_VIEW(tree1_w);
|
||||
GtkCellRenderer *renderer;
|
||||
GtkTreeSelection *sel;
|
||||
GtkTreeViewColumn *column;
|
||||
GtkTreeModel *filter;
|
||||
|
||||
filter = gtk_tree_model_filter_new(GTK_TREE_MODEL(tree1), NULL);
|
||||
|
||||
@@ -1326,6 +1313,16 @@ static void init_right_tree(void)
|
||||
GtkTreeModel *filter;
|
||||
gint i;
|
||||
|
||||
tree2 = gtk_tree_store_new(COL_NUMBER,
|
||||
G_TYPE_STRING, G_TYPE_STRING,
|
||||
G_TYPE_STRING, G_TYPE_STRING,
|
||||
G_TYPE_STRING, G_TYPE_STRING,
|
||||
G_TYPE_POINTER, GDK_TYPE_COLOR,
|
||||
G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF,
|
||||
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
|
||||
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
|
||||
G_TYPE_BOOLEAN);
|
||||
|
||||
filter = gtk_tree_model_filter_new(GTK_TREE_MODEL(tree2), NULL);
|
||||
|
||||
gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(filter),
|
||||
@@ -1448,7 +1445,6 @@ int main(int ac, char *av[])
|
||||
|
||||
/* Load the interface and connect signals */
|
||||
init_main_window(glade_file);
|
||||
init_tree_model();
|
||||
init_left_tree();
|
||||
init_right_tree();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user