libburnia/experimental-legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move to eina stringshare

Browse Source
This commit is contained in:
Jaime Thomas 2008-10-31 13:23:31 +00:00
parent d4bfba5ef0
commit 235480b36c
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ecdb/trunk/configure.in
View File

@ -90,8 +90,10 @@ AM_CONDITIONAL(GSTREAMER_BUILD_SUPPORT, test "x$have_gstreamer" = "xyes")
dnl Make gstreamer an optional dependancy at some point dnl Make gstreamer an optional dependancy at some point
PKG_CHECK_MODULES(ECDB, [ PKG_CHECK_MODULES(ECDB, [
ecore ecore-file
ecore-evas ecore-evas
ecore
eina-0
evas evas
ewl ewl
edje edje

1
ecdb/trunk/src/ecdb.h
View File

@ -6,6 +6,7 @@
#include <Edje.h> #include <Edje.h>
#include <Ecore.h> #include <Ecore.h>
#include <Ecore_Data.h> #include <Ecore_Data.h>
#include <Eina.h>
#include <Ecore_File.h> #include <Ecore_File.h>
#include <Ecore_Evas.h> #include <Ecore_Evas.h>
#include <Ecore_Str.h> #include <Ecore_Str.h>

12
ecdb/trunk/src/ecdb_burn.c
View File

@ -125,8 +125,6 @@ ecdb_burn_project(Ecdb_Burn_Project *proj)
printf("Error: Cannot create burn data structure!\n"); printf("Error: Cannot create burn data structure!\n");
return FALSE; return FALSE;
} }
data->sources = ecore_list_new();
data->tracks = ecore_list_new();
data->proj = ECDB_PROJECT(proj); data->proj = ECDB_PROJECT(proj);
if (proj->burn_mode != BURN_AUDIO) if (proj->burn_mode != BURN_AUDIO)
@ -287,14 +285,12 @@ _progress_gui_update(void *data)
/* These don't enjoy being called before /* These don't enjoy being called before
* ecore_main_loop_begin * ecore_main_loop_begin
*/ */
//ecore_event_add(ECDB_DRIVE_ACTION_FINISHED, data, NULL, NULL); ecore_event_add(ECDB_DRIVE_ACTION_FINISHED, data, NULL, NULL);
ecore_event_add(ECDB_DRIVE_ACTION_FINISHED, NULL, NULL, NULL);
printf("Burn finished\n"); printf("Burn finished\n");
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
} }
else 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; return ECORE_CALLBACK_RENEW;
} }
@ -309,8 +305,8 @@ ecdb_burn_finished(void *data, int type, void *event)
proj = data; proj = data;
ecore_list_first_goto(proj->sources); ecore_list_first(proj->sources);
ecore_list_first_goto(proj->tracks); ecore_list_first(proj->tracks);
printf("Freeing source and tracks\n"); printf("Freeing source and tracks\n");
while ((source = ecore_list_remove(proj->sources))) while ((source = ecore_list_remove(proj->sources)))

4
ecdb/trunk/src/ecdb_filelist_custom.c
View File

@ -124,7 +124,7 @@ ecdb_custom_filelist_directory_new(Ecdb_Source *parent)
while ((src = parent->children[i])) while ((src = parent->children[i]))
{ {
file = calloc(1, sizeof(Ewl_Filelist_File)); 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); stat(src->dst, &st);
file->size = st.st_size; file->size = st.st_size;
@ -169,7 +169,7 @@ ecdb_custom_filelist_directory_new(Ecdb_Source *parent)
static void static void
free_file(Ewl_Filelist_File *file) free_file(Ewl_Filelist_File *file)
{ {
ecore_string_release(file->name); eina_stringshare_del(file->name);
FREE(file); FREE(file);
} }

4
ecdb/trunk/src/ecdb_image.c
View File

@ -39,7 +39,7 @@ ecdb_source_destroy(Ecdb_Source *src)
Ecdb_Source *child; Ecdb_Source *child;
/* free the non-recursive stuff */ /* 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); if (src->node) iso_node_unref(src->node);
for (i = 0; src->children[i]; i++) for (i = 0; src->children[i]; i++)
@ -57,7 +57,7 @@ ecdb_source_data_set(Ecdb_Source *src, const char *dst)
if (!src) if (!src)
return; return;
src->dst = ecore_string_instance(dst); src->dst = eina_stringshare_add(dst);
/* Add the files recursively here */ /* Add the files recursively here */
if (ecore_file_is_dir(src->dst)) if (ecore_file_is_dir(src->dst))