Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        E.h globals.c main.c setup.c 


Log Message:
Shuffled around some startup/debug stuff.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -3 -r1.218 -r1.219
--- E.h 7 Mar 2004 08:14:24 -0000       1.218
+++ E.h 9 Mar 2004 19:07:05 -0000       1.219
@@ -238,7 +238,6 @@
 
 #ifdef DEBUG
 extern int          call_level;
-extern int          debug_level;
 extern char        *call_stack[1024];
 
 #endif
@@ -1262,6 +1261,7 @@
 /* State parameters */
 typedef struct
 {
+   int                 debug;
    int                 mode;
    char                place;
    char                flipp;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/globals.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- globals.c   13 Feb 2004 18:36:51 -0000      1.30
+++ globals.c   9 Mar 2004 19:07:05 -0000       1.31
@@ -69,6 +69,5 @@
 
 #ifdef DEBUG
 int                 call_level;
-int                 debug_level;
 char               *call_stack[1024];
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- main.c      5 Mar 2004 17:05:53 -0000       1.77
+++ main.c      9 Mar 2004 19:07:05 -0000       1.78
@@ -60,6 +60,11 @@
     * proceeds into the primary event loop at the end.
     */
 
+   /* Init state variable struct */
+   memset(&mode, 0, sizeof(EMode));
+   mode.mode = MODE_NONE;
+   mode.startup = 1;
+
    single_screen_mode = 0;
 /*  unsetenv("LD_PRELOAD"); */
 
@@ -73,11 +78,10 @@
 
 #ifdef DEBUG
    call_level = 0;
-   debug_level = 0;
+#endif
    str = getenv("EDBUG");
    if (str)
-      debug_level = atoi(str);
-#endif
+      mode.debug = atoi(str);
    str = getenv("EDBUG_FLAGS");
    if (str)
       EventDebugInit(str);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- setup.c     28 Feb 2004 15:14:01 -0000      1.113
+++ setup.c     9 Mar 2004 19:07:05 -0000       1.114
@@ -346,11 +346,6 @@
         XFreeModifiermap(mod);
    }
 
-   /* Init state variable struct */
-   memset(&mode, 0, sizeof(EMode));
-   mode.mode = MODE_NONE;
-   mode.startup = 1;
-
    /* Now we're going to set a bunch of default settings in E - in case we
     * don't ever get to load a config file for some odd reason. */
    memset(&conf, 0, sizeof(EConf));




-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to