Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto.h ephoto_callbacks.c
Log Message:
More work!
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ephoto.h 5 Sep 2006 22:28:38 -0000 1.32
+++ ephoto.h 5 Sep 2006 23:24:17 -0000 1.33
@@ -8,7 +8,7 @@
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
-#include <strings.h>
+#include <string.h>
void destroy_cb(Ewl_Widget *w, void *event, void *data);
void populate_albums(Ewl_Widget *w, void *event, void *data);
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ephoto_callbacks.c 5 Sep 2006 22:28:38 -0000 1.10
+++ ephoto_callbacks.c 5 Sep 2006 23:24:17 -0000 1.11
@@ -145,30 +145,28 @@
{
ls = ecore_file_ls(dir);
while(!ecore_list_is_empty(ls))
- {
+ {
snprintf(full_path, PATH_MAX, "%s/%s", dir, ecore_list_remove_first(ls));
- image = strdup(full_path);
- if (fnmatch("*.[Jj][Pp][Ee][Gg]", image, 0) == 0)
+ if (fnmatch("*.[Jj][Pp][Ee][Gg]", full_path, 0) == 0)
{
- ecore_list_append(images, image);
+ ecore_list_append(images, strdup(full_path));
}
- if (fnmatch("*.[Jj][Pp][Gg]", image, 0) == 0)
+ if (fnmatch("*.[Jj][Pp][Gg]", full_path, 0) == 0)
{
- ecore_list_append(images, image);
+ ecore_list_append(images, strdup(full_path));
}
- if (fnmatch("*.[Pp][Nn][Gg]", image, 0) == 0)
+ if (fnmatch("*.[Pp][Nn][Gg]", full_path, 0) == 0)
{
- ecore_list_append(images, image);
+ ecore_list_append(images, strdup(full_path));
}
- if (fnmatch("*.[Gg][Ii][Ff]", image, 0) == 0)
+ if (fnmatch("*.[Gg][Ii][Ff]", full_path, 0) == 0)
{
- ecore_list_append(images, image);
+ ecore_list_append(images, strdup(full_path));
}
- if (fnmatch("*.[Ss][Vv][Gg]", image, 0) == 0)
+ if (fnmatch("*.[Ss][Vv][Gg]", full_path, 0) == 0)
{
- ecore_list_append(images, image);
+ ecore_list_append(images, strdup(full_path));
}
- free(image);
}
}
else
@@ -178,7 +176,7 @@
{
while(fgets(text,PATH_MAX,file_ptr) != NULL)
{
- if (strncmp(text, "#", 1)) ecore_list_append(images, strdup(text));
+ if (strncmp(text, "#", 1)) ecore_list_append(images, text);
}
fclose(file_ptr);
}
@@ -190,7 +188,7 @@
m->icon = ewl_icon_new();
ewl_box_orientation_set(EWL_BOX(m->icon), EWL_ORIENTATION_VERTICAL);
- ewl_icon_image_set(EWL_ICON(m->icon), full_path, NULL);
+ ewl_icon_image_set(EWL_ICON(m->icon), image, NULL);
//ewl_icon_label_set(EWL_ICON(m->icon), image);
ewl_icon_constrain_set(EWL_ICON(m->icon), 64);
ewl_container_child_append(EWL_CONTAINER(m->viewer_freebox), m->icon);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
