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

E17: fix FIXME's 

patch by Maxime Villard

SVN revision: 75716
This commit is contained in:
Vincent Torri 2012-08-26 19:41:34 +00:00
parent 6b1ec80534
commit 837d3fa390
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/modules/shot/e_mod_main.c
View File

@ -283,8 +283,7 @@ _share_done(void)
o_label = NULL; o_label = NULL;
if (url_ret) if (url_ret)
{ {
free(url_ret); E_FREE(url_ret);
url_ret = NULL;
} }
if (url_up) if (url_up)
{ {
@ -411,11 +410,9 @@ _win_share_cb(void *data __UNUSED__, void *data2 __UNUSED__)
else snprintf(buf, sizeof(buf), "/tmp/e-shot-XXXXXX.jpg"); else snprintf(buf, sizeof(buf), "/tmp/e-shot-XXXXXX.jpg");
if (!mkstemp(buf)) if (!mkstemp(buf))
{ {
e_util_dialog_show e_util_dialog_show(_("Error - Can't create file"),
(_("Error - Can't create File"), _("Cannot create temporary file '%s': %s"),
_("Cannot create temporary file:\n" buf, strerror(errno));
"%s"),
buf);
if (win) if (win)
{ {
e_object_del(E_OBJECT(win)); e_object_del(E_OBJECT(win));
@ -432,14 +429,18 @@ _win_share_cb(void *data __UNUSED__, void *data2 __UNUSED__)
f = fopen(buf, "rb"); f = fopen(buf, "rb");
if (!f) if (!f)
{ {
// FIXME: error disp e_util_dialog_show(_("Error - Can't open file"),
_("Cannot open temporary file '%s': %s"),
buf, strerror(errno));
return; return;
} }
fseek(f, 0, SEEK_END); fseek(f, 0, SEEK_END);
fsize = ftell(f); fsize = ftell(f);
if (fsize < 1) if (fsize < 1)
{ {
// FIXME: error disp e_util_dialog_show(_("Error - Bad size"),
_("Cannot get size of file '%s'"),
buf);
fclose(f); fclose(f);
return; return;
} }
@ -448,15 +449,17 @@ _win_share_cb(void *data __UNUSED__, void *data2 __UNUSED__)
fdata = malloc(fsize); fdata = malloc(fsize);
if (!fdata) if (!fdata)
{ {
// FIXME: error disp e_util_dialog_show(_("Error - Can't allocate memory"),
_("Cannot allocate memory for picture: %s"),
strerror(errno));
fclose(f); fclose(f);
return; return;
} }
if (fread(fdata, fsize, 1, f) != 1) if (fread(fdata, fsize, 1, f) != 1)
{ {
// FIXME: error disp e_util_dialog_show(_("Error - Can't read picture"),
free(fdata); _("Cannot read picture"));
fdata = NULL; E_FREE(fdata);
fclose(f); fclose(f);
return; return;
} }
@ -467,9 +470,9 @@ _win_share_cb(void *data __UNUSED__, void *data2 __UNUSED__)
if (!ecore_con_url_init()) if (!ecore_con_url_init())
{ {
// FIXME: error disp e_util_dialog_show(_("Error - Can't initialize network"),
free(fdata); _("Cannot initialize network"));
fdata = NULL; E_FREE(fdata);
return; return;
} }