Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
E.h Makefile.am config.c
Added Files:
Tag: branch-exp
config-edb.c
Log Message:
Experimental support for configuration using edb.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314.2.1
retrieving revision 1.314.2.2
diff -u -3 -r1.314.2.1 -r1.314.2.2
--- E.h 26 Jul 2004 21:24:30 -0000 1.314.2.1
+++ E.h 26 Jul 2004 23:07:58 -0000 1.314.2.2
@@ -1788,6 +1788,10 @@
int LoadEConfig(char *themelocation);
void SaveUserControlConfig(FILE * autosavefile);
+/* config-edb.c */
+void ConfigurationLoad(void);
+void ConfigurationSave(void);
+
/* coords.c */
void CoordsShow(EWin * ewin);
void CoordsHide(void);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.43.2.1
diff -u -3 -r1.43 -r1.43.2.1
--- Makefile.am 25 Jul 2004 10:47:56 -0000 1.43
+++ Makefile.am 26 Jul 2004 23:07:59 -0000 1.43.2.1
@@ -28,6 +28,7 @@
comms.c \
conf.h \
config.c \
+ config-edb.c \
coords.c \
cursors.c \
desktops.c \
@@ -88,6 +89,7 @@
LDADD = \
@LIBINTL@ \
+ @edb_libs@ \
$(FNLIB_LIBS) \
$(TTF_LIBS) \
$(ESD_LIBS) \
@@ -100,7 +102,7 @@
$(E_X_LIBS) \
-lX11 -lm
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/intl $(ESD_CFLAGS) $(IMLIB_CFLAGS)
$(X_CFLAGS)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)/intl @edb_cflags@ $(ESD_CFLAGS)
$(IMLIB_CFLAGS) $(X_CFLAGS)
install-data-local:
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.111
retrieving revision 1.111.2.1
diff -u -3 -r1.111 -r1.111.2.1
--- config.c 25 Jul 2004 09:34:43 -0000 1.111
+++ config.c 26 Jul 2004 23:07:59 -0000 1.111.2.1
@@ -3790,6 +3790,9 @@
EDBUG(5, "Dummy-LoadOpenConfigFile");
LoadOpenConfigFile(OpenConfigFileForReading
(GetGenericSMFile(), 0));
+#if ENABLE_EDB /* Override */
+ ConfigurationLoad();
+#endif
SoundInit();
is_autosave = 0;
}
@@ -3826,6 +3829,10 @@
int i, num, flags, j;
int b, r, g;
+#if ENABLE_EDB
+ ConfigurationSave();
+#endif
+
EDBUG(5, "SaveUserControlConfig");
if (autosavefile)
{
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
