summaryrefslogtreecommitdiff
path: root/src/lib/ecore_cocoa
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-08-18 10:36:55 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-08-22 20:39:35 +0200
commit28423160d6d296289be2e4e5197ba1d383661885 (patch)
treecc14fbc6cde3b0d2b404735fe35bc84258bf4735 /src/lib/ecore_cocoa
parenta5ee487f035d5eeb7f5d686d475e134e1127a6c2 (diff)
ecore_cocoa: move MARKUP outside of ecore_cocoa
the elementary MARKUP stuff requires ecore_cocoa to be linked to evas to find the function. However, ecore_XXXXX things should stay unrelated to evas in most cases. Thus this was not a good idea and created a circular dependency, this is fixed now. Differential Revision: https://phab.enlightenment.org/D6865
Diffstat (limited to 'src/lib/ecore_cocoa')
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa_cnp.m15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_cnp.m b/src/lib/ecore_cocoa/ecore_cocoa_cnp.m
index 03dcb22771..de9163fa28 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa_cnp.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa_cnp.m
@@ -3,7 +3,6 @@
3#endif 3#endif
4 4
5#include <Eina.h> 5#include <Eina.h>
6#include <Evas.h>
7#import <Cocoa/Cocoa.h> 6#import <Cocoa/Cocoa.h>
8#import "ecore_cocoa_window.h" 7#import "ecore_cocoa_window.h"
9#include "ecore_cocoa_private.h" 8#include "ecore_cocoa_private.h"
@@ -29,16 +28,9 @@ ecore_cocoa_clipboard_set(const void *data,
29 } 28 }
30 if (type & ECORE_COCOA_CNP_TYPE_MARKUP) 29 if (type & ECORE_COCOA_CNP_TYPE_MARKUP)
31 { 30 {
32 char *utf8; 31 WRN("Markup CNP: NOT IMPLEMENTED");
33
34 utf8 = evas_textblock_text_markup_to_utf8(NULL, (const char *)data);
35 str = [[NSString alloc] initWithBytes: utf8
36 length: strlen(utf8) // XXX strlen() ?
37 encoding: NSUTF8StringEncoding];
38 free(utf8);
39 if (str)
40 [objects addObject: str];
41 } 32 }
33
42 if (type & ECORE_COCOA_CNP_TYPE_IMAGE) 34 if (type & ECORE_COCOA_CNP_TYPE_IMAGE)
43 { 35 {
44 WRN("Image CNP: NOT IMPLEMENTED"); 36 WRN("Image CNP: NOT IMPLEMENTED");
@@ -79,8 +71,7 @@ ecore_cocoa_clipboard_get(int *size,
79 71
80 classes = [[NSMutableArray alloc] init]; 72 classes = [[NSMutableArray alloc] init];
81 73
82 if ((type & ECORE_COCOA_CNP_TYPE_STRING) || 74 if (type & ECORE_COCOA_CNP_TYPE_STRING)
83 (type & ECORE_COCOA_CNP_TYPE_MARKUP))
84 { 75 {
85 string_class = YES; 76 string_class = YES;
86 [classes addObject: [NSString class]]; 77 [classes addObject: [NSString class]];