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

formatting 

SVN revision: 72692
This commit is contained in:
Mike Blumenkrantz 2012-06-22 07:30:50 +00:00
parent 21d37fcbbc
commit 118d57ac9d
5 changed files with 278 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/conf_applications/e_int_config_apps.c
View File

@ -833,3 +833,4 @@ _cb_fill_delay(void *data)
cfdata->fill_delay = NULL; cfdata->fill_delay = NULL;
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
} }

26
src/modules/conf_applications/e_int_config_defapps.c
View File

@ -16,7 +16,8 @@ struct _Config_Mime
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
struct { struct
{
Evas_Object *deflist, *mimelist, *entry; Evas_Object *deflist, *mimelist, *entry;
} obj; } obj;
Efreet_Ini *ini; Efreet_Ini *ini;
@ -388,7 +389,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
} }
if (evr) if (evr)
{ {
evr->unset =0; evr->unset = 0;
if (evr->val) eina_stringshare_del(evr->val); if (evr->val) eina_stringshare_del(evr->val);
} }
else else
@ -442,20 +443,24 @@ _load_mimes(E_Config_Dialog_Data *cfdata, char *file)
while (fgets(buf, sizeof(buf), f)) while (fgets(buf, sizeof(buf), f))
{ {
p = buf; p = buf;
while (isblank(*p) && (*p != 0) && (*p != '\n')) p++; while (isblank(*p) && (*p != 0) && (*p != '\n'))
p++;
if (*p == '#') continue; if (*p == '#') continue;
if ((*p == '\n') || (*p == 0)) continue; if ((*p == '\n') || (*p == 0)) continue;
pp = p; pp = p;
while (!isblank(*p) && (*p != 0) && (*p != '\n')) p++; while (!isblank(*p) && (*p != 0) && (*p != '\n'))
p++;
if ((*p == '\n') || (*p == 0)) continue; if ((*p == '\n') || (*p == 0)) continue;
strncpy(mimetype, pp, (p - pp)); strncpy(mimetype, pp, (p - pp));
mimetype[p - pp] = 0; mimetype[p - pp] = 0;
do do
{ {
while (isblank(*p) && (*p != 0) && (*p != '\n')) p++; while (isblank(*p) && (*p != 0) && (*p != '\n'))
p++;
if ((*p == '\n') || (*p == 0)) continue; if ((*p == '\n') || (*p == 0)) continue;
pp = p; pp = p;
while (!isblank(*p) && (*p != 0) && (*p != '\n')) p++; while (!isblank(*p) && (*p != 0) && (*p != '\n'))
p++;
strncpy(ext, pp, (p - pp)); strncpy(ext, pp, (p - pp));
ext[p - pp] = 0; ext[p - pp] = 0;
config_mime = _find_mime(cfdata, mimetype); config_mime = _find_mime(cfdata, mimetype);
@ -508,11 +513,13 @@ _load_globs(E_Config_Dialog_Data *cfdata, char *file)
while (fgets(buf, sizeof(buf), f)) while (fgets(buf, sizeof(buf), f))
{ {
p = buf; p = buf;
while (isblank(*p) && (*p != 0) && (*p != '\n')) p++; while (isblank(*p) && (*p != 0) && (*p != '\n'))
p++;
if (*p == '#') continue; if (*p == '#') continue;
if ((*p == '\n') || (*p == 0)) continue; if ((*p == '\n') || (*p == 0)) continue;
pp = p; pp = p;
while ((*p != ':') && (*p != 0) && (*p != '\n')) p++; while ((*p != ':') && (*p != 0) && (*p != '\n'))
p++;
if ((*p == '\n') || (*p == 0)) continue; if ((*p == '\n') || (*p == 0)) continue;
strncpy(mimetype, pp, (p - pp)); strncpy(mimetype, pp, (p - pp));
mimetype[p - pp] = 0; mimetype[p - pp] = 0;
@ -563,7 +570,7 @@ _sort_mimes(const void *data1, const void *data2)
const Config_Mime *m1 = data1, *m2 = data2; const Config_Mime *m1 = data1, *m2 = data2;
if (!m1) return 1; if (!m1) return 1;
if (!m2) return -1; if (!m2) return -1;
return (strcmp(m1->mime, m2->mime)); return strcmp(m1->mime, m2->mime);
} }
static Config_Mime * static Config_Mime *
@ -760,3 +767,4 @@ _fill_apps_list(E_Config_Dialog_Data *cfdata, Evas_Object *il, const char **desk
e_widget_ilist_nth_show(il, sel, 0); e_widget_ilist_nth_show(il, sel, 0);
} }
} }

10
src/modules/conf_applications/e_int_config_delapps.c
View File

@ -5,7 +5,8 @@ struct _E_Config_Dialog_Data
Eina_List *desks; Eina_List *desks;
Ecore_Event_Handler *desk_change_handler; Ecore_Event_Handler *desk_change_handler;
struct { struct
{
Evas_Object *list, *del; Evas_Object *list, *del;
} obj; } obj;
}; };
@ -58,7 +59,8 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{ {
Efreet_Desktop *desk; Efreet_Desktop *desk;
EINA_LIST_FREE(cfdata->desks, desk) efreet_desktop_free(desk); EINA_LIST_FREE(cfdata->desks, desk)
efreet_desktop_free(desk);
if (cfdata->desk_change_handler) if (cfdata->desk_change_handler)
ecore_event_handler_del(cfdata->desk_change_handler); ecore_event_handler_del(cfdata->desk_change_handler);
E_FREE(cfdata); E_FREE(cfdata);
@ -101,7 +103,8 @@ _desks_update(void *data, int ev_type __UNUSED__, void *ev __UNUSED__)
E_Config_Dialog_Data *cfdata = data; E_Config_Dialog_Data *cfdata = data;
Efreet_Desktop *desk; Efreet_Desktop *desk;
EINA_LIST_FREE(cfdata->desks, desk) efreet_desktop_free(desk); EINA_LIST_FREE(cfdata->desks, desk)
efreet_desktop_free(desk);
_fill_apps_list(cfdata, cfdata->obj.list); _fill_apps_list(cfdata, cfdata->obj.list);
return ECORE_CALLBACK_PASS_ON; return ECORE_CALLBACK_PASS_ON;
} }
@ -203,3 +206,4 @@ _widget_list_selection_changed(void *data, Evas_Object *obj __UNUSED__)
if (selnum == 0) e_widget_disabled_set(cfdata->obj.del, 1); if (selnum == 0) e_widget_disabled_set(cfdata->obj.del, 1);
else e_widget_disabled_set(cfdata->obj.del, 0); else e_widget_disabled_set(cfdata->obj.del, 0);
} }

1
src/modules/conf_applications/e_int_config_deskenv.c
View File

@ -100,3 +100,4 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
e_widget_list_object_append(o, ob, 1, 0, 0.0); e_widget_list_object_append(o, ob, 1, 0, 0.0);
return o; return o;
} }

1
src/modules/conf_applications/e_mod_main.c
View File

@ -87,3 +87,4 @@ e_modapi_save(E_Module *m __UNUSED__)
{ {
return 1; return 1;
} }