- fix restart / shutdown bug. please confirm.

SVN revision: 17804
This commit is contained in:
codewarrior 2005-10-23 11:25:35 +00:00 committed by codewarrior
parent 7da82144c0
commit 02e180ec55
2 changed files with 6 additions and 6 deletions

View File

@ -146,7 +146,7 @@ _e_fileman_free(E_Fileman *fileman)
evas_object_del(fileman->smart); evas_object_del(fileman->smart);
evas_object_del(fileman->main); evas_object_del(fileman->main);
e_object_del(E_OBJECT(fileman->win)); e_object_del(E_OBJECT(fileman->win));
//free(fileman); free(fileman);
} }
static void static void

View File

@ -476,7 +476,9 @@ _e_fm_smart_add(Evas_Object *object)
e_theme_edje_object_set(sd->selection.band.obj, e_theme_edje_object_set(sd->selection.band.obj,
"base/theme/fileman/rubberband", "base/theme/fileman/rubberband",
"fileman/rubberband"); "fileman/rubberband");
sd->event_handlers = NULL;
sd->event_handlers = evas_list_append(sd->event_handlers, sd->event_handlers = evas_list_append(sd->event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_XDND_ENTER, ecore_event_handler_add(ECORE_X_EVENT_XDND_ENTER,
_e_fm_drop_enter_cb, _e_fm_drop_enter_cb,
@ -500,11 +502,9 @@ _e_fm_smart_add(Evas_Object *object)
sd->event_handlers = evas_list_append(sd->event_handlers, sd->event_handlers = evas_list_append(sd->event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE,
_e_fm_win_mouse_move_cb, _e_fm_win_mouse_move_cb,
sd)); sd));
sd->monitor = NULL; sd->monitor = NULL;
sd->position = 0.0; sd->position = 0.0;
sd->event_handlers = NULL;
sd->conf.main_edd = E_CONFIG_DD_NEW("E_Fm_Config", E_Fm_Config); 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); sd->conf.assoc_app_edd = E_CONFIG_DD_NEW("E_Fm_Assoc_App",E_Fm_Assoc_App);
@ -2045,7 +2045,7 @@ _e_fm_win_mouse_move_cb(void *data, int type, void *event)
sd = data; sd = data;
/* this shouldnt be here if we clean up properly */ /* this shouldnt be here if we clean up properly */
if(!ev || !sd) if(!ev->win || !ev->event_win || !sd)
return 0; return 0;
/* TODO - rethink this code */ /* TODO - rethink this code */