Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
session.c
Log Message:
Fix name clash.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- session.c 17 Feb 2005 21:17:21 -0000 1.91
+++ session.c 4 Mar 2005 17:59:27 -0000 1.92
@@ -27,7 +27,7 @@
#include <sys/time.h>
#ifdef USE_EXT_INIT_WIN
-static Window init_win_ext = None;
+static Window new_init_win_ext = None;
#endif
#ifndef DEFAULT_SH_PATH
@@ -340,8 +340,11 @@
const char *e_conf_dir;
const char *ecachedir = "-ecachedir";
const char *e_cache_dir;
+
+#ifdef USE_EXT_INIT_WIN
const char *extinitwin = "-ext_init_win";
char buf[512];
+#endif
char priority = 10;
char style;
int n;
@@ -464,7 +467,7 @@
#ifdef USE_EXT_INIT_WIN
if (restarting)
{
- Esnprintf(buf, sizeof(buf), "%li", init_win_ext);
+ Esnprintf(buf, sizeof(buf), "%li", new_init_win_ext);
restartVal[n].length = strlen(extinitwin);
restartVal[n++].value = (char *)extinitwin;
@@ -873,7 +876,7 @@
SoundPlay("SOUND_WAIT");
#ifdef USE_EXT_INIT_WIN
if (disp)
- init_win_ext = ExtInitWinCreate();
+ new_init_win_ext = ExtInitWinCreate();
#endif
EDisplayClose();
@@ -884,10 +887,11 @@
if (sm_client_id)
l += Esnprintf(s + l, sizeof(s) - l, " -smid %s", sm_client_id);
#endif
- if (init_win_ext != None)
- l +=
- Esnprintf(s + l, sizeof(s) - l, " -ext_init_win %li",
- init_win_ext);
+#ifdef USE_EXT_INIT_WIN
+ if (new_init_win_ext != None)
+ l += Esnprintf(s + l, sizeof(s) - l, " -ext_init_win %li",
+ new_init_win_ext);
+#endif
if (ss)
l += Esnprintf(s + l, sizeof(s) - l, " -t %s", ss);
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
