Enlightenment CVS committal

Author  : codewarrior
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_fileman.c e_fileman_smart.c 


Log Message:
- fix restart / shutdown bug. please confirm.


===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_fileman.c 22 Oct 2005 17:02:37 -0000      1.13
+++ e_fileman.c 23 Oct 2005 11:25:35 -0000      1.14
@@ -146,7 +146,7 @@
    evas_object_del(fileman->smart);
    evas_object_del(fileman->main);
    e_object_del(E_OBJECT(fileman->win));
-   //free(fileman);
+   free(fileman);
 }
 
 static void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_fileman_smart.c   23 Oct 2005 01:05:18 -0000      1.48
+++ e_fileman_smart.c   23 Oct 2005 11:25:35 -0000      1.49
@@ -476,7 +476,9 @@
    e_theme_edje_object_set(sd->selection.band.obj,
                           "base/theme/fileman/rubberband",
                           "fileman/rubberband");
-
+   
+   sd->event_handlers = NULL;
+   
    sd->event_handlers = evas_list_append(sd->event_handlers,
                                         
ecore_event_handler_add(ECORE_X_EVENT_XDND_ENTER,
                                                                 
_e_fm_drop_enter_cb,
@@ -500,11 +502,9 @@
    sd->event_handlers = evas_list_append(sd->event_handlers,
                                         
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE,
                                                                 
_e_fm_win_mouse_move_cb,
-                                                                sd));
-   
+                                                                sd));   
    sd->monitor = NULL;
    sd->position = 0.0;
-   sd->event_handlers = NULL;
 
    sd->conf.main_edd = E_CONFIG_DD_NEW("E_Fm_Config", E_Fm_Config);
    sd->conf.assoc_app_edd = E_CONFIG_DD_NEW("E_Fm_Assoc_App",E_Fm_Assoc_App);
@@ -2045,7 +2045,7 @@
    sd = data;
 
    /* this shouldnt be here if we clean up properly */
-   if(!ev || !sd)
+   if(!ev->win || !ev->event_win || !sd)
      return 0;
    
 /* TODO - rethink this code */




-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to