enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

better handling for invalid file extensions (we only support jpg and png) when specified in shot module's save dialog 

ticket #1160


SVN revision: 73972
This commit is contained in:
Mike Blumenkrantz 2012-07-17 10:48:30 +00:00
parent c89f656cb9
commit d723c78228
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,28 +128,6 @@ _save_to(const char *file)
char *extn = strrchr(file, '.');
char opts[256];
if (!extn)
{
e_util_dialog_show
(_("Error - Unknown format"),
_("File has an unspecified extension.<br>"
"Please use '.jpg' or '.png' extensions<br>"
"only as other formats are not<br>"
"supported currently."));
return;
}
if (!((!strcasecmp(extn, ".png")) ||
(!strcasecmp(extn, ".jpg")) ||
(!strcasecmp(extn, ".jpeg"))))
{
e_util_dialog_show
(_("Error - Unknown format"),
_("File has an unrecognized extension.<br>"
"Please use '.jpg' or '.png' extensions<br>"
"only as other formats are not<br>"
"supported currently."));
return;
}
if (!strcasecmp(extn, ".png"))
snprintf(opts, sizeof(opts), "compress=%i", 9);
else
@ -200,7 +178,17 @@ _file_select_ok_cb(void *data __UNUSED__, E_Dialog *dia)
const char *file;
file = e_widget_fsel_selection_path_get(o_fsel);
if (file) _save_to(file);
if ((!file) || (!file[0]) || ((!eina_str_has_extension(file, "jpg")) && (!eina_str_has_extension(file, "png"))))
{
e_util_dialog_show
(_("Error - Unknown format"),
_("File has an unspecified extension.<br>"
"Please use '.jpg' or '.png' extensions<br>"
"only as other formats are not<br>"
"supported currently."));
return;
}
_save_to(file);
if (dia) e_util_defer_object_del(E_OBJECT(dia));
if (win)
{