Enlightenment CVS committal

Author  : titan
Project : e17
Module  : proto

Dir     : e17/proto/ephoto/src/bin


Modified Files:
        ephoto_gui.c 


Log Message:
More tree2 work.

===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ephoto_gui.c        8 Jan 2007 04:37:13 -0000       1.18
+++ ephoto_gui.c        8 Jan 2007 05:38:22 -0000       1.19
@@ -234,7 +234,15 @@
        ewl_icon_image_set(EWL_ICON(w), PACKAGE_DATA_DIR "/images/folder.png", 
NULL);
        ewl_icon_label_set(EWL_ICON(w), basename(file));
        ewl_icon_constrain_set(EWL_ICON(w), 25);
-       ewl_callback_append(w, EWL_CALLBACK_CLICKED, populate_files, file);
+       if (strcmp(file, ".."))
+       {
+               ewl_widget_name_set(w, file);
+       }
+       else
+       {
+               ewl_widget_name_set(w, dirname(current_directory));
+       }
+       ewl_callback_append(w, EWL_CALLBACK_CLICKED, populate_files, NULL);
 }      
 
 /* The directories that will be displayed*/ 
@@ -281,21 +289,19 @@
 /*Update the Directory List and Image List*/
 static void populate_files(Ewl_Widget *w, void *event, void *data)
 {
-       char *cdir, *dir, *imagef;
+       char *cdir, *imagef;
        Ewl_Widget *image, *thumb;
 
-       cdir = data;
-
-       /*if (strcmp(dir, ".."))
+       if (w)
        {
-               cdir = dir;
+               cdir = (char *)ewl_widget_name_get(w);
        }
        else
        {
-               cdir = dirname(current_directory);
+               cdir = data;
        }
 
-       current_directory = cdir;*/ /*This causes a segfault right now*/
+       current_directory = cdir;
 
        if (!ecore_list_is_empty(directories))
        {



-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to