Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/42e176097cba3afdc6f943fcacdcc1c28fe97ccf
...commit
http://git.netsurf-browser.org/netsurf.git/commit/42e176097cba3afdc6f943fcacdcc1c28fe97ccf
...tree
http://git.netsurf-browser.org/netsurf.git/tree/42e176097cba3afdc6f943fcacdcc1c28fe97ccf
The branch, master has been updated
via 42e176097cba3afdc6f943fcacdcc1c28fe97ccf (commit)
from 88055b58109712b7933386892a7b2ee75c538011 (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/42e176097cba3afdc6f943fcacdcc1c28fe97ccf
commit 42e176097cba3afdc6f943fcacdcc1c28fe97ccf
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Use selection_copy_to_clipboard instead of peering into core.
diff --git a/cocoa/selection.m b/cocoa/selection.m
index cb6a936..587f120 100644
--- a/cocoa/selection.m
+++ b/cocoa/selection.m
@@ -69,17 +69,6 @@ bool gui_add_to_clipboard(const char *text, size_t length,
bool space)
return true;
}
-static bool cocoa_clipboard_copy_handler(const char *text, size_t length,
struct box *box,
-
void *handle, const char *whitespace_text,
-
size_t whitespace_length)
-{
- bool add_space = box != NULL ? box->space != 0 : false;
-
- if (whitespace_text && !gui_add_to_clipboard( whitespace_text,
-
whitespace_length, false )) return false;
- return gui_add_to_clipboard( text, length, add_space );
-}
-
bool gui_commit_clipboard(void)
{
NSPasteboard *pb = [NSPasteboard generalPasteboard];
@@ -91,7 +80,7 @@ bool gui_commit_clipboard(void)
bool gui_copy_to_clipboard(struct selection *s)
{
- if (selection_defined( s ) && selection_traverse( s,
cocoa_clipboard_copy_handler, NULL ))
+ if (selection_defined( s ) && selection_copy_to_clipboard( s ))
gui_commit_clipboard();
return true;
}
-----------------------------------------------------------------------
Summary of changes:
cocoa/selection.m | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/cocoa/selection.m b/cocoa/selection.m
index cb6a936..587f120 100644
--- a/cocoa/selection.m
+++ b/cocoa/selection.m
@@ -69,17 +69,6 @@ bool gui_add_to_clipboard(const char *text, size_t length,
bool space)
return true;
}
-static bool cocoa_clipboard_copy_handler(const char *text, size_t length,
struct box *box,
-
void *handle, const char *whitespace_text,
-
size_t whitespace_length)
-{
- bool add_space = box != NULL ? box->space != 0 : false;
-
- if (whitespace_text && !gui_add_to_clipboard( whitespace_text,
-
whitespace_length, false )) return false;
- return gui_add_to_clipboard( text, length, add_space );
-}
-
bool gui_commit_clipboard(void)
{
NSPasteboard *pb = [NSPasteboard generalPasteboard];
@@ -91,7 +80,7 @@ bool gui_commit_clipboard(void)
bool gui_copy_to_clipboard(struct selection *s)
{
- if (selection_defined( s ) && selection_traverse( s,
cocoa_clipboard_copy_handler, NULL ))
+ if (selection_defined( s ) && selection_copy_to_clipboard( s ))
gui_commit_clipboard();
return true;
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
