Enlightenment CVS committal
Author : pfritz
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
distribution_thumbnailer.c etk_icon_viewer.c etk_list_viewer.c
etk_meta_plugin.c etk_structure_viewer.c etk_trackback.c
ewl_icon_local_viewer.c ewl_list_viewer.c filesystem.c
layout_etk_simple.c structure_viewer.c
Log Message:
*API BREAK* see the discussion in the mailing list. misc and e_modules will
follow
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/distribution_thumbnailer.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- distribution_thumbnailer.c 29 Dec 2006 13:02:53 -0000 1.10
+++ distribution_thumbnailer.c 25 Jul 2007 17:01:03 -0000 1.11
@@ -73,9 +73,9 @@
entropy_plugin *plugin;
- /*printf("Received %d thumbnailers for '%s'\n",
ecore_list_nodes(thumbnailers), request->file->filename); */
+ /*printf("Received %d thumbnailers for '%s'\n",
ecore_list_count(thumbnailers), request->file->filename); */
- ecore_list_goto_first (thumbnailers);
+ ecore_list_first_goto (thumbnailers);
while (!thumb && (plugin = ecore_list_next (thumbnailers))) {
get = dlsym (plugin->dl_ref, "entropy_thumbnailer_thumbnail_get");
thumb = (*get) (request);
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- etk_icon_viewer.c 25 Jun 2007 11:37:09 -0000 1.25
+++ etk_icon_viewer.c 25 Jul 2007 17:01:03 -0000 1.26
@@ -120,7 +120,7 @@
list = ecore_hash_keys (gui_hash);
- ecore_list_goto_first (list);
+ ecore_list_first_goto (list);
while ((obj = ecore_list_next (list))) {
@@ -248,8 +248,8 @@
etk_iconbox_icon_select(icon);
selected = entropy_etk_icon_viewer_selected_get(viewer);
- if (ecore_list_nodes(selected)) {
- if (ecore_list_nodes(selected) > 1) {
+ if (ecore_list_count(selected)) {
+ if (ecore_list_count(selected) > 1) {
entropy_etk_context_menu_popup_multi(instance,selected);
} else {
entropy_etk_context_menu_popup(instance, file);
@@ -281,12 +281,12 @@
etk_iconbox_freeze(ETK_ICONBOX(viewer->iconbox));
etk_iconbox_clear(ETK_ICONBOX(viewer->iconbox));
- ecore_list_goto_first (el);
+ ecore_list_first_goto (el);
while ((file = ecore_list_next (el))) {
icon_viewer_add_row (comp, file);
}
- while ( (ref = ecore_list_remove_first(remove_ref))) {
+ while ( (ref = ecore_list_first_remove(remove_ref))) {
entropy_core_file_cache_remove_reference (ref);
}
ecore_list_destroy(remove_ref);
@@ -343,7 +343,7 @@
entropy_core_selection_type_set(ENTROPY_SELECTION_COPY);
selected = entropy_etk_icon_viewer_selected_get(viewer);
- ecore_list_goto_first(selected);
+ ecore_list_first_goto(selected);
while ( (file = ecore_list_next(selected))) {
entropy_core_selected_file_add(file);
}
@@ -361,7 +361,7 @@
entropy_core_selection_type_set(ENTROPY_SELECTION_CUT);
selected = entropy_etk_icon_viewer_selected_get(viewer);
- ecore_list_goto_first(selected);
+ ecore_list_first_goto(selected);
while ( (file = ecore_list_next(selected))) {
entropy_core_selected_file_add(file);
}
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- etk_list_viewer.c 13 May 2007 12:28:50 -0000 1.82
+++ etk_list_viewer.c 25 Jul 2007 17:01:03 -0000 1.83
@@ -369,7 +369,7 @@
list = ecore_hash_keys (gui_hash);
- ecore_list_goto_first (list);
+ ecore_list_first_goto (list);
while ((obj = ecore_list_next (list))) {
@@ -389,8 +389,8 @@
ecore_list_destroy (list);
- ecore_list_goto_first(view->files);
- while ((row = ecore_list_remove_first(view->files))) {
+ ecore_list_first_goto(view->files);
+ while ((row = ecore_list_first_remove(view->files))) {
ecore_hash_remove(etk_list_viewer_row_hash, row);
}
@@ -629,7 +629,7 @@
printf("Clearing tree..\n");
etk_tree_clear(ETK_TREE(viewer->tree));
- ecore_list_goto_first (el);
+ ecore_list_first_goto (el);
while ((file = ecore_list_next (el))) {
/*We need the file's mime type,
@@ -638,7 +638,7 @@
list_viewer_add_row (comp, file);
}
- while ( (ref = ecore_list_remove_first(remove_ref))) {
+ while ( (ref = ecore_list_first_remove(remove_ref))) {
entropy_core_file_cache_remove_reference (ref);
}
ecore_list_destroy(remove_ref);
@@ -761,7 +761,7 @@
entropy_core_selection_type_set(ENTROPY_SELECTION_COPY);
selected = entropy_etk_list_viewer_selected_get(viewer);
- ecore_list_goto_first(selected);
+ ecore_list_first_goto(selected);
while ( (file = ecore_list_next(selected))) {
entropy_core_selected_file_add(file);
}
@@ -779,7 +779,7 @@
entropy_core_selection_type_set(ENTROPY_SELECTION_CUT);
selected = entropy_etk_list_viewer_selected_get(viewer);
- ecore_list_goto_first(selected);
+ ecore_list_first_goto(selected);
while ( (file = ecore_list_next(selected))) {
entropy_core_selected_file_add(file);
}
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_meta_plugin.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_meta_plugin.c 1 Mar 2007 16:30:08 -0000 1.5
+++ etk_meta_plugin.c 25 Jul 2007 17:01:03 -0000 1.6
@@ -104,7 +104,7 @@
col2 = etk_tree_nth_col_get(ETK_TREE(view->list), 1);
etk_tree_clear(ETK_TREE(view->list));
- ecore_list_goto_first(list);
+ ecore_list_first_goto(list);
while ( (object = ecore_list_next(list))) {
etk_tree_row_append(ETK_TREE(view->list), NULL,
col1, object->key,
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_structure_viewer.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- etk_structure_viewer.c 13 May 2007 12:28:50 -0000 1.36
+++ etk_structure_viewer.c 25 Jul 2007 17:01:03 -0000 1.37
@@ -243,7 +243,7 @@
done:
if (hit) {
- while ((traverse_file =
ecore_list_remove_first(traverse_stack))) {
+ while ((traverse_file =
ecore_list_first_remove(traverse_stack))) {
row = structure_viewer_add_row(comp,
traverse_file, row);
entropy_core_file_cache_add_reference
(traverse_file->md5);
}
@@ -259,7 +259,7 @@
etk_tree_row_select(row);
if (row) {
- ecore_list_goto_first (el);
+ ecore_list_first_goto (el);
while ((file = ecore_list_next (el))) {
if (!ecore_hash_get(viewer->row_folder_hash, file)) {
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_trackback.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_trackback.c 13 May 2007 12:28:50 -0000 1.6
+++ etk_trackback.c 25 Jul 2007 17:01:03 -0000 1.7
@@ -111,7 +111,7 @@
entropy_generic_file* traverse_file =
entropy_core_parent_folder_file_get(event_file);
- ecore_list_goto_first(trackback->levels);
+ ecore_list_first_goto(trackback->levels);
while ( ecore_list_current(trackback->levels) ) {
entropy_generic_file* combo_file =
etk_object_data_get(ETK_OBJECT(ecore_list_current(trackback->levels)),"FILE");
@@ -139,7 +139,7 @@
/*Check if new dir is a direct descendent...*/
if (hit == 1) {
/*HACK - We access combobox internals here..*/
- ecore_list_goto_first(trackback->levels);
+ ecore_list_first_goto(trackback->levels);
Etk_Widget* last_combo;
if ( (last_combo =
ecore_list_current(trackback->levels))) {
Etk_Combobox_Item* item = NULL;
@@ -174,7 +174,7 @@
combo = etk_combobox_new_default();
- ecore_list_goto_first(fl);
+ ecore_list_first_goto(fl);
while ( (file = ecore_list_next(fl) )) {
Etk_Combobox_Item* item;
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/ewl_icon_local_viewer.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- ewl_icon_local_viewer.c 13 Aug 2006 01:20:45 -0000 1.71
+++ ewl_icon_local_viewer.c 25 Jul 2007 17:01:03 -0000 1.72
@@ -148,7 +148,7 @@
if (e->response == EWL_STOCK_OPEN) {
Ecore_List* l;
l = ewl_filedialog_selected_files_get(EWL_FILEDIALOG(viewer->file_dialog));
- ecore_list_goto_first(l);
+ ecore_list_first_goto(l);
file = ecore_list_current(l);
printf ("Curent directory is '%s'\n", viewer->current_dir);
@@ -218,7 +218,7 @@
((entropy_gui_component_instance *) user_data);
selected = entropy_core_selected_files_get (instance->core);
- ecore_list_goto_first (selected);
+ ecore_list_first_goto (selected);
while ((file = ecore_list_next (selected))) {
entropy_plugin_filesystem_file_copy(file, ((entropy_icon_viewer *)
instance->data)->current_dir,
@@ -243,7 +243,7 @@
(((entropy_icon_viewer *) instance->data)->
iconbox));
- ecore_list_goto_first (icon_list);
+ ecore_list_first_goto (icon_list);
while ((list_item = ecore_list_next (icon_list))) {
file =
ecore_hash_get (((entropy_icon_viewer *) instance->data)->icon_hash,
@@ -341,7 +341,7 @@
list = ecore_hash_keys (gui_hash);
- ecore_list_goto_first (list);
+ ecore_list_first_goto (list);
while ((obj = ecore_list_next (list))) {
@@ -387,7 +387,7 @@
entropy_plugin *plugin;
void (*del_func) (entropy_generic_file * source);
- ecore_list_goto_first (file_list);
+ ecore_list_first_goto (file_list);
/*As mentioned below, this is awkward,
* but we avoid a sep. data structure here,
@@ -471,7 +471,7 @@
//////////////////////
icon_list = ewl_iconbox_get_selection (EWL_ICONBOX (ib));
- ecore_list_goto_first (icon_list);
+ ecore_list_first_goto (icon_list);
while ((list_item = ecore_list_next (icon_list))) {
local_file = ecore_hash_get (viewer->icon_hash, list_item);
if (local_file) {
@@ -510,8 +510,8 @@
Ecore_List *sel = ewl_iconbox_get_selection (EWL_ICONBOX (viewer->iconbox));
- if (ecore_list_nodes (sel) == 1) {
- Ewl_Iconbox_Icon *icon = ecore_list_remove_first (sel);
+ if (ecore_list_count (sel) == 1) {
+ Ewl_Iconbox_Icon *icon = ecore_list_first_remove (sel);
gui_file *local_file = ecore_hash_get (viewer->icon_hash, icon);
if (icon) {
@@ -876,7 +876,7 @@
/*data = file list */
- while (i < ICON_ADD_COUNT && (file = ecore_list_remove_first (el))) {
+ while (i < ICON_ADD_COUNT && (file = ecore_list_first_remove (el))) {
ewl_icon_local_viewer_add_icon (proc->requestor, file, DONT_DO_MIME);
/*Remove the pre-idle-add ref*/
@@ -890,7 +890,7 @@
if (!file)
term = 1;
- while ((file = ecore_list_remove_first (added_list))) {
+ while ((file = ecore_list_first_remove (added_list))) {
mime =
(char *) entropy_mime_file_identify (file);
@@ -974,7 +974,7 @@
proc->user_data = ecore_list_new ();
view->last_processor = proc;
- ecore_list_goto_first (ret);
+ ecore_list_first_goto (ret);
while ((event_file = ecore_list_next (ret))) {
//printf("Populating with '%s'\n", event_file->filename);
entropy_core_file_cache_add_reference (event_file->md5);
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/ewl_list_viewer.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_list_viewer.c 16 Oct 2006 01:45:08 -0000 1.19
+++ ewl_list_viewer.c 25 Jul 2007 17:01:03 -0000 1.20
@@ -97,7 +97,7 @@
//printf("Paste the following files:\n");
selected = entropy_core_selected_files_get (instance->core);
- ecore_list_goto_first (selected);
+ ecore_list_first_goto (selected);
while ((file = ecore_list_next (selected))) {
//printf("File '%s'\n", file->filename);
@@ -126,7 +126,7 @@
icon_list = ewl_tree_selected_get(
EWL_TREE(((entropy_icon_viewer*)instance->data)->list) );
- ecore_list_goto_first (icon_list);
+ ecore_list_first_goto (icon_list);
while ((list_item = ecore_list_next (icon_list))) {
file =
ecore_hash_get (((entropy_icon_viewer *) instance->data)->icon_hash,
@@ -265,7 +265,7 @@
list = ecore_hash_keys (gui_hash);
- ecore_list_goto_first (list);
+ ecore_list_first_goto (list);
while ((obj = ecore_list_next (list))) {
@@ -317,7 +317,7 @@
printf ("Selected delete\n");
- ecore_list_goto_first (file_list);
+ ecore_list_first_goto (file_list);
/*As mentioned below, this is awkward,
* but we avoid a sep. data structure here,
@@ -404,7 +404,7 @@
//////////////////////
icon_list = ewl_tree_selected_get(EWL_TREE(viewer->list) );
- ecore_list_goto_first (icon_list);
+ ecore_list_first_goto (icon_list);
while ((list_item = ecore_list_next (icon_list))) {
local_file = ecore_hash_get (viewer->icon_hash, list_item);
if (local_file) {
@@ -705,7 +705,7 @@
/*data = file list */
- while (i < ICON_ADD_COUNT && (file = ecore_list_remove_first (el))) {
+ while (i < ICON_ADD_COUNT && (file = ecore_list_first_remove (el))) {
//printf("Adding '%s'\n", file->filename);
ewl_icon_local_viewer_add_icon (proc->requestor, file, DONT_DO_MIME);
@@ -720,7 +720,7 @@
term = 1;
events = ecore_list_new ();
- while ((file = ecore_list_remove_first (added_list))) {
+ while ((file = ecore_list_first_remove (added_list))) {
mime =
(char *) entropy_mime_file_identify (file);
@@ -803,7 +803,7 @@
- ecore_list_goto_first (ret);
+ ecore_list_first_goto (ret);
while ((event_file = ecore_list_next (ret))) {
//printf("Populating with '%s'\n", event_file->filename);
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/filesystem.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- filesystem.c 29 Dec 2006 13:02:53 -0000 1.82
+++ filesystem.c 25 Jul 2007 17:01:03 -0000 1.83
@@ -69,7 +69,7 @@
watchers = ecore_hash_keys (folder_monitor_hash);
- ecore_list_goto_first (watchers);
+ ecore_list_first_goto (watchers);
while ((key = ecore_list_next (watchers))) {
printf("Scanning watcher... %s:%s\n", ((evfs_file_uri_path *)
ecore_hash_get (folder_monitor_hash, key))->files[0]->path,
folder );
@@ -274,7 +274,7 @@
/*folder = data->resp_command.file_command.files[0]->path;*/
if (data->file_list.list) {
- ecore_list_goto_first (data->file_list.list);
+ ecore_list_first_goto (data->file_list.list);
while ((ref = ecore_list_next (data->file_list.list))) {
/*printf("(%s) Received file type for file: %d\n",
ref->path, ref->file_type); */
@@ -391,7 +391,7 @@
request->identifier = data->resp_command.client_identifier;
- ecore_list_goto_first(data->file_list.list);
+ ecore_list_first_goto(data->file_list.list);
if (ecore_list_current(data->file_list.list)) {
request->file_from =
evfs_filereference_to_entropy_generic_file(ecore_list_current(data->file_list.list));
ecore_list_next(data->file_list.list);
@@ -506,7 +506,7 @@
if (metadata_groups) {
char* obj;
- while ((obj = ecore_list_remove_first(metadata_groups))) {
+ while ((obj = ecore_list_first_remove(metadata_groups))) {
free(obj);
}
}
@@ -553,7 +553,7 @@
/*Now check if anyone else is monitoring this dir - if not, remove the
evfs listener*/
keys = ecore_hash_keys(folder_monitor_hash);
- while ( (key = ecore_list_remove_first(keys))) {
+ while ( (key = ecore_list_first_remove(keys))) {
compare = ecore_hash_get(folder_monitor_hash, key);
if (compare && evfs_filereference_equal_is(dir->files[0],
compare->files[0]))
found = 1;
@@ -930,7 +930,7 @@
Ecore_List* evfs_files;
evfs_files = ecore_list_new();
- ecore_list_goto_first(files);
+ ecore_list_first_goto(files);
while ( (file = ecore_list_next(files)) ) {
printf("Parsing %s for multi copy\n", file->uri);
ecore_list_append(evfs_files, evfs_parse_uri_single(file->uri));
@@ -951,7 +951,7 @@
Ecore_List* evfs_files;
evfs_files = ecore_list_new();
- ecore_list_goto_first(files);
+ ecore_list_first_goto(files);
while ( (file = ecore_list_next(files)) ) {
printf("Parsing %s for multi move\n", file->uri);
ecore_list_append(evfs_files, evfs_parse_uri_single(file->uri));
@@ -1144,7 +1144,7 @@
flag = 0;
evfs_files = ecore_list_new();
- ecore_list_goto_first(files);
+ ecore_list_first_goto(files);
while ( (file = ecore_list_next(files)) ) {
if (file->attach) {
snprintf(path, PATH_MAX, "%s%s%s", URI_POSIX, "://",
file->attach);
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- layout_etk_simple.c 29 Jun 2007 01:01:43 -0000 1.75
+++ layout_etk_simple.c 25 Jul 2007 17:01:03 -0000 1.76
@@ -239,7 +239,7 @@
structure = ecore_hash_get(_etk_layout_row_reference, row);
row_refs =
ecore_hash_get(_etk_layout_structure_plugin_reference, structure);
if (row_refs) {
- while ( (ref = ecore_list_remove_first(row_refs))) {
+ while ( (ref = ecore_list_first_remove(row_refs))) {
etk_tree_row_delete(ref->row);
IF_FREE(ref);
}
@@ -655,11 +655,11 @@
char* f_uri = cfolder->uri;
if (f_uri) {
if (stype == ENTROPY_SELECTION_COPY) {
- printf("Copy type..: %d:%s\n",
ecore_list_nodes(files), f_uri);
+ printf("Copy type..: %d:%s\n",
ecore_list_count(files), f_uri);
entropy_plugin_filesystem_file_copy_multi(files, f_uri,
comp);
} else if (stype == ENTROPY_SELECTION_CUT) {
- printf("Cut type..:%d:%s\n",
ecore_list_nodes(files), f_uri);
+ printf("Cut type..:%d:%s\n",
ecore_list_count(files), f_uri);
entropy_plugin_filesystem_file_move_multi(files, f_uri,
comp);
} else {
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/structure_viewer.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- structure_viewer.c 27 Aug 2006 03:30:28 -0000 1.40
+++ structure_viewer.c 25 Jul 2007 17:01:03 -0000 1.41
@@ -112,7 +112,7 @@
if (row && !ecore_hash_get (viewer->loaded_dirs, row)) {
- ecore_list_goto_first (el);
+ ecore_list_first_goto (el);
while ((file = ecore_list_next (el))) {
/*We need the file's mime type,
@@ -197,8 +197,8 @@
event->file->path, event->file->filename);
- ecore_list_goto_first (sel_list);
- while ((icon = ecore_list_remove_first (sel_list))) {
+ ecore_list_first_goto (sel_list);
+ while ((icon = ecore_list_first_remove (sel_list))) {
if ((file = entropy_core_object_file_association_get (icon))) {
printf ("Filename: '%s' - '%s/%s'\n", file->uri_base, file->path,
file->filename);
-------------------------------------------------------------------------
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
