Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/88055b58109712b7933386892a7b2ee75c538011
...commit
http://git.netsurf-browser.org/netsurf.git/commit/88055b58109712b7933386892a7b2ee75c538011
...tree
http://git.netsurf-browser.org/netsurf.git/tree/88055b58109712b7933386892a7b2ee75c538011
The branch, master has been updated
via 88055b58109712b7933386892a7b2ee75c538011 (commit)
from c5bcf0b8098d75f614bf106d7819ae3a2f7c050d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/88055b58109712b7933386892a7b2ee75c538011
commit 88055b58109712b7933386892a7b2ee75c538011
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Update to use selection_copy_to_clipboard, although this code is all
commented out anyway.
diff --git a/windows/gui.c b/windows/gui.c
index 8ad3b32..21e9d17 100644
--- a/windows/gui.c
+++ b/windows/gui.c
@@ -1792,29 +1792,8 @@ bool gui_commit_clipboard(void)
{
return false;
}
-/*
-static bool
-gui_selection_traverse_handler(const char *text,
- size_t length,
- struct box *box,
- void *handle,
- const char *space_text,
- size_t space_length)
-{
- bool add_space = box != NULL ? box->space != 0 : false;
-
- if (space_text != NULL && space_length > 0) {
- if (!gui_add_to_clipboard(space_text, space_length, false)) {
- return false;
- }
- }
- if (!gui_add_to_clipboard(text, length, add_space))
- return false;
- return true;
-}
-*/
bool gui_copy_to_clipboard(struct selection *s)
{
if (selection_defined(s)) {
@@ -1823,8 +1802,7 @@ bool gui_copy_to_clipboard(struct selection *s)
/* OpenClipboard(s->bw->window->main);
EmptyClipboard();
- if (selection_traverse(s, gui_selection_traverse_handler,
- NULL)) {
+ if (selection_copy_to_clipboard(s)) {
CloseClipboard();
return true;
}
-----------------------------------------------------------------------
Summary of changes:
windows/gui.c | 24 +-----------------------
1 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/windows/gui.c b/windows/gui.c
index 8ad3b32..21e9d17 100644
--- a/windows/gui.c
+++ b/windows/gui.c
@@ -1792,29 +1792,8 @@ bool gui_commit_clipboard(void)
{
return false;
}
-/*
-static bool
-gui_selection_traverse_handler(const char *text,
- size_t length,
- struct box *box,
- void *handle,
- const char *space_text,
- size_t space_length)
-{
- bool add_space = box != NULL ? box->space != 0 : false;
-
- if (space_text != NULL && space_length > 0) {
- if (!gui_add_to_clipboard(space_text, space_length, false)) {
- return false;
- }
- }
- if (!gui_add_to_clipboard(text, length, add_space))
- return false;
- return true;
-}
-*/
bool gui_copy_to_clipboard(struct selection *s)
{
if (selection_defined(s)) {
@@ -1823,8 +1802,7 @@ bool gui_copy_to_clipboard(struct selection *s)
/* OpenClipboard(s->bw->window->main);
EmptyClipboard();
- if (selection_traverse(s, gui_selection_traverse_handler,
- NULL)) {
+ if (selection_copy_to_clipboard(s)) {
CloseClipboard();
return true;
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
