summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2013-09-02 14:39:04 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2013-09-02 14:39:04 +0100
commit9f35fd3fee6279f0bcd4fa0b3758548bbceaf1ab (patch)
treed589c3fd6e28b098a831816695d463e3493ced0c
parent128fdbec438f951348eb70829ab90b423e271d66 (diff)
downloadnetsurf-9f35fd3fee6279f0bcd4fa0b3758548bbceaf1ab.tar.gz
netsurf-9f35fd3fee6279f0bcd4fa0b3758548bbceaf1ab.tar.bz2
Use TREE_HISTORY directly.
-rwxr-xr-xamiga/history.c2
-rwxr-xr-xatari/history.c2
-rw-r--r--cocoa/HistoryWindowController.m2
-rw-r--r--desktop/history_global_core.c11
-rw-r--r--desktop/history_global_core.h1
-rw-r--r--gtk/history.c3
-rw-r--r--riscos/global_history.c2
7 files changed, 5 insertions, 18 deletions
diff --git a/amiga/history.c b/amiga/history.c
index cc161d03f..23a6a709f 100755
--- a/amiga/history.c
+++ b/amiga/history.c
@@ -24,7 +24,7 @@
void ami_global_history_initialise(void)
{
- global_history_window = ami_tree_create(history_global_get_tree_flags(), NULL);
+ global_history_window = ami_tree_create(TREE_HISTORY, NULL);
if(!global_history_window) return;
diff --git a/atari/history.c b/atari/history.c
index fd4e8f5d1..b17f2c239 100755
--- a/atari/history.c
+++ b/atari/history.c
@@ -117,7 +117,7 @@ bool atari_global_history_init( void )
}
wind_set_str(handle, WF_NAME, (char*)messages_get("GlobalHistory"));
- gl_history.tv = atari_treeview_create(history_global_get_tree_flags(),
+ gl_history.tv = atari_treeview_create(TREE_HISTORY,
gl_history.window, handle_event);
gemtk_wm_unlink(gl_history.window);
diff --git a/cocoa/HistoryWindowController.m b/cocoa/HistoryWindowController.m
index 94fb2979e..436f786d2 100644
--- a/cocoa/HistoryWindowController.m
+++ b/cocoa/HistoryWindowController.m
@@ -30,7 +30,7 @@
{
if ((self = [super initWithWindowNibName: @"HistoryWindow"]) == nil) return nil;
- tree = [[Tree alloc] initWithFlags: history_global_get_tree_flags()];
+ tree = [[Tree alloc] initWithFlags: TREE_HISTORY];
history_global_initialise( [tree tree], "directory.png" );
return self;
diff --git a/desktop/history_global_core.c b/desktop/history_global_core.c
index 8c46516cb..cb889dc11 100644
--- a/desktop/history_global_core.c
+++ b/desktop/history_global_core.c
@@ -52,17 +52,6 @@ bool history_global_initialise(struct tree *tree, const char* folder_icon_name)
/**
- * Get flags with which the global history tree should be created;
- *
- * \return the flags
- */
-unsigned int history_global_get_tree_flags(void)
-{
- return TREE_HISTORY;
-}
-
-
-/**
* Deletes the global history tree.
*/
void history_global_cleanup(void)
diff --git a/desktop/history_global_core.h b/desktop/history_global_core.h
index 7b8e6823a..0e6168235 100644
--- a/desktop/history_global_core.h
+++ b/desktop/history_global_core.h
@@ -25,7 +25,6 @@
#include "desktop/tree.h"
bool history_global_initialise(struct tree *tree, const char* folder_icon_name);
-unsigned int history_global_get_tree_flags(void);
void history_global_cleanup(void);
bool history_global_export(const char *path);
diff --git a/gtk/history.c b/gtk/history.c
index e7b083671..ae0282312 100644
--- a/gtk/history.c
+++ b/gtk/history.c
@@ -115,8 +115,7 @@ bool nsgtk_history_init(const char *glade_file_location)
drawing_area = GTK_DRAWING_AREA(gtk_builder_get_object(gladeFile, "globalHistoryDrawingArea"));
global_history_window = nsgtk_treeview_create(
- history_global_get_tree_flags(), window, scrolled,
- drawing_area);
+ TREE_HISTORY, window, scrolled, drawing_area);
if (global_history_window == NULL)
return false;
diff --git a/riscos/global_history.c b/riscos/global_history.c
index 8eeb924ac..830f17cd9 100644
--- a/riscos/global_history.c
+++ b/riscos/global_history.c
@@ -112,7 +112,7 @@ void ro_gui_global_history_postinitialise(void)
ro_treeview_create(global_history_window.window,
global_history_window.toolbar,
&ro_global_history_treeview_callbacks,
- history_global_get_tree_flags());
+ TREE_HISTORY);
if (global_history_window.tv == NULL) {
LOG(("Failed to allocate treeview"));
return;