kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ecore_X(cb): Make selection code more like the Xlib version. Fix 

return from parser_files function.



SVN revision: 62725
This commit is contained in:
Christopher Michael 2011-08-23 16:38:24 +00:00
parent ca93d80a3c
commit 921497a9fc
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_selection.c
View File

@ -690,7 +690,7 @@ static void *
_ecore_xcb_selection_parser_files(const char *target, void *data, int size, int format __UNUSED__)
{
Ecore_X_Selection_Data_Files *sel;
char *_data, *tmp;
char *_data, *tmp, *t, **t2;
int i = 0, is = 0;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
@ -708,7 +708,13 @@ _ecore_xcb_selection_parser_files(const char *target, void *data, int size, int
if (_data[size - 1])
{
size++;
_data = realloc(_data, size);
t = realloc(_data, size);
if (!t)
{
free(sel);
return NULL;
}
_data = t;
_data[size - 1] = 0;
}
@ -729,9 +735,12 @@ _ecore_xcb_selection_parser_files(const char *target, void *data, int size, int
is++;
tmp[i] = 0;
sel->num_files++;
sel->files =
realloc(sel->files, sel->num_files * sizeof(char *));
sel->files[sel->num_files - 1] = strdup(tmp);
t2 = realloc(sel->files, sel->num_files * sizeof(char *));
if (t2)
{
sel->files = t2;
sel->files[sel->num_files - 1] = strdup(tmp);
}
tmp[0] = 0;
i = 0;
}
@ -741,13 +750,19 @@ _ecore_xcb_selection_parser_files(const char *target, void *data, int size, int
{
tmp[i] = 0;
sel->num_files++;
sel->files = realloc(sel->files, sel->num_files * sizeof(char *));
sel->files[sel->num_files - 1] = strdup(tmp);
t2 = realloc(sel->files, sel->num_files * sizeof(char *));
if (t2)
{
sel->files = t2;
sel->files[sel->num_files - 1] = strdup(tmp);
}
}
if (tmp) free(tmp);
if (_data) free(_data);
ECORE_XCB_SELECTION_DATA(sel)->content = ECORE_X_SELECTION_CONTENT_FILES;
ECORE_XCB_SELECTION_DATA(sel)->length = sel->num_files;
return ECORE_XCB_SELECTION_DATA(sel);
}
@ -863,7 +878,7 @@ _ecore_xcb_selection_data_files_free(void *data)
if (sel->files) free(sel->files);
}
free(sel);
return 1;
return 0;
}
static int