summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean.guyomarch@openwide.fr>2015-10-15 10:41:38 +0200
committerNicolas Aguirre <aguirre.nicolas@gmail.com>2015-11-10 08:32:49 +0100
commitdbe57695ef956d2fd3cb24fa60a10c5f027e3c64 (patch)
treeecac8735327d86d8890074ddcb1d360cc6a48f36
parentc17971bc807929a6cafea752d7483c97a3dd4619 (diff)
downloadefl-dbe57695ef956d2fd3cb24fa60a10c5f027e3c64.tar.gz
ecore_cocoa_cnp: make API thread-safe
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa_cnp.m11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_cnp.m b/src/lib/ecore_cocoa/ecore_cocoa_cnp.m
index 600c4c1a49..b18901b95a 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa_cnp.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa_cnp.m
@@ -14,13 +14,11 @@ ecore_cocoa_selection_clipboard_set(const void *data,
int size,
Ecore_Cocoa_Cnp_Type type)
{
- static NSMutableArray *objects = nil;
+ NSMutableArray *objects;
NSString *str = nil;
BOOL ok = YES;
- if (!objects)
- objects = [[NSMutableArray alloc] init];
-
+ objects = [[NSMutableArray alloc] init];
if (type & ECORE_COCOA_CNP_TYPE_STRING)
{
str = [[NSString alloc] initWithBytes: data
@@ -69,7 +67,7 @@ ecore_cocoa_selection_clipboard_get(int *size,
Ecore_Cocoa_Cnp_Type type,
Ecore_Cocoa_Cnp_Type *retrieved_types)
{
- static NSMutableArray *classes = nil;
+ NSMutableArray *classes;
void *data;
NSDictionary *options;
NSPasteboard *pb;
@@ -78,8 +76,7 @@ ecore_cocoa_selection_clipboard_get(int *size,
BOOL string_class = NO;
Ecore_Cocoa_Cnp_Type types = 0;
- if (!classes)
- classes = [[NSMutableArray alloc] init];
+ classes = [[NSMutableArray alloc] init];
if ((type & ECORE_COCOA_CNP_TYPE_STRING) ||
(type & ECORE_COCOA_CNP_TYPE_MARKUP))