Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_container.c e_container.h e_includes.h e_main.c
Added Files:
e_gadman.c e_gadman.h
Log Message:
evas_object_free? what posessed you to use that? it isnt in Evas' header
(api) at all (it HAPPENS by LUCK to be an internal call)
also fix shudwon/startup order
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Makefile.am 12 Jan 2005 16:03:08 -0000 1.11
+++ Makefile.am 15 Jan 2005 09:50:13 -0000 1.12
@@ -39,7 +39,8 @@
e_resist.h \
e_startup.h \
e_iconify.h \
-e_hints.h
+e_hints.h \
+e_gadman.h
enlightenment_SOURCES = \
@@ -73,6 +74,7 @@
e_startup.c \
e_iconify.c \
e_hints.c \
+e_gadman.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_LDFLAGS = -export-dynamic @e_libs@ @dlopen_libs@
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_container.c 13 Jan 2005 14:24:24 -0000 1.19
+++ e_container.c 15 Jan 2005 09:50:26 -0000 1.20
@@ -95,6 +95,9 @@
zone = e_zone_new(con, zx, zy, zw, zh);
}
}
+
+ con->gadman = e_gadman_new(con);
+
return con;
}
@@ -320,6 +323,7 @@
static void
_e_container_free(E_Container *con)
{
+ if (con->gadman) e_object_del(E_OBJECT(con->gadman));
while (con->clients) e_object_free(E_OBJECT(con->clients->data));
while (con->zones) e_object_free(E_OBJECT(con->zones->data));
con->manager->containers = evas_list_remove(con->manager->containers, con);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_container.h 12 Jan 2005 16:03:08 -0000 1.8
+++ e_container.h 15 Jan 2005 09:50:26 -0000 1.9
@@ -28,6 +28,7 @@
int x, y, w, h;
char visible : 1;
E_Manager *manager;
+ E_Gadman *gadman;
int num;
char *name;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_includes.h 12 Jan 2005 16:03:08 -0000 1.1
+++ e_includes.h 15 Jan 2005 09:50:26 -0000 1.2
@@ -27,3 +27,4 @@
#include "e_startup.h"
#include "e_iconify.h"
#include "e_hints.h"
+#include "e_gadman.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_main.c 14 Jan 2005 14:01:08 -0000 1.26
+++ e_main.c 15 Jan 2005 09:50:26 -0000 1.27
@@ -148,14 +148,6 @@
/* Init window manager hints */
e_hints_init();
- /* setup menu handlers etc. */
- if (!e_menu_init())
- {
- e_error_message_show("Enlightenment cannot initialize the menu
system.\n"
- "Perhaps you are out of memory?");
- _e_main_shutdown(-1);
- }
- _e_main_shutdown_push(e_menu_shutdown);
/* init generic communications */
if (!ecore_con_init())
{
@@ -480,6 +472,8 @@
if (!e_container_init()) return 0;
if (!e_zone_init()) return 0;
if (!e_desk_init()) return 0;
+ if (!e_gadman_init()) return 0;
+ if (!e_menu_init()) return 0;
num = 0;
roots = ecore_x_window_root_list(&num);
@@ -551,6 +545,8 @@
{
e_border_shutdown();
e_focus_shutdown();
+ e_menu_shutdown();
+ e_gadman_shutdown();
e_desk_shutdown();
e_zone_shutdown();
e_container_shutdown();
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
