diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2012-10-08 20:34:34 +0100 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2012-10-08 20:34:34 +0100 |
commit | 9d29c8b48a278c466299aedd4245f8dd62cccf52 (patch) | |
tree | 59d21b506750a548981a1133827574cb635f9538 /desktop | |
parent | ce577f4dc491f6d88a4da2105d08080e8d51357f (diff) | |
parent | 5800789df23dd5fd42c1abc161f4d53d290352e5 (diff) | |
download | netsurf-9d29c8b48a278c466299aedd4245f8dd62cccf52.tar.gz netsurf-9d29c8b48a278c466299aedd4245f8dd62cccf52.tar.bz2 |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/browser.c | 9 | ||||
-rw-r--r-- | desktop/browser.h | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index 26bb75f39..7647cbb25 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -663,6 +663,9 @@ void browser_window_debug_dump(struct browser_window *bw, FILE *f) * \param url URL to start fetching in the new window (copied) * \param clone The browser window to clone * \param referer The referring uri (copied), or 0 if none + * \param history_add add to history + * \param new_tab create a new tab + * \return new browser window or NULL on error */ struct browser_window *browser_window_create(const char *url, @@ -757,6 +760,7 @@ void browser_window_initialise_common(struct browser_window *bw, * \param bw browser window * \param url URL to start fetching (copied) * \param referer the referring uri (copied), or 0 if none + * \param history_add Add to history * * Any existing fetches in the window are aborted. */ @@ -793,6 +797,8 @@ void browser_window_download(struct browser_window *bw, const char *url, * \param bw browser window * \param url URL to start fetching (copied) * \param referer the referring uri (copied), or 0 if none + * \param history_add add to history + * \param parent parent handle * * Any existing fetches in the window are aborted. */ @@ -2282,7 +2288,8 @@ void browser_window_refresh_url_bar(struct browser_window *bw, nsurl *url, * * \param bw the browser_window to search all relatives of * \param target the target to locate - * \param new_window always return a new window (ie 'Open Link in New Window') + * \param mouse The current mouse state + * \return The browser window the mouse is in */ struct browser_window *browser_window_find_target(struct browser_window *bw, diff --git a/desktop/browser.h b/desktop/browser.h index d5ad064cc..368e34476 100644 --- a/desktop/browser.h +++ b/desktop/browser.h @@ -315,7 +315,7 @@ struct selection *browser_window_get_selection(struct browser_window *bw); * Dump debug info concerning the browser window's contents to file * * \param bw The browser window - * \param bw The file to dump to + * \param f The file to dump to */ void browser_window_debug_dump(struct browser_window *bw, FILE *f); |