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

*API BREAK* see the discussion in the mailing list. misc and e_modules will follow 

SVN revision: 30970
This commit is contained in:
Peter Wehrfritz 2007-07-25 17:01:04 +00:00
parent 7b95e2b3f0
commit a6553c1a58
23 changed files with 101 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/e_config.c
View File

@ -1688,7 +1688,7 @@ e_config_profile_list(void)
{
char *file;
ecore_list_goto_first(files);
ecore_list_first_goto(files);
while ((file = ecore_list_current(files)))
{
snprintf(buf, sizeof(buf), "%s/.e/e/config/%s", homedir, file);
@ -1726,7 +1726,7 @@ e_config_profile_del(char *prof)
{
char *file;
ecore_list_goto_first(files);
ecore_list_first_goto(files);
while ((file = ecore_list_current(files)))
{
snprintf(buf, sizeof(buf), "%s/.e/e/config/%s/%s",

18
src/bin/e_configure.c
View File

@ -75,9 +75,9 @@ e_configure_registry_item_add(const char *path, int pri, const char *label, cons
E_Configure_It *eci;
/* path is "category/item" */
cat = ecore_file_get_dir(path);
cat = ecore_file_dir_get(path);
if (!cat) return;
item = ecore_file_get_file(path);
item = ecore_file_file_get(path);
eci = E_NEW(E_Configure_It, 1);
if (!eci) goto done;
@ -124,9 +124,9 @@ e_configure_registry_item_del(const char *path)
const char *item;
/* path is "category/item" */
cat = ecore_file_get_dir(path);
cat = ecore_file_dir_get(path);
if (!cat) return;
item = ecore_file_get_file(path);
item = ecore_file_file_get(path);
for (l = _e_configure_registry; l; l = l->next)
{
E_Configure_Cat *ecat;
@ -192,7 +192,7 @@ e_configure_registry_category_del(const char *path)
Evas_List *l;
char *cat;
cat = ecore_file_get_dir(path);
cat = ecore_file_dir_get(path);
if (!cat) return;
for (l = _e_configure_registry; l; l = l->next)
{
@ -222,9 +222,9 @@ e_configure_registry_call(const char *path, E_Container *con, const char *params
const char *item;
/* path is "category/item" */
cat = ecore_file_get_dir(path);
cat = ecore_file_dir_get(path);
if (!cat) return;
item = ecore_file_get_file(path);
item = ecore_file_file_get(path);
for (l = _e_configure_registry; l; l = l->next)
{
E_Configure_Cat *ecat;
@ -262,9 +262,9 @@ e_configure_registry_exists(const char *path)
int ret = 0;
/* path is "category/item" */
cat = ecore_file_get_dir(path);
cat = ecore_file_dir_get(path);
if (!cat) return 0;
item = ecore_file_get_file(path);
item = ecore_file_file_get(path);
for (l = _e_configure_registry; l; l = l->next)
{
E_Configure_Cat *ecat;

6
src/bin/e_eap_editor.c
View File

@ -265,7 +265,7 @@ _e_desktop_edit_create_data(E_Config_Dialog *cfd)
{
/* file not in user's dir, so create new desktop that points there */
if (!ecore_file_exists(dir)) ecore_file_mkdir(dir);
file = ecore_file_get_file(cfdata->editor->desktop->orig_path);
file = ecore_file_file_get(cfdata->editor->desktop->orig_path);
snprintf(path, sizeof(path), "%s/%s", dir, file);
/*
* if a file already exists in the user dir with this name, we
@ -585,7 +585,7 @@ _e_desktop_editor_cb_icon_select(void *data1, void *data2)
/* XXX change this to a generic icon selector (that can do either
* files from a dir, or icons in the current theme */
if (cfdata->icon)
dir = ecore_file_get_dir(cfdata->icon);
dir = ecore_file_dir_get(cfdata->icon);
if (dir)
{
@ -639,7 +639,7 @@ _e_desktop_editor_cb_exec_select(void *data1, void *data2)
/* absolute path to exe */
if (cfdata->exec)
dir = ecore_file_get_dir(cfdata->exec);
dir = ecore_file_dir_get(cfdata->exec);
if (dir)
{

10
src/bin/e_exebuf.c
View File

@ -877,7 +877,7 @@ _e_exebuf_matches_update(void)
{
Efreet_Desktop *desktop;
ecore_list_goto_first(list);
ecore_list_first_goto(list);
while ((desktop = ecore_list_next(list)))
{
char *exe;
@ -902,7 +902,7 @@ _e_exebuf_matches_update(void)
{
Efreet_Desktop *desktop;
ecore_list_goto_first(list);
ecore_list_first_goto(list);
while ((desktop = ecore_list_next(list)))
{
char *exe;
@ -927,7 +927,7 @@ _e_exebuf_matches_update(void)
{
Efreet_Desktop *desktop;
ecore_list_goto_first(list);
ecore_list_first_goto(list);
while ((desktop = ecore_list_next(list)))
{
char *exe;
@ -952,7 +952,7 @@ _e_exebuf_matches_update(void)
{
Efreet_Desktop *desktop;
ecore_list_goto_first(list);
ecore_list_first_goto(list);
while ((desktop = ecore_list_next(list)))
{
char *exe;
@ -982,7 +982,7 @@ _e_exebuf_matches_update(void)
for (l = exe_list; l; l = l->next)
{
path = l->data;
file = (char *)ecore_file_get_file(path);
file = (char *)ecore_file_file_get(path);
if (file)
{
if (e_util_glob_match(file, buf))

42
src/bin/e_fm.c
View File

@ -2010,7 +2010,7 @@ _e_fm2_file_force_update(const char *path)
char *dir;
Evas_List *l;
dir = ecore_file_get_dir(path);
dir = ecore_file_dir_get(path);
if (!dir) return;
for (l = _e_fm2_list; l; l = l->next)
{
@ -2020,7 +2020,7 @@ _e_fm2_file_force_update(const char *path)
{
E_Fm2_Icon *ic;
ic = _e_fm2_icon_find(l->data, ecore_file_get_file(path));
ic = _e_fm2_icon_find(l->data, ecore_file_file_get(path));
if (ic)
{
E_Fm2_Finfo finf;
@ -2034,7 +2034,7 @@ _e_fm2_file_force_update(const char *path)
if (ic->info.real_link)
finf.rlnk = evas_stringshare_add(ic->info.real_link);
ic->removable_state_change = 1;
_e_fm2_live_file_changed(l->data, ecore_file_get_file(path),
_e_fm2_live_file_changed(l->data, ecore_file_file_get(path),
&finf);
if (ic->info.link)
evas_stringshare_del(ic->info.link);
@ -2083,7 +2083,7 @@ _e_storage_write(E_Storage *s)
FILE *f;
const char *id;
id = ecore_file_get_file(s->udi);
id = ecore_file_file_get(s->udi);
printf("sto write %s\n", id);
snprintf(buf, sizeof(buf), "%s/.e/e/fileman/favorites/|%s.desktop",
e_user_homedir_get(), id);
@ -2134,7 +2134,7 @@ _e_storage_erase(E_Storage *s)
char buf[PATH_MAX];
const char *id;
id = ecore_file_get_file(s->udi);
id = ecore_file_file_get(s->udi);
snprintf(buf, sizeof(buf), "%s/Desktop/|%s.desktop",
e_user_homedir_get(), id);
ecore_file_unlink(buf);
@ -2150,7 +2150,7 @@ _e_volume_write(E_Volume *v)
FILE *f;
const char *id;
id = ecore_file_get_file(v->storage->udi);
id = ecore_file_file_get(v->storage->udi);
printf("vol write %s\n", id);
snprintf(buf, sizeof(buf), "%s/.e/e/fileman/favorites/|%s.desktop",
e_user_homedir_get(), id);
@ -2205,7 +2205,7 @@ _e_volume_erase(E_Volume *v)
char buf[PATH_MAX];
const char *id;
id = ecore_file_get_file(v->storage->udi);
id = ecore_file_file_get(v->storage->udi);
snprintf(buf, sizeof(buf), "%s/Desktop/|%s.desktop",
e_user_homedir_get(), id);
ecore_file_unlink(buf);
@ -2290,7 +2290,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
finf.lnk = lnk;
finf.rlnk = rlnk;
evdir = ecore_file_get_dir(path);
evdir = ecore_file_dir_get(path);
if ((sd->id == e->ref_to) &&
((!strcmp(evdir, "") || (!strcmp(dir, evdir)))))
{
@ -2299,13 +2299,13 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
if (e->minor == 3)/*file add*/
{
_e_fm2_live_file_add
(obj, ecore_file_get_file(path),
(obj, ecore_file_file_get(path),
NULL, 0, &finf);
}
else if (e->minor == 5)/*file change*/
{
_e_fm2_live_file_changed
(obj, (char *)ecore_file_get_file(path),
(obj, (char *)ecore_file_file_get(path),
&finf);
}
}
@ -2325,7 +2325,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
}
if (path[0] != 0)
{
file = ecore_file_get_file(path);
file = ecore_file_file_get(path);
if ((!strcmp(file, ".order")))
sd->order_file = 1;
else
@ -2383,11 +2383,11 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
break;
case 4:/*file del*/
path = e->data;
evdir = ecore_file_get_dir(path);
evdir = ecore_file_dir_get(path);
if ((sd->id == e->ref_to) && (!strcmp(dir, evdir)))
{
_e_fm2_live_file_del
(obj, ecore_file_get_file(path));
(obj, ecore_file_file_get(path));
}
free(evdir);
break;
@ -3409,7 +3409,7 @@ _e_fm2_file_fm2_find(const char *file)
char *dir;
Evas_List *l;
dir = ecore_file_get_dir(file);
dir = ecore_file_dir_get(file);
if (!dir) return NULL;
for (l = _e_fm2_list; l; l = l->next)
{
@ -3462,7 +3462,7 @@ _e_fm2_uri_icon_list_get(Evas_List *uri)
fm = _e_fm2_file_fm2_find(path);
if (fm)
{
file = ecore_file_get_file(path);
file = ecore_file_file_get(path);
ic = _e_fm2_icon_find(fm, file);
}
}
@ -4846,7 +4846,7 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
fp = _e_fm2_icon_desktop_url_eval(ll->data);
if (!fp) continue;
snprintf(buf, sizeof(buf), "%s/%s",
sd->realpath, ecore_file_get_file(fp));
sd->realpath, ecore_file_file_get(fp));
printf("mv %s %s\n", (char *)fp, buf);
if ((ic) && (sd->config->view.mode == E_FM2_VIEW_MODE_CUSTOM_ICONS))
{
@ -4904,7 +4904,7 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
if (!fp) continue;
/* move the file into the subdir */
snprintf(buf, sizeof(buf), "%s/%s/%s",
sd->realpath, sd->drop_icon->info.file, ecore_file_get_file(fp));
sd->realpath, sd->drop_icon->info.file, ecore_file_file_get(fp));
printf("mv %s %s\n", (char *)fp, buf);
_e_fm2_client_file_move(sd->id, fp, buf, "", 0, -9999, -9999, sd->w, sd->h);
evas_stringshare_del(fp);
@ -4924,7 +4924,7 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
fp = _e_fm2_icon_desktop_url_eval(ll->data);
if (!fp) continue;
snprintf(buf, sizeof(buf), "%s/%s",
sd->realpath, ecore_file_get_file(fp));
sd->realpath, ecore_file_file_get(fp));
if (sd->config->view.link_drop)
{
printf("ln -s %s %s\n", (char *)fp, buf);
@ -4946,7 +4946,7 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
fp = _e_fm2_icon_desktop_url_eval(ll->data);
if (!fp) continue;
snprintf(buf, sizeof(buf), "%s/%s",
sd->realpath, ecore_file_get_file(fp));
sd->realpath, ecore_file_file_get(fp));
if (sd->config->view.link_drop)
{
printf("ln -s %s %s\n", (char *)fp, buf);
@ -4970,7 +4970,7 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
if (!fp) continue;
/* move the file into the subdir */
snprintf(buf, sizeof(buf), "%s/%s",
sd->realpath, ecore_file_get_file(fp));
sd->realpath, ecore_file_file_get(fp));
printf("mv %s %s\n", (char *)fp, buf);
_e_fm2_client_file_move(sd->id, fp, buf, "", 0, -9999, -9999, sd->w, sd->h);
evas_stringshare_del(fp);
@ -4986,7 +4986,7 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
if (!fp) continue;
/* move the file into the subdir */
snprintf(buf, sizeof(buf), "%s/%s",
sd->realpath, ecore_file_get_file(fp));
sd->realpath, ecore_file_file_get(fp));
printf("mv %s %s\n", (char *)fp, buf);
_e_fm2_client_file_move(sd->id, fp, buf, "", 0, -9999, -9999, sd->w, sd->h);
evas_stringshare_del(fp);

16
src/bin/e_fm_main.c
View File

@ -274,7 +274,7 @@ _e_dbus_cb_dev_all(void *user_data, void *reply_data, DBusError *error)
return;
}
ecore_list_goto_first(ret->strings);
ecore_list_first_goto(ret->strings);
while ((device = ecore_list_next(ret->strings)))
{
// printf("DB INIT DEV+: %s\n", device);
@ -302,7 +302,7 @@ _e_dbus_cb_dev_store(void *user_data, void *reply_data, DBusError *error)
return;
}
ecore_list_goto_first(ret->strings);
ecore_list_first_goto(ret->strings);
while ((device = ecore_list_next(ret->strings)))
{
// printf("DB STORE+: %s\n", device);
@ -324,7 +324,7 @@ _e_dbus_cb_dev_vol(void *user_data, void *reply_data, DBusError *error)
return;
}
ecore_list_goto_first(ret->strings);
ecore_list_first_goto(ret->strings);
while ((device = ecore_list_next(ret->strings)))
{
// printf("DB VOL+: %s\n", device);
@ -1032,7 +1032,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
dst = src + strlen(src) + 1;
ecore_file_mv(src, dst);
/* FIXME: send back if succeeded or failed - why */
_e_path_fix_order(dst, ecore_file_get_file(src), 2, -9999, -9999);
_e_path_fix_order(dst, ecore_file_file_get(src), 2, -9999, -9999);
}
break;
case 6: /* fop mv file/dir */
@ -1216,8 +1216,8 @@ _e_cb_file_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, c
const char *file;
Evas_List *l;
dir = ecore_file_get_dir(path);
file = ecore_file_get_file(path);
dir = ecore_file_dir_get(path);
file = ecore_file_file_get(path);
/* FIXME: get no create events if dir is empty */
if ((event == ECORE_FILE_EVENT_CREATED_FILE) ||
(event == ECORE_FILE_EVENT_CREATED_DIRECTORY))
@ -1880,10 +1880,10 @@ _e_path_fix_order(const char *path, const char *rel, int rel_to, int x, int y)
if (!path) return;
if (!rel[0]) return;
f = ecore_file_get_file(path);
f = ecore_file_file_get(path);
if (!f) return;
if (!strcmp(f, rel)) return;
d = ecore_file_get_dir(path);
d = ecore_file_dir_get(path);
if (!d) return;
snprintf(buf, sizeof(buf), "%s/.order", d);
if (ecore_file_exists(buf))

10
src/bin/e_fwin.c
View File

@ -200,7 +200,7 @@ e_fwin_new(E_Container *con, const char *dev, const char *path)
snprintf(buf, sizeof(buf), "_fwin::/%s", e_fm2_real_path_get(fwin->fm_obj));
e_win_name_class_set(fwin->win, "E", buf);
file = ecore_file_get_file(e_fm2_real_path_get(fwin->fm_obj));
file = ecore_file_file_get(e_fm2_real_path_get(fwin->fm_obj));
if (file)
snprintf(buf, sizeof(buf), "%s", file);
else
@ -313,7 +313,7 @@ e_fwin_zone_new(E_Zone *zone, const char *dev, const char *path)
e_fm2_path_set(fwin->fm_obj, dev, path);
file = ecore_file_get_file(e_fm2_real_path_get(fwin->fm_obj));
file = ecore_file_file_get(e_fm2_real_path_get(fwin->fm_obj));
if (file)
snprintf(buf, sizeof(buf), "%s", file);
else
@ -652,7 +652,7 @@ _e_fwin_cb_open(void *data, E_Dialog *dia)
if (selected)
{
files = ecore_list_new();
ecore_list_set_free_cb(files, free);
ecore_list_free_cb_set(files, free);
for (l = selected; l; l = l->next)
{
E_Fwin_Exec_Type ext;
@ -1030,7 +1030,7 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Evas_List *files, int always)
ml = efreet_util_desktop_mime_list(l->data);
if (ml)
{
ecore_list_goto_first(ml);
ecore_list_first_goto(ml);
while ((desktop = ecore_list_next(ml)))
apps = evas_list_append(apps, desktop);
ecore_list_destroy(ml);
@ -1066,7 +1066,7 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Evas_List *files, int always)
chdir(e_fm2_real_path_get(fwin->fm_obj));
files_list = ecore_list_new();
ecore_list_set_free_cb(files_list, free);
ecore_list_free_cb_set(files_list, free);
for (l = files; l; l = l->next)
{
ici = l->data;

8
src/bin/e_int_config_modules.c
View File

@ -195,7 +195,7 @@ _load_modules(E_Config_Dialog_Data *cfdata)
if (!ecore_file_is_dir(epd->dir)) continue;
dirs = ecore_file_ls(epd->dir);
if (!dirs) continue;
ecore_list_goto_first(dirs);
ecore_list_first_goto(dirs);
while ((mod = ecore_list_next(dirs)))
{
E_Module *module;
@ -343,7 +343,7 @@ _get_icon(Efreet_Desktop *desk)
char *path;
char buf[4096];
path = ecore_file_get_dir(desk->orig_path);
path = ecore_file_dir_get(desk->orig_path);
snprintf(buf, sizeof(buf), "%s/%s.edj", path, desk->icon);
icon = buf;
free(path);
@ -391,7 +391,7 @@ _cb_monitor(void *data, Ecore_File_Monitor *monitor, Ecore_File_Event event, con
switch (event)
{
case ECORE_FILE_EVENT_CREATED_DIRECTORY:
file = ecore_file_get_file(path);
file = ecore_file_file_get(path);
if (mod_mon) ecore_file_monitor_del(mod_mon);
mod_mon = ecore_file_monitor_add(path, _cb_mod_monitor, cfdata);
break;
@ -417,7 +417,7 @@ _cb_mod_monitor(void *data, Ecore_File_Monitor *monitor, Ecore_File_Event event,
switch (event)
{
case ECORE_FILE_EVENT_CREATED_DIRECTORY:
file = ecore_file_get_file(path);
file = ecore_file_file_get(path);
if (!e_util_glob_case_match(file, MODULE_ARCH)) break;
if (dir_mon) ecore_file_monitor_del(dir_mon);
dir_mon = ecore_file_monitor_add(path, _cb_dir_monitor, cfdata);

2
src/bin/e_int_menus.c
View File

@ -536,7 +536,7 @@ _e_int_menus_apps_scan(E_Menu *m, Efreet_Menu *menu)
{
Efreet_Menu *entry;
ecore_list_goto_first(menu->entries);
ecore_list_first_goto(menu->entries);
while ((entry = ecore_list_next(menu->entries)))
{
mi = e_menu_item_new(m);

4
src/bin/e_intl.c
View File

@ -588,7 +588,7 @@ _e_intl_language_dir_scan(const char *dir)
files = ecore_file_ls(dir);
if (!files) return NULL;
ecore_list_goto_first(files);
ecore_list_first_goto(files);
if (files)
{
while ((file = ecore_list_next(files)))
@ -1126,7 +1126,7 @@ _e_intl_imc_dir_scan(const char *dir)
files = ecore_file_ls(dir);
if (!files) return NULL;
ecore_list_goto_first(files);
ecore_list_first_goto(files);
if (files)
{
while ((file = ecore_list_next(files)))

2
src/bin/e_ipc_handlers.h
View File

@ -7556,7 +7556,7 @@ break;
{
const char *i;
const char *f;
f = ecore_file_get_file(s);
f = ecore_file_file_get(s);
i = e_path_find(path_init, f);
if (!e_util_edje_collection_exists(i, "init/splash"))
{

4
src/bin/e_module.c
View File

@ -190,12 +190,12 @@ init_done:
m->name = evas_stringshare_add(name);
if (modpath)
{
s = ecore_file_get_dir(modpath);
s = ecore_file_dir_get(modpath);
if (s)
{
char *s2;
s2 = ecore_file_get_dir(s);
s2 = ecore_file_dir_get(s);
free(s);
if (s2)
{

6
src/bin/e_order.c
View File

@ -178,7 +178,7 @@ _e_order_read(E_Order *eo)
eo->desktops = evas_list_free(eo->desktops);
if (!eo->path) return;
dir = ecore_file_get_dir(eo->path);
dir = ecore_file_dir_get(eo->path);
f = fopen(eo->path, "rb");
if (f)
{
@ -204,9 +204,9 @@ _e_order_read(E_Order *eo)
if (buf[0] == '/')
desktop = efreet_desktop_get(buf);
if (!desktop)
desktop = efreet_desktop_get(ecore_file_get_file(buf));
desktop = efreet_desktop_get(ecore_file_file_get(buf));
if (!desktop)
desktop = efreet_util_desktop_file_id_find(ecore_file_get_file(buf));
desktop = efreet_util_desktop_file_id_find(ecore_file_file_get(buf));
if (desktop) eo->desktops = evas_list_append(eo->desktops, desktop);
}
}

2
src/bin/e_prefix.c
View File

@ -261,7 +261,7 @@ _e_prefix_share_hunt(void)
{
char *file;
ecore_list_goto_first(files);
ecore_list_first_goto(files);
while ((file = ecore_list_current(files)))
{
snprintf(buf2, sizeof(buf2), "%s/%s/"MAGIC_DAT, buf, file);

8
src/bin/e_widget_fsel.c
View File

@ -81,7 +81,7 @@ _e_wid_fsel_favorites_add(void *data1, void *data2)
if (!ecore_file_is_dir(current_path)) return;
homedir = e_user_homedir_get();
snprintf(buf, sizeof(buf), "%s/.e/e/fileman/favorites/%s",
homedir, ecore_file_get_file(current_path));
homedir, ecore_file_file_get(current_path));
if (stat(buf, &st) < 0) symlink(current_path, buf);
else
{
@ -90,13 +90,13 @@ _e_wid_fsel_favorites_add(void *data1, void *data2)
snprintf(buf, sizeof(buf),
"%s/.e/e/fileman/favorites/%s-%d",
homedir,
ecore_file_get_file(current_path), i);
ecore_file_file_get(current_path), i);
i++;
}
symlink(current_path, buf);
}
fname = alloca(strlen(ecore_file_get_file(buf)) + 1);
strcpy(fname, ecore_file_get_file(buf));
fname = alloca(strlen(ecore_file_file_get(buf)) + 1);
strcpy(fname, ecore_file_file_get(buf));
snprintf(buf, sizeof(buf), "%s/.e/e/fileman/favorites/.order", homedir);
if (ecore_file_exists(buf))
{

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

@ -228,7 +228,7 @@ _load_menu(const char *path)
menu = efreet_menu_parse(path);
if (!menu) return apps;
ecore_list_goto_first(menu->entries);
ecore_list_first_goto(menu->entries);
while ((entry = ecore_list_next(menu->entries)))
{
if (entry->type != EFREET_MENU_ENTRY_DESKTOP) continue;
@ -350,7 +350,7 @@ _save_menu(E_Config_Dialog_Data *cfdata)
int ret;
menu = efreet_menu_new();
ecore_list_goto_first(cfdata->apps);
ecore_list_first_goto(cfdata->apps);
while ((desk = ecore_list_next(cfdata->apps)))
efreet_menu_desktop_insert(menu, desk, -1);
@ -368,7 +368,7 @@ _save_order(E_Config_Dialog_Data *cfdata)
order = e_order_new(cfdata->once->filename);
if (!order) return 0;
e_order_clear(order);
ecore_list_goto_first(cfdata->apps);
ecore_list_first_goto(cfdata->apps);
while ((desk = ecore_list_next(cfdata->apps)))
e_order_append(order, desk);
@ -392,7 +392,7 @@ _fill_categories(E_Config_Dialog_Data *cfdata)
cats = efreet_util_desktop_categories_list();
ecore_list_sort(cats, ECORE_COMPARE_CB(strcmp), ECORE_SORT_MIN);
ecore_list_goto_first(cats);
ecore_list_first_goto(cats);
while ((category = ecore_list_next(cats)))
e_widget_ilist_append(cfdata->o_apps, NULL, category,
_category_cb_selected, cfdata, category);
@ -431,7 +431,7 @@ _fill_apps(E_Config_Dialog_Data *cfdata)
desktops = (Ecore_List *)efreet_util_desktop_category_list(cfdata->category);
ecore_list_sort(desktops, ECORE_COMPARE_CB(_cb_desktop_name_sort), ECORE_SORT_MIN);
ecore_list_goto_first(desktops);
ecore_list_first_goto(desktops);
while ((desktop = ecore_list_next(desktops)))
{
Evas_Object *icon;
@ -467,7 +467,7 @@ _fill_list(E_Config_Dialog_Data *cfdata)
edje_freeze();
e_widget_ilist_freeze(cfdata->o_list);
ecore_list_goto_first(cfdata->apps);
ecore_list_first_goto(cfdata->apps);
while ((desktop = ecore_list_next(cfdata->apps)))
{
Evas_Object *icon = NULL;
@ -648,7 +648,7 @@ _cb_up(void *data, void *data2)
{
i = ecore_list_index(cfdata->apps);
ecore_list_remove(cfdata->apps);
ecore_list_goto_index(cfdata->apps, (i - 1));
ecore_list_index_goto(cfdata->apps, (i - 1));
ecore_list_insert(cfdata->apps, desk);
}
}
@ -694,7 +694,7 @@ _cb_down(void *data, void *data2)
{
i = ecore_list_index(cfdata->apps);
ecore_list_remove(cfdata->apps);
ecore_list_goto_index(cfdata->apps, (i + 1));
ecore_list_index_goto(cfdata->apps, (i + 1));
ecore_list_insert(cfdata->apps, desk);
}
}

8
src/modules/conf_icon_theme/e_int_config_icon_themes.c
View File

@ -67,7 +67,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
{
Efreet_Icon_Theme *theme;
ecore_list_goto_first(icon_themes);
ecore_list_first_goto(icon_themes);
while ((theme = ecore_list_next(icon_themes)))
cfdata->icon_themes = evas_list_append(cfdata->icon_themes, theme);
cfdata->icon_themes = evas_list_sort(cfdata->icon_themes,
@ -365,7 +365,7 @@ _ilist_cb_change(void *data, Evas_Object *obj)
char *path;
int first = 1;
ecore_list_goto_first(theme->paths.path);
ecore_list_first_goto(theme->paths.path);
while ((path = ecore_list_next(theme->paths.path)))
{
length += strlen(theme->paths.path) + 16;
@ -394,7 +394,7 @@ _ilist_cb_change(void *data, Evas_Object *obj)
const char *inherit;
int first = 1;
ecore_list_goto_first(theme->inherits);
ecore_list_first_goto(theme->inherits);
while ((inherit = ecore_list_next(theme->inherits)))
{
length += strlen(theme->paths.path) + 32;
@ -421,7 +421,7 @@ _ilist_cb_change(void *data, Evas_Object *obj)
free(text);
if (dir)
{
dir = ecore_file_get_dir(dir);
dir = ecore_file_dir_get(dir);
e_fm2_path_set(cfdata->gui.o_fm, dir, "/");
free(dir);
}

4
src/modules/conf_imc/e_int_config_imc_import.c
View File

@ -214,7 +214,7 @@ _imc_import_cb_changed(void *data, Evas_Object *obj)
{
char *strip;
file = ecore_file_get_file(import->cfdata->file);
file = ecore_file_file_get(import->cfdata->file);
strip = ecore_file_strip_ext(file);
if (!strip)
{
@ -258,7 +258,7 @@ _imc_import_cb_ok(void *data, void *data2)
E_Input_Method_Config *imc;
char *strip;
file = ecore_file_get_file(import->cfdata->file);
file = ecore_file_file_get(import->cfdata->file);
strip = ecore_file_strip_ext(file);
if (!strip)

2
src/modules/conf_startup/e_int_config_startup.c
View File

@ -237,7 +237,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
const char *f;
f = ecore_file_get_file(cfdata->splash);
f = ecore_file_file_get(cfdata->splash);
e_config->init_default_theme = evas_stringshare_add(f);
}
}

4
src/modules/conf_theme/e_int_config_theme_import.c
View File

@ -213,7 +213,7 @@ _theme_import_cb_changed(void *data, Evas_Object *obj)
{
char *strip;
file = ecore_file_get_file(import->cfdata->file);
file = ecore_file_file_get(import->cfdata->file);
strip = ecore_file_strip_ext(file);
if (!strip)
{
@ -259,7 +259,7 @@ _theme_import_cb_ok(void *data, void *data2)
{
char *strip;
file = ecore_file_get_file(import->cfdata->file);
file = ecore_file_file_get(import->cfdata->file);
snprintf(buf, sizeof(buf), "%s/.e/e/themes/%s", homedir, file);
strip = ecore_file_strip_ext(file);

6
src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
View File

@ -308,7 +308,7 @@ _import_edj_gen(Import *import)
FILE *f;
evas = e_win_evas_get(import->win);
file = ecore_file_get_file(import->cfdata->file);
file = ecore_file_file_get(import->cfdata->file);
homedir = e_user_homedir_get();
fstrip = ecore_file_strip_ext(file);
if (!fstrip) return;
@ -335,7 +335,7 @@ _import_edj_gen(Import *import)
return;
}
imgdir = ecore_file_get_dir(import->cfdata->file);
imgdir = ecore_file_dir_get(import->cfdata->file);
if (!imgdir) ipart[0] = '\0';
else
{
@ -526,7 +526,7 @@ _import_cb_ok(void *data, void *data2)
if (path) import->cfdata->file = strdup(path);
if (import->cfdata->file)
{
file = ecore_file_get_file(import->cfdata->file);
file = ecore_file_file_get(import->cfdata->file);
if (!e_util_glob_case_match(file, "*.edj"))
_import_edj_gen(import);
else

12
src/modules/temperature/e_mod_config.c
View File

@ -135,7 +135,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
{
int len;
sprintf(path, "%s", ecore_file_get_file(name));
sprintf(path, "%s", ecore_file_file_get(name));
len = strlen(path);
if (len > 6)
path[len - 6] = '\0';
@ -151,7 +151,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
ecore_list_destroy(therms);
}
ecore_list_goto_first(cfdata->sensors);
ecore_list_first_goto(cfdata->sensors);
while ((name = ecore_list_next(cfdata->sensors)))
{
if (!strcmp(cfdata->inst->sensor_name, name))
@ -188,7 +188,7 @@ _create_data(E_Config_Dialog *cfd)
cfdata = E_NEW(E_Config_Dialog_Data, 1);
cfdata->inst = cfd->data;
cfdata->sensors = ecore_list_new();
ecore_list_set_free_cb(cfdata->sensors, free);
ecore_list_free_cb_set(cfdata->sensors, free);
_fill_data(cfdata);
return cfdata;
}
@ -320,7 +320,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
if (!ecore_list_is_empty(cfdata->sensors))
if (!ecore_list_empty_is(cfdata->sensors))
{
/* TODO: Notify user which thermal system is in use */
/* TODO: Let the user choose the wanted thermal system */
@ -329,7 +329,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
of = e_widget_framelist_add(evas, _("Sensors"), 0);
rg = e_widget_radio_group_new(&(cfdata->sensor));
ecore_list_goto_first(cfdata->sensors);
ecore_list_first_goto(cfdata->sensors);
while ((name = ecore_list_next(cfdata->sensors)))
{
ob = e_widget_radio_add(evas, _(name), n, rg);
@ -409,7 +409,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (cfdata->inst->sensor_name)
evas_stringshare_del(cfdata->inst->sensor_name);
cfdata->inst->sensor_name =
evas_stringshare_add(ecore_list_goto_index(cfdata->sensors, cfdata->sensor));
evas_stringshare_add(ecore_list_index_goto(cfdata->sensors, cfdata->sensor));
temperature_face_update_config(cfdata->inst);
e_config_save_queue();

8
src/modules/temperature/e_mod_main.c
View File

@ -212,7 +212,7 @@ _temperature_sensor_init(Config_Face *inst)
inst->sensor_name = evas_stringshare_add("tz0");
#else
therms = ecore_file_ls("/proc/acpi/thermal_zone");
if ((therms) && (!ecore_list_is_empty(therms)))
if ((therms) && (!ecore_list_empty_is(therms)))
{
char *name;
@ -259,7 +259,7 @@ _temperature_sensor_init(Config_Face *inst)
{
int len;
sprintf(path, "%s", ecore_file_get_file(name));
sprintf(path, "%s", ecore_file_file_get(name));
len = strlen(path);
if (len > 6)
path[len - 6] = '\0';
@ -553,7 +553,7 @@ temperature_get_i2c_files()
result = ecore_list_new();
if (result)
{
ecore_list_set_free_cb(result, free);
ecore_list_free_cb_set(result, free);
/* Look through all the i2c devices. */
therms = ecore_file_ls("/sys/bus/i2c/devices");
@ -589,7 +589,7 @@ temperature_get_i2c_files()
}
ecore_list_destroy(therms);
}
ecore_list_goto_first(result);
ecore_list_first_goto(result);
}
return result;