Commit cf2c4a42 authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds

[PATCH] gconf compile warning fixes

gconf compile warning fixes (by Buddy Lucas <b.lucas@ohra.nl>)
parent 46bd8fd8
...@@ -1173,7 +1173,7 @@ on_treeview1_button_press_event(GtkWidget * widget, ...@@ -1173,7 +1173,7 @@ on_treeview1_button_press_event(GtkWidget * widget,
gtk_widget_realize(tree2_w); gtk_widget_realize(tree2_w);
gtk_tree_view_set_cursor(view, path, NULL, FALSE); gtk_tree_view_set_cursor(view, path, NULL, FALSE);
gtk_widget_grab_focus(GTK_WIDGET(tree2_w)); gtk_widget_grab_focus(tree2_w);
return FALSE; return FALSE;
} }
...@@ -1402,7 +1402,6 @@ static void update_tree(struct menu *src, GtkTreeIter * dst) ...@@ -1402,7 +1402,6 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
struct symbol *sym; struct symbol *sym;
struct property *prop; struct property *prop;
struct menu *menu1, *menu2; struct menu *menu1, *menu2;
static GtkTreePath *path = NULL;
if (src == &rootmenu) if (src == &rootmenu)
indent = 1; indent = 1;
...@@ -1527,7 +1526,7 @@ static void display_tree(struct menu *menu) ...@@ -1527,7 +1526,7 @@ static void display_tree(struct menu *menu)
if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT)) || if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT)) ||
(view_mode == FULL_VIEW) (view_mode == FULL_VIEW)
|| (view_mode == SPLIT_VIEW))*/ || (view_mode == SPLIT_VIEW))*/
if ((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT) if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))
|| (view_mode == FULL_VIEW) || (view_mode == SPLIT_VIEW)) { || (view_mode == FULL_VIEW) || (view_mode == SPLIT_VIEW)) {
indent++; indent++;
display_tree(child); display_tree(child);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment