Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_includes.h e_main.c
Added Files:
e_shelf.c e_shelf.h
Log Message:
shelves... for holding gadcons. now i have a test shelf ... i can go back to
gadcon
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- Makefile.am 3 Feb 2006 21:58:28 -0000 1.103
+++ Makefile.am 4 Feb 2006 06:45:13 -0000 1.104
@@ -139,7 +139,8 @@
e_widget_textblock.h \
e_apps_error.h \
e_stolen.h \
-e_gadcon.h
+e_gadcon.h \
+e_shelf.h
enlightenment_src = \
e_user.c \
@@ -260,6 +261,7 @@
e_apps_error.c \
e_stolen.c \
e_gadcon.c \
+e_shelf.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- e_includes.h 3 Feb 2006 21:58:28 -0000 1.85
+++ e_includes.h 4 Feb 2006 06:45:13 -0000 1.86
@@ -118,3 +118,4 @@
#include "e_apps_error.h"
#include "e_stolen.h"
#include "e_gadcon.h"
+#include "e_shelf.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -3 -r1.145 -r1.146
--- e_main.c 23 Jan 2006 15:52:47 -0000 1.145
+++ e_main.c 4 Feb 2006 06:45:13 -0000 1.146
@@ -602,6 +602,20 @@
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_color_class_shutdown);
+ /* setup gadcon */
+ if (!e_gadcon_init())
+ {
+ e_error_message_show(_("Enlightenment cannot set up its gadget control
system."));
+ _e_main_shutdown(-1);
+ }
+ _e_main_shutdown_push(e_gadcon_shutdown);
+ /* setup shelves */
+ if (!e_shelf_init())
+ {
+ e_error_message_show(_("Enlightenment cannot set up its shelf
system."));
+ _e_main_shutdown(-1);
+ }
+ _e_main_shutdown_push(e_shelf_shutdown);
if (ipc_failed)
e_error_dialog_show(_("Enlightenment IPC setup error!"),
@@ -641,6 +655,39 @@
/* run any testing code now we are set up */
e_test();
+ /* FIXME: for testing only */
+ if (0)
+ {
+ Evas_List *l, *l2, *l3, *managers;
+ int snum;
+
+ snum = 0;
+ for (l = e_manager_list(); l; l = l->next)
+ {
+ E_Manager *man;
+
+ man = l->data;
+ for (l2 = man->containers; l2; l2 = l2->next)
+ {
+ E_Container *con;
+
+ con = l2->data;
+ for (l3 = con->zones; l3; l3 = l3->next)
+ {
+ E_Zone *zone;
+ E_Shelf *es;
+ char buf[256];
+
+ zone = l3->data;
+ snprintf(buf, sizeof(buf), "shelf.%i", snum);
+ snum++;
+ es = e_shelf_zone_new(zone, buf);
+ e_shelf_populate(es);
+ }
+ }
+ }
+ }
+
/* no longer starting up */
starting = 0;
/* start our main loop */
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
