NorwayFun
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve safety and simplify mime display code

This commit is contained in:
Andy Williams 2018-03-22 14:58:34 +00:00
parent f92c4c13d6
commit 2d0c874567
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/bin/edi_content.c
View File

@ -120,7 +120,7 @@ edi_content_statusbar_add(Evas_Object *panel, Edi_Mainview_Item *item)
Evas_Object *table, *rect, *tb, *position, *mime; Evas_Object *table, *rect, *tb, *position, *mime;
Elm_Code *code; Elm_Code *code;
char text[256]; char text[256];
const char *format, *spaces = " "; const char *format = "", *spaces = " ";
const char *mimename = NULL; const char *mimename = NULL;
elm_box_horizontal_set(panel, EINA_TRUE); elm_box_horizontal_set(panel, EINA_TRUE);
@ -131,22 +131,18 @@ edi_content_statusbar_add(Evas_Object *panel, Edi_Mainview_Item *item)
evas_object_show(table); evas_object_show(table);
elm_box_pack_end(panel, table); elm_box_pack_end(panel, table);
code = elm_code_create(); if (!strcmp(item->editortype, "code"))
code->file = elm_code_file_open(code, item->path); {
code = elm_code_create();
code->file = elm_code_file_open(code, item->path);
if (item->editortype && !strcasecmp(item->editortype, "image"))
{
format = "";
}
else if (code)
{
if (elm_code_file_line_ending_get(code->file) == ELM_CODE_FILE_LINE_ENDING_WINDOWS) if (elm_code_file_line_ending_get(code->file) == ELM_CODE_FILE_LINE_ENDING_WINDOWS)
format = "WIN"; format = "WIN";
else else
format = "UNIX"; format = "UNIX";
}
elm_code_free(code); elm_code_free(code);
}
mime = elm_entry_add(panel); mime = elm_entry_add(panel);
elm_entry_editable_set(mime, EINA_FALSE); elm_entry_editable_set(mime, EINA_FALSE);
@ -157,18 +153,12 @@ edi_content_statusbar_add(Evas_Object *panel, Edi_Mainview_Item *item)
{ {
provider = edi_language_provider_for_mime_get(item->mimetype); provider = edi_language_provider_for_mime_get(item->mimetype);
if (provider) if (provider)
{ mimename = provider->mime_name(item->mimetype);
mimename = provider->mime_name(item->mimetype);
}
if (mimename) if (mimename)
{ snprintf(text, sizeof(text), "%s (%s)%s%s", mimename, item->mimetype, spaces, format);
snprintf(text, sizeof(text), "%s (%s)%s%s", mimename, item->mimetype, spaces, format);
}
else else
{ snprintf(text, sizeof(text), "%s%s%s", item->mimetype, spaces, format);
snprintf(text, sizeof(text), "%s%s%s", item->mimetype, spaces, format);
}
} }
else else
{ {