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 e_main.c e_thumb.c
Log Message:
- move init / shutdown calls to their proper locations
- disable _e_fileman_reconf_cb for now as its looping infinitely
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_fileman.c 19 Oct 2005 11:37:30 -0000 1.6
+++ e_fileman.c 19 Oct 2005 12:17:42 -0000 1.7
@@ -72,7 +72,7 @@
e_win_resize_callback_set(fileman->win, _e_fileman_cb_resize);
e_win_resize(fileman->win, 640, 480);
- e_fm_init(); // this needs to move to e's global init
+ evas_event_freeze(fileman->evas);
fileman->smart = e_fm_add(fileman->evas);
e_fm_e_win_set(fileman->smart, fileman->win);
@@ -84,7 +84,9 @@
fileman->event_handlers = evas_list_append(fileman->event_handlers,
ecore_event_handler_add(E_EVENT_FM_RECONFIGURE,
_e_fileman_reconf_cb,
-
fileman));
+ fileman));
+ evas_event_thaw(fileman->evas);
+
return fileman;
}
@@ -125,7 +127,10 @@
fileman = win->data;
evas_object_resize(fileman->main, win->w, win->h);
- e_fm_geometry_virtual_get(fileman->smart, &w, &h);
+ e_fm_geometry_virtual_get(fileman->smart, &w, &h);
+
+ evas_event_freeze(fileman->evas);
+
if (h > win->h)
edje_object_part_swallow(fileman->main, "vscrollbar",
fileman->vscrollbar);
else
@@ -133,6 +138,8 @@
edje_object_part_unswallow(fileman->main, fileman->vscrollbar);
evas_object_hide(fileman->vscrollbar);
}
+
+ evas_event_thaw(fileman->evas);
}
static void
@@ -162,7 +169,9 @@
fileman = data;
ev = event;
-
+
+ return;
+
evas_event_freeze(fileman->evas);
if (ev->h > fileman->win->h)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_fileman_smart.c 19 Oct 2005 11:37:30 -0000 1.37
+++ e_fileman_smart.c 19 Oct 2005 12:17:42 -0000 1.38
@@ -525,8 +525,6 @@
sd->icon_info.h = 48;
sd->icon_info.x_space = 15;
sd->icon_info.y_space = 15;
-
- e_thumb_init();
sd->monitor = NULL;
sd->file_offset = 0;
@@ -652,9 +650,7 @@
evas_object_del(sd->bg);
free(sd->dir);
- free(sd);
-
- e_thumb_shutdown();
+ free(sd);
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- e_main.c 25 Sep 2005 04:58:18 -0000 1.125
+++ e_main.c 19 Oct 2005 12:17:42 -0000 1.126
@@ -731,6 +731,8 @@
if (!e_desk_init()) return 0;
if (!e_gadman_init()) return 0;
if (!e_menu_init()) return 0;
+ if (!e_thumb_init()) return 0;
+ if (!e_fm_init()) return 0;
num = 0;
roots = ecore_x_window_root_list(&num);
@@ -785,6 +787,8 @@
static int
_e_main_screens_shutdown(void)
{
+ e_fm_shutdown();
+ e_thumb_shutdown();
e_win_shutdown();
e_border_shutdown();
e_focus_shutdown();
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_thumb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_thumb.c 18 Oct 2005 23:03:36 -0000 1.1
+++ e_thumb.c 19 Oct 2005 12:17:42 -0000 1.2
@@ -31,7 +31,7 @@
int
e_thumb_shutdown(void)
{
- free(thumb_path);
+ E_FREE(thumb_path);
return 1;
}
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
