Enlightenment CVS committal
Author : pfritz
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/entangle
Modified Files:
entangle_apps.c entangle_eapps.c entangle_ui.c
Log Message:
*API BREAK* see the discussion in the mailing list. misc and e_modules will
follow
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/entangle/entangle_apps.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- entangle_apps.c 25 May 2006 21:56:28 -0000 1.8
+++ entangle_apps.c 25 Jul 2007 17:00:51 -0000 1.9
@@ -35,12 +35,12 @@
entangle_apps_startup = ecore_list_new();
entangle_apps_deleted_dirs = ecore_list_new();
- ecore_list_set_free_cb(entangle_apps_bar, entangle_apps_free_cb);
- ecore_list_set_free_cb(entangle_apps_engage, entangle_apps_free_cb);
- ecore_list_set_free_cb(entangle_apps_favorite, entangle_apps_free_cb);
- ecore_list_set_free_cb(entangle_apps_restart, entangle_apps_free_cb);
- ecore_list_set_free_cb(entangle_apps_startup, entangle_apps_free_cb);
- ecore_list_set_free_cb(entangle_apps_deleted_dirs, entangle_apps_free_cb);
+ ecore_list_free_cb_set(entangle_apps_bar, entangle_apps_free_cb);
+ ecore_list_free_cb_set(entangle_apps_engage, entangle_apps_free_cb);
+ ecore_list_free_cb_set(entangle_apps_favorite, entangle_apps_free_cb);
+ ecore_list_free_cb_set(entangle_apps_restart, entangle_apps_free_cb);
+ ecore_list_free_cb_set(entangle_apps_startup, entangle_apps_free_cb);
+ ecore_list_free_cb_set(entangle_apps_deleted_dirs, entangle_apps_free_cb);
entangle_apps_dir_init(entangle_apps_bar, "bar/default");
entangle_apps_dir_init(entangle_apps_engage, "bar/engage");
@@ -67,10 +67,10 @@
{
int i;
- for (i = 0; i < ecore_list_nodes(entangle_apps_deleted_dirs); i++)
+ for (i = 0; i < ecore_list_count(entangle_apps_deleted_dirs); i++)
{
Entangle_App *app;
- app = ecore_list_goto_index(entangle_apps_deleted_dirs, i);
+ app = ecore_list_index_goto(entangle_apps_deleted_dirs, i);
entangle_apps_dir_delete(app->eapp->path);
}
@@ -208,11 +208,11 @@
snprintf(path, PATH_MAX, "%s/.order", dir_path);
fp = fopen(path, "w");
- for (i = 0; i < ecore_list_nodes(dir); i++)
+ for (i = 0; i < ecore_list_count(dir); i++)
{
Entangle_App *app;
- app = ecore_list_goto_index(dir, i);
+ app = ecore_list_index_goto(dir, i);
snprintf(path, PATH_MAX, "%s\n", app->eapp->eapp_name);
fwrite(path, sizeof(char), strlen(path), fp);
@@ -250,11 +250,11 @@
int i;
char buf[1024];
- for (i = 0; i < ecore_list_nodes(dir); i++)
+ for (i = 0; i < ecore_list_count(dir); i++)
{
Entangle_App *app;
- app = ecore_list_goto_index(dir, i);
+ app = ecore_list_index_goto(dir, i);
printf("%s%s [%s]\n", indent, app->eapp->name, app->eapp->eapp_name);
if (app->children != NULL)
{
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/entangle/entangle_eapps.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- entangle_eapps.c 24 Oct 2005 10:51:19 -0000 1.10
+++ entangle_eapps.c 25 Jul 2007 17:00:51 -0000 1.11
@@ -38,7 +38,7 @@
entangle_eapps = ecore_hash_new(ecore_str_hash, ecore_str_compare);
entangle_eapp_list = ecore_list_new();
- ecore_hash_set_free_value(entangle_eapps, entangle_eapps_cb_free);
+ ecore_hash_free_value_cb_set(entangle_eapps, entangle_eapps_cb_free);
while ((name = ecore_list_next(eapps)))
{
char *ret;
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/entangle/entangle_ui.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- entangle_ui.c 12 Sep 2005 04:45:11 -0000 1.16
+++ entangle_ui.c 25 Jul 2007 17:00:51 -0000 1.17
@@ -278,13 +278,13 @@
eapps = entangle_eapps_key_list_get();
if (!eapps) return 0;
- for (i = 0; i < ecore_list_nodes(eapps); i++)
+ for (i = 0; i < ecore_list_count(eapps); i++)
{
Entangle_Eapp *eapp;
Evas_Object *o, *o2;
char *key;
- key = ecore_list_goto_index(eapps, i);
+ key = ecore_list_index_goto(eapps, i);
eapp = entangle_eapps_get(key);
o = edje_object_add(evas);
@@ -638,13 +638,13 @@
evas_object_data_set(container, "list", apps);
evas_object_data_set(container, "list_rel_path", rel_path);
- for (i = 0; i < ecore_list_nodes(apps); i++)
+ for (i = 0; i < ecore_list_count(apps); i++)
{
Entangle_App *app;
Evas_Object *obj;
Evas_Object *o = NULL;
- app = ecore_list_goto_index(apps, i);
+ app = ecore_list_index_goto(apps, i);
obj = edje_object_add(evas);
edje_object_file_set(obj, file, "menu_item");
edje_object_part_text_set(obj, "text", app->eapp->name);
@@ -825,7 +825,7 @@
entangle_ui_cb_menu_item_free, o2);
position = entangle_ui_calc_container_position(container, e->canvas.y);
- ecore_list_goto_index(apps, position);
+ ecore_list_index_goto(apps, position);
ecore_list_insert(apps, app);
esmart_container_empty(container);
@@ -1182,7 +1182,7 @@
apps = evas_object_data_get(container, "list");
rel_path = evas_object_data_get(container, "list_rel_path");
- ecore_list_goto_index(apps, position);
+ ecore_list_index_goto(apps, position);
ecore_list_insert(apps, app);
esmart_container_empty(container);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
