diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-10-30 22:43:16 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-10-30 22:52:54 +0000 |
| commit | 1620f20c4d1e13b05f108407508653841d4887eb (patch) | |
| tree | 6187310a69bef4937bd830f31ede32e4c0096a95 /desktop/global_history.c | |
| parent | 07376fc96bfe4f0670bef625295d460865ee114f (diff) | |
| download | netsurf-1620f20c4d1e13b05f108407508653841d4887eb.tar.gz netsurf-1620f20c4d1e13b05f108407508653841d4887eb.tar.bz2 | |
make global history treeview callback return error
returns an error instead of directly waning the user.
Diffstat (limited to 'desktop/global_history.c')
| -rw-r--r-- | desktop/global_history.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/desktop/global_history.c b/desktop/global_history.c index 7d679e5a2..aaf4239ad 100644 --- a/desktop/global_history.c +++ b/desktop/global_history.c @@ -661,10 +661,12 @@ static nserror global_history_tree_node_folder_cb( return NSERROR_OK; } -static nserror global_history_tree_node_entry_cb( - struct treeview_node_msg msg, void *data) + +static nserror +global_history_tree_node_entry_cb(struct treeview_node_msg msg, void *data) { struct global_history_entry *e = data; + nserror ret = NSERROR_OK; switch (msg.msg) { case TREE_MSG_NODE_DELETE: @@ -678,10 +680,8 @@ static nserror global_history_tree_node_entry_cb( case TREE_MSG_NODE_LAUNCH: { - nserror error; struct browser_window *existing = NULL; - enum browser_window_create_flags flags = - BW_CREATE_HISTORY; + enum browser_window_create_flags flags = BW_CREATE_HISTORY; /* TODO: Set existing to window that new tab appears in */ @@ -693,16 +693,14 @@ static nserror global_history_tree_node_entry_cb( /* TODO: flags ^= BW_CREATE_TAB; */ } - error = browser_window_create(flags, e->url, NULL, + ret = browser_window_create(flags, e->url, NULL, existing, NULL); - if (error != NSERROR_OK) { - warn_user(messages_get_errorcode(error), 0); - } } break; } - return NSERROR_OK; + return ret; } + struct treeview_callback_table gh_tree_cb_t = { .folder = global_history_tree_node_folder_cb, .entry = global_history_tree_node_entry_cb |