Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/de8af23956cdf63bd82384f8cf629dfb1d79db8b
...commit
http://git.netsurf-browser.org/netsurf.git/commit/de8af23956cdf63bd82384f8cf629dfb1d79db8b
...tree
http://git.netsurf-browser.org/netsurf.git/tree/de8af23956cdf63bd82384f8cf629dfb1d79db8b
The branch, master has been updated
via de8af23956cdf63bd82384f8cf629dfb1d79db8b (commit)
from 42e176097cba3afdc6f943fcacdcc1c28fe97ccf (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/de8af23956cdf63bd82384f8cf629dfb1d79db8b
commit de8af23956cdf63bd82384f8cf629dfb1d79db8b
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Use selection_copy_to_clipboard instead of peering into core.
diff --git a/atari/gui.c b/atari/gui.c
index a2dde67..99b5f99 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -714,35 +714,12 @@ bool gui_commit_clipboard(void)
return( (r>0)?true: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)
{
bool ret = false;
if( s->defined ) {
gui_empty_clipboard();
- if(selection_traverse(s, gui_selection_traverse_handler, NULL)){
+ if(selection_copy_to_clipboard(s)){
ret = gui_commit_clipboard();
}
}
-----------------------------------------------------------------------
Summary of changes:
atari/gui.c | 25 +------------------------
1 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/atari/gui.c b/atari/gui.c
index a2dde67..99b5f99 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -714,35 +714,12 @@ bool gui_commit_clipboard(void)
return( (r>0)?true: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)
{
bool ret = false;
if( s->defined ) {
gui_empty_clipboard();
- if(selection_traverse(s, gui_selection_traverse_handler, NULL)){
+ if(selection_copy_to_clipboard(s)){
ret = gui_commit_clipboard();
}
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
