From 128fdbec438f951348eb70829ab90b423e271d66 Mon Sep 17 00:00:00 2001
From: Michael Drake <tlsa@netsurf-browser.org>
Date: Mon, 2 Sep 2013 14:33:53 +0100
Subject: [PATCH] Select TREE_COOKIES directly.

---
 amiga/cookies.c       |  2 +-
 desktop/cookies_old.c | 11 -----------
 desktop/cookies_old.h |  1 -
 gtk/cookies.c         |  2 +-
 riscos/cookies.c      |  2 +-
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/amiga/cookies.c b/amiga/cookies.c
index 05fd9f85c..a095a6e11 100755
--- a/amiga/cookies.c
+++ b/amiga/cookies.c
@@ -23,7 +23,7 @@
 
 void ami_cookies_initialise(void)
 {
-	cookies_window = ami_tree_create(cookies_get_tree_flags(), NULL);
+	cookies_window = ami_tree_create(TREE_COOKIES, NULL);
 
 	if(!cookies_window) return;
 
diff --git a/desktop/cookies_old.c b/desktop/cookies_old.c
index c944d358b..bd3adece6 100644
--- a/desktop/cookies_old.c
+++ b/desktop/cookies_old.c
@@ -57,17 +57,6 @@ bool cookies_initialise(struct tree *tree, const char* folder_icon_name, const c
 }
 
 
-/**
- * Get flags with which the cookies tree should be created;
- *
- * \return the flags
- */
-unsigned int cookies_get_tree_flags(void)
-{
-	return TREE_COOKIES;
-}
-
-
 /**
  * Free memory and release all other resources.
  */
diff --git a/desktop/cookies_old.h b/desktop/cookies_old.h
index 47194ff42..78998bcc1 100644
--- a/desktop/cookies_old.h
+++ b/desktop/cookies_old.h
@@ -28,7 +28,6 @@
 #include "desktop/tree.h"
 
 bool cookies_initialise(struct tree *tree, const char* folder_icon_name, const char* cookie_icon_name);
-unsigned int cookies_get_tree_flags(void);
 
 void cookies_cleanup(void);
 
diff --git a/gtk/cookies.c b/gtk/cookies.c
index 99b2a803f..f8b2b7d35 100644
--- a/gtk/cookies.c
+++ b/gtk/cookies.c
@@ -112,7 +112,7 @@ bool nsgtk_cookies_init(const char *glade_file_location)
 	drawing_area = GTK_DRAWING_AREA(gtk_builder_get_object(gladeFile,
 			"cookiesDrawingArea"));
 	
-	cookies_window = nsgtk_treeview_create(cookies_get_tree_flags(), window,
+	cookies_window = nsgtk_treeview_create(TREE_COOKIES, window,
 			scrolled, drawing_area);
 	
 	if (cookies_window == NULL)
diff --git a/riscos/cookies.c b/riscos/cookies.c
index 14a1d03a1..c2dcc4ecd 100644
--- a/riscos/cookies.c
+++ b/riscos/cookies.c
@@ -107,7 +107,7 @@ void ro_gui_cookies_postinitialise(void)
 
 	cookies_window.tv = ro_treeview_create(cookies_window.window,
 			cookies_window.toolbar, &ro_cookies_treeview_callbacks,
-			cookies_get_tree_flags());
+			TREE_COOKIES);
 	if (cookies_window.tv == NULL) {
 		LOG(("Failed to allocate treeview"));
 		return;