Enlightenment CVS committal
Author : rbdpngn
Project : misc
Module : erss
Dir : misc/erss/src
Modified Files:
Makefile.am erss.c erss.h gui.c gui.h ls.c net.c parse.c
parse_config.c
Removed Files:
config.h
Log Message:
Move from EWD to Ecore for the lists. Remove the config.h from CVS.
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 21 Feb 2004 08:53:36 -0000 1.6
+++ Makefile.am 14 Apr 2004 18:15:48 -0000 1.7
@@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in
-INCLUDES = @edje_cflags@ @esmart_cflags@ @ewd_cflags@ @etox_cflags@ @xml2_cflags@
+INCLUDES = @edje_cflags@ @esmart_cflags@ @etox_cflags@ @xml2_cflags@
bin_PROGRAMS = erss
erss_SOURCES = erss.c parse.c parse_config.c tooltip.c net.c ls.c gui.c
-erss_LDADD = @edje_libs@ @esmart_libs@ @ewd_libs@ @etox_libs@ @xml2_libs@
+erss_LDADD = @edje_libs@ @esmart_libs@ @etox_libs@ @xml2_libs@
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/erss.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- erss.c 9 Mar 2004 17:51:46 -0000 1.40
+++ erss.c 14 Apr 2004 18:15:48 -0000 1.41
@@ -7,7 +7,7 @@
-Ewd_List *config_files=NULL;
+Ecore_List *config_files=NULL;
char *theme=NULL;
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/erss.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- erss.h 26 Feb 2004 21:05:32 -0000 1.14
+++ erss.h 14 Apr 2004 18:15:48 -0000 1.15
@@ -3,7 +3,6 @@
#include <Ecore.h>
#include <Ecore_Con.h>
-#include <Ewd.h>
#include <Esmart/Esmart_Trans.h>
#include <Esmart/container.h>
#include <Etox.h>
@@ -38,7 +37,7 @@
extern Evas_Object *cont;
extern int world_x;
extern int world_y;
-extern Ewd_List *config_files;
+extern Ecore_List *config_files;
@@ -87,7 +86,7 @@
size_t main_bufsize;
int waiting_for_reply;
int total_connects;
- Ewd_List *list;
+ Ecore_List *list;
xmlDocPtr doc;
Erss_Article *item;
Erss_Config *cfg;
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/gui.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- gui.c 9 Mar 2004 17:51:46 -0000 1.4
+++ gui.c 14 Apr 2004 18:15:48 -0000 1.5
@@ -177,8 +177,8 @@
return -1;
if (f->list) {
- Erss_Article *item = ewd_list_goto_first (f->list);
- while ((item = ewd_list_next(f->list))) {
+ Erss_Article *item = ecore_list_goto_first (f->list);
+ while ((item = ecore_list_next(f->list))) {
if(erss_gui_item_new(f,item)==ERSS_GAI_SUCC)
c++;
}
@@ -215,21 +215,21 @@
-int erss_gui_items_drop(Ewd_List **l) {
- Ewd_List *list;
+int erss_gui_items_drop(Ecore_List **l) {
+ Ecore_List *list;
Erss_Article *item;
if ((l == NULL) || ((list=*l) == NULL))
return FALSE;
- item = ewd_list_goto_first (list);
- while ((item = ewd_list_next(list))) {
+ item = ecore_list_goto_first (list);
+ while ((item = ecore_list_next(list))) {
if (item->description && item->obj)
erss_tooltip_free(item);
erss_gui_item_dst(&item);
}
- ewd_list_remove (list);
+ ecore_list_remove (list);
return TRUE;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/gui.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- gui.h 26 Feb 2004 21:05:32 -0000 1.3
+++ gui.h 14 Apr 2004 18:15:48 -0000 1.4
@@ -3,7 +3,7 @@
int erss_set_time (void *);
int erss_gui_items_add(Erss_Feed *);
-int erss_gui_items_drop(Ewd_List **);
+int erss_gui_items_drop(Ecore_List **);
int erss_gui_init (char *, Erss_Config *);
int erss_gui_exit (void);
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/ls.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ls.c 9 Mar 2004 17:51:46 -0000 1.2
+++ ls.c 14 Apr 2004 18:15:48 -0000 1.3
@@ -11,7 +11,7 @@
{
char *str;
char *ptr;
- Ewd_List *paths;
+ Ecore_List *paths;
struct dirent **dentries;
struct stat statbuf;
int num, i;
@@ -19,26 +19,26 @@
int found_files = FALSE;
int no_dir = FALSE;
- paths = ewd_list_new ();
- config_files = ewd_list_new ();
+ paths = ecore_list_new ();
+ config_files = ecore_list_new ();
str = malloc (PATH_MAX);
snprintf (str, PATH_MAX, "%s/.%s/config", getenv("HOME"), PACKAGE);
- ewd_list_append (paths, str);
+ ecore_list_append (paths, str);
str = malloc (PATH_MAX);
snprintf (str, PATH_MAX, "/etc/%s/config", PACKAGE);
- ewd_list_append (paths, str);
+ ecore_list_append (paths, str);
str = malloc (PATH_MAX);
snprintf (str, PATH_MAX, "%s/config", PACKAGE_DATA_DIR);
- ewd_list_append (paths, str);
+ ecore_list_append (paths, str);
if (output)
printf ("\n%s processing potential dirs ...\n", PACKAGE);
- ptr = ewd_list_goto_first (paths);
- while ((ptr = ewd_list_current (paths))) {
+ ptr = ecore_list_goto_first (paths);
+ while ((ptr = ecore_list_current (paths))) {
if (output)
printf ("\nprocessing '%s':\n", ptr);
@@ -66,7 +66,7 @@
if (strstr (dentries[num]->d_name, ".cfg")) {
found_files = TRUE;
- ewd_list_append (config_files, strdup
(file));
+ ecore_list_append (config_files,
strdup (file));
if (output)
printf ("\t%s\n", file);
}
@@ -86,20 +86,20 @@
no_dir = FALSE;
}
- ewd_list_next (paths);
+ ecore_list_next (paths);
}
/*
* Finished reading and printing available config files
* now remove the paths list since we don't need it anymore.
*/
- ptr = ewd_list_goto_first (paths);
- while ((ptr = ewd_list_current (paths))) {
+ ptr = ecore_list_goto_first (paths);
+ while ((ptr = ecore_list_current (paths))) {
if (ptr)
free (ptr);
- ewd_list_next (paths);
+ ecore_list_next (paths);
}
- ewd_list_destroy (paths);
+ ecore_list_destroy (paths);
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/net.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- net.c 9 Mar 2004 17:51:46 -0000 1.6
+++ net.c 14 Apr 2004 18:15:48 -0000 1.7
@@ -111,7 +111,7 @@
erss_gui_items_drop(&f->list);
f->item = NULL;
- f->list = ewd_list_new ();
+ f->list = ecore_list_new ();
temp = strstr (buf, "<?xml");
f->doc = xmlParseMemory (temp, f->main_bufsize - (temp - f->main_buffer));
@@ -122,7 +122,7 @@
ecore_con_server_del (e->server);
f->server = NULL;
- if (ewd_list_is_empty (f->list)) {
+ if (ecore_list_is_empty (f->list)) {
if (buf)
printf ("%s\n", temp);
else
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/parse.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- parse.c 26 Feb 2004 21:05:32 -0000 1.28
+++ parse.c 14 Apr 2004 18:15:48 -0000 1.29
@@ -16,7 +16,7 @@
static void erss_parse_story_end (Erss_Feed *f)
{
- ewd_list_append (f->list, f->item);
+ ecore_list_append (f->list, f->item);
f->item = NULL;
}
@@ -57,7 +57,7 @@
while (cur != NULL) {
- if (ewd_list_nodes (f->list) >= cfg->num_stories)
+ if (ecore_list_nodes (f->list) >= cfg->num_stories)
return;
if (!strcmp(cur->name, cfg->item_start)) {
@@ -136,11 +136,11 @@
return ERSS_PARSE_EMPTY;
}
- ret=ewd_list_nodes (f->list);
+ ret=ecore_list_nodes (f->list);
cur = cur->xmlChildrenNode;
while (cur != NULL) {
- if (ewd_list_nodes (f->list) >= cfg->num_stories) {
+ if (ecore_list_nodes (f->list) >= cfg->num_stories) {
ret=cfg->num_stories;
break;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/parse_config.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- parse_config.c 9 Mar 2004 17:51:46 -0000 1.7
+++ parse_config.c 14 Apr 2004 18:15:48 -0000 1.8
@@ -142,8 +142,8 @@
if (doc == NULL) {
erss_list_config_files (FALSE);
- tmp = ewd_list_goto_first (config_files);
- while ((tmp = ewd_list_current (config_files))) {
+ tmp = ecore_list_goto_first (config_files);
+ while ((tmp = ecore_list_current (config_files))) {
if (strstr (tmp, file)) {
doc = xmlParseFile (tmp);
@@ -157,7 +157,7 @@
break;
}
- ewd_list_next (config_files);
+ ecore_list_next (config_files);
}
if (!match) {
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
