From: Enlightenment S. <no-...@en...> - 2011-08-26 02:39:35
|
Log: consolidate cnp functions Author: discomfitor Date: 2011-08-25 19:39:28 -0700 (Thu, 25 Aug 2011) New Revision: 62848 Trac: http://trac.enlightenment.org/e/changeset/62848 Modified: trunk/elementary/src/lib/elm_cnp_helper.c Modified: trunk/elementary/src/lib/elm_cnp_helper.c =================================================================== --- trunk/elementary/src/lib/elm_cnp_helper.c 2011-08-26 02:32:49 UTC (rev 62847) +++ trunk/elementary/src/lib/elm_cnp_helper.c 2011-08-26 02:39:28 UTC (rev 62848) @@ -130,9 +130,7 @@ static Eina_Bool targets_converter(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize); static Eina_Bool text_converter(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize); -static Eina_Bool html_converter(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize); -static Eina_Bool edje_converter(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize); -static Eina_Bool uri_converter(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize); +static Eina_Bool general_converter(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize); static Eina_Bool image_converter(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize); static Eina_Bool vcard_send(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize); @@ -175,7 +173,7 @@ [CNP_ATOM_XELM] = { "application/x-elementary-markup", ELM_SEL_FORMAT_MARKUP, - edje_converter, + general_converter, NULL, NULL, 0 @@ -183,7 +181,7 @@ [CNP_ATOM_text_uri] = { "text/uri", ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE, /* Either images or entries */ - uri_converter, + general_converter, NULL, notify_handler_uri, 0 @@ -191,7 +189,7 @@ [CNP_ATOM_text_urilist] = { "text/uri-list", ELM_SEL_FORMAT_IMAGE, - uri_converter, + general_converter, NULL, notify_handler_uri, 0 @@ -277,7 +275,7 @@ [CNP_ATOM_text_html_utf8] = { "text/html;charset=utf-8", ELM_SEL_FORMAT_HTML, - html_converter, + general_converter, NULL, notify_handler_html, 0 @@ -285,7 +283,7 @@ [CNP_ATOM_text_html] = { "text/html", ELM_SEL_FORMAT_HTML, - html_converter, + general_converter, NULL, notify_handler_html, /* No encoding: Webkit only */ 0 @@ -984,7 +982,7 @@ } static Eina_Bool -edje_converter(char *target __UNUSED__, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__) +general_converter(char *target __UNUSED__, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__) { if (size == sizeof(int)) { @@ -1002,48 +1000,7 @@ return EINA_TRUE; } - static Eina_Bool -html_converter(char *target __UNUSED__, void *data, int size __UNUSED__, void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__) -{ - if (size == sizeof(int)) - { - Cnp_Selection *sel; - - sel = selections + *((int *)data); - if (data_ret) *data_ret = strdup(sel->selbuf); - if (size_ret) *size_ret = strlen(sel->selbuf); - } - else if (size) - { - if (data_ret) *data_ret = strndup(data, size - 1); - if (size_ret) *size_ret = size - 1; - } - - return EINA_TRUE; -} - -static Eina_Bool -uri_converter(char *target __UNUSED__, void *data, int size __UNUSED__, void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__) -{ - if (size == sizeof(int)) - { - Cnp_Selection *sel; - - sel = selections + *((int *)data); - if (data_ret) *data_ret = strdup(sel->selbuf); - if (size_ret) *size_ret = strlen(sel->selbuf); - } - else if (size) - { - if (data_ret) *data_ret = strndup(data, size - 1); - if (size_ret) *size_ret = size - 1; - } - - return EINA_TRUE; -} - -static Eina_Bool pasteimage_append(char *file, Evas_Object *entry) { char *entrytag; |