diff --git a/src/lib/ecore_cocoa/Ecore_Cocoa.h b/src/lib/ecore_cocoa/Ecore_Cocoa.h index a94785cee7..7f7ca6d9d8 100644 --- a/src/lib/ecore_cocoa/Ecore_Cocoa.h +++ b/src/lib/ecore_cocoa/Ecore_Cocoa.h @@ -472,7 +472,7 @@ EAPI Ecore_Cocoa_Object *ecore_cocoa_window_get(const Ecore_Cocoa_Window *window * @param type * @return EINA_TRUE on success, EINA_FALSE on failure */ -EAPI Eina_Bool ecore_cocoa_selection_clipboard_set(const void *data, +EAPI Eina_Bool ecore_cocoa_clipboard_set(const void *data, int size, Ecore_Cocoa_Cnp_Type type); @@ -487,15 +487,15 @@ EAPI Eina_Bool ecore_cocoa_selection_clipboard_set(const void *data, * @c retrieved_types will contain ECORE_COCOA_CNP_TYPE_STRING and the data * will be a C string (char*) that must be freed after use. */ -EAPI void *ecore_cocoa_selection_clipboard_get(int *size, - Ecore_Cocoa_Cnp_Type type, - Ecore_Cocoa_Cnp_Type *retrieved_types) +EAPI void *ecore_cocoa_clipboard_get(int *size, + Ecore_Cocoa_Cnp_Type type, + Ecore_Cocoa_Cnp_Type *retrieved_types) EINA_WARN_UNUSED_RESULT; /** * Deletes the contents of the Cocoa clipboard */ -EAPI void ecore_cocoa_selection_clipboard_clear(void); +EAPI void ecore_cocoa_clipboard_clear(void); /** * Set the Cocoa cursor for a given Cocoa window diff --git a/src/lib/ecore_cocoa/ecore_cocoa_cnp.m b/src/lib/ecore_cocoa/ecore_cocoa_cnp.m index efe3cbdbef..da2db90aa0 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa_cnp.m +++ b/src/lib/ecore_cocoa/ecore_cocoa_cnp.m @@ -10,9 +10,9 @@ #import "ecore_cocoa_app.h" EAPI Eina_Bool -ecore_cocoa_selection_clipboard_set(const void *data, - int size, - Ecore_Cocoa_Cnp_Type type) +ecore_cocoa_clipboard_set(const void *data, + int size, + Ecore_Cocoa_Cnp_Type type) { NSMutableArray *objects; NSString *str = nil; @@ -62,9 +62,9 @@ ecore_cocoa_selection_clipboard_set(const void *data, EAPI void * -ecore_cocoa_selection_clipboard_get(int *size, - Ecore_Cocoa_Cnp_Type type, - Ecore_Cocoa_Cnp_Type *retrieved_types) +ecore_cocoa_clipboard_get(int *size, + Ecore_Cocoa_Cnp_Type type, + Ecore_Cocoa_Cnp_Type *retrieved_types) { NSMutableArray *classes; void *data; @@ -167,7 +167,7 @@ fail: } EAPI void -ecore_cocoa_selection_clipboard_clear(void) +ecore_cocoa_clipboard_clear(void) { [[NSPasteboard generalPasteboard] clearContents]; } diff --git a/src/lib/elementary/elm_cnp.c b/src/lib/elementary/elm_cnp.c index 9e03260594..eafdffc411 100644 --- a/src/lib/elementary/elm_cnp.c +++ b/src/lib/elementary/elm_cnp.c @@ -4059,7 +4059,7 @@ _job_pb_cb(void *data) /* Pass to cocoa clipboard */ type = _elm_sel_format_to_ecore_cocoa_cnp_type(sel->requestformat); - pbdata = ecore_cocoa_selection_clipboard_get(&pbdata_len, type, &get_type); + pbdata = ecore_cocoa_clipboard_get(&pbdata_len, type, &get_type); ddata.format = ELM_SEL_FORMAT_NONE; if (get_type & ECORE_COCOA_CNP_TYPE_STRING) @@ -4123,7 +4123,7 @@ _cocoa_elm_cnp_selection_set(Ecore_Cocoa_Window *win, sel->selbuf[buflen] = 0; sel->buflen = buflen; type = _elm_sel_format_to_ecore_cocoa_cnp_type(format); - ecore_cocoa_selection_clipboard_set(selbuf, buflen, type); + ecore_cocoa_clipboard_set(selbuf, buflen, type); } return ok; @@ -4160,7 +4160,7 @@ _cocoa_elm_cnp_selection_clear(Evas_Object *obj EINA_UNUSED, sel->loss_data = NULL; ELM_SAFE_FREE(sel->selbuf, free); sel->buflen = 0; - ecore_cocoa_selection_clipboard_clear(); + ecore_cocoa_clipboard_clear(); return EINA_TRUE; }