From 235480b36c65b14424c1161a81db91b59a9ca2b0 Mon Sep 17 00:00:00 2001 From: Jaime Thomas Date: Fri, 31 Oct 2008 13:23:31 +0000 Subject: [PATCH] Move to eina stringshare --- ecdb/trunk/configure.in | 4 +++- ecdb/trunk/src/ecdb.h | 1 + ecdb/trunk/src/ecdb_burn.c | 12 ++++-------- ecdb/trunk/src/ecdb_filelist_custom.c | 4 ++-- ecdb/trunk/src/ecdb_image.c | 4 ++-- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ecdb/trunk/configure.in b/ecdb/trunk/configure.in index fc62e55..2dde847 100644 --- a/ecdb/trunk/configure.in +++ b/ecdb/trunk/configure.in @@ -90,8 +90,10 @@ AM_CONDITIONAL(GSTREAMER_BUILD_SUPPORT, test "x$have_gstreamer" = "xyes") dnl Make gstreamer an optional dependancy at some point PKG_CHECK_MODULES(ECDB, [ - ecore + ecore-file ecore-evas + ecore + eina-0 evas ewl edje diff --git a/ecdb/trunk/src/ecdb.h b/ecdb/trunk/src/ecdb.h index 7598188..34b266d 100644 --- a/ecdb/trunk/src/ecdb.h +++ b/ecdb/trunk/src/ecdb.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/ecdb/trunk/src/ecdb_burn.c b/ecdb/trunk/src/ecdb_burn.c index 0c0b070..3372014 100644 --- a/ecdb/trunk/src/ecdb_burn.c +++ b/ecdb/trunk/src/ecdb_burn.c @@ -125,8 +125,6 @@ ecdb_burn_project(Ecdb_Burn_Project *proj) printf("Error: Cannot create burn data structure!\n"); return FALSE; } - data->sources = ecore_list_new(); - data->tracks = ecore_list_new(); data->proj = ECDB_PROJECT(proj); if (proj->burn_mode != BURN_AUDIO) @@ -287,14 +285,12 @@ _progress_gui_update(void *data) /* These don't enjoy being called before * ecore_main_loop_begin */ - //ecore_event_add(ECDB_DRIVE_ACTION_FINISHED, data, NULL, NULL); - ecore_event_add(ECDB_DRIVE_ACTION_FINISHED, NULL, NULL, NULL); + ecore_event_add(ECDB_DRIVE_ACTION_FINISHED, data, NULL, NULL); printf("Burn finished\n"); return ECORE_CALLBACK_CANCEL; } else - ecore_event_add(ECDB_DRIVE_ACTION_UPDATE, NULL, NULL, NULL); - //ecore_event_add(ECDB_DRIVE_ACTION_UPDATE, data, NULL, NULL); + ecore_event_add(ECDB_DRIVE_ACTION_UPDATE, data, NULL, NULL); return ECORE_CALLBACK_RENEW; } @@ -309,8 +305,8 @@ ecdb_burn_finished(void *data, int type, void *event) proj = data; - ecore_list_first_goto(proj->sources); - ecore_list_first_goto(proj->tracks); + ecore_list_first(proj->sources); + ecore_list_first(proj->tracks); printf("Freeing source and tracks\n"); while ((source = ecore_list_remove(proj->sources))) diff --git a/ecdb/trunk/src/ecdb_filelist_custom.c b/ecdb/trunk/src/ecdb_filelist_custom.c index b811f0a..dfb62b4 100644 --- a/ecdb/trunk/src/ecdb_filelist_custom.c +++ b/ecdb/trunk/src/ecdb_filelist_custom.c @@ -124,7 +124,7 @@ ecdb_custom_filelist_directory_new(Ecdb_Source *parent) while ((src = parent->children[i])) { file = calloc(1, sizeof(Ewl_Filelist_File)); - file->name = ecore_string_instance(src->dst); + file->name = eina_stringshare_add(src->dst); stat(src->dst, &st); file->size = st.st_size; @@ -169,7 +169,7 @@ ecdb_custom_filelist_directory_new(Ecdb_Source *parent) static void free_file(Ewl_Filelist_File *file) { - ecore_string_release(file->name); + eina_stringshare_del(file->name); FREE(file); } diff --git a/ecdb/trunk/src/ecdb_image.c b/ecdb/trunk/src/ecdb_image.c index 22d0de4..30e305e 100644 --- a/ecdb/trunk/src/ecdb_image.c +++ b/ecdb/trunk/src/ecdb_image.c @@ -39,7 +39,7 @@ ecdb_source_destroy(Ecdb_Source *src) Ecdb_Source *child; /* free the non-recursive stuff */ - if (src->dst) ecore_string_release(src->dst); + if (src->dst) eina_stringshare_del(src->dst); if (src->node) iso_node_unref(src->node); for (i = 0; src->children[i]; i++) @@ -57,7 +57,7 @@ ecdb_source_data_set(Ecdb_Source *src, const char *dst) if (!src) return; - src->dst = ecore_string_instance(dst); + src->dst = eina_stringshare_add(dst); /* Add the files recursively here */ if (ecore_file_is_dir(src->dst))