Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
session.c
Log Message:
Don't set -display on command line when restarting WM (use the one in the environment)
(inspired by patch from Laurence J. Lane <[EMAIL PROTECTED]>).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- session.c 8 Nov 2003 10:54:04 -0000 1.43
+++ session.c 15 Nov 2003 21:44:13 -0000 1.44
@@ -550,16 +550,16 @@
{
Esnprintf(sss, sizeof(sss),
"exec %s -single -ext_init_win %i -theme %s "
- "-econfdir %s -ecachedir %s -display %s", command,
- w, themename, UserEDir(), UserCacheDir(), dstr);
+ "-econfdir %s -ecachedir %s", command,
+ w, themename, UserEDir(), UserCacheDir());
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", sss, NULL);
}
else
{
Esnprintf(sss, sizeof(sss),
"exec %s -single -ext_init_win %i "
- "-econfdir %s -ecachedir %s -display %s", command,
- w, UserEDir(), UserCacheDir(), dstr);
+ "-econfdir %s -ecachedir %s", command,
+ w, UserEDir(), UserCacheDir());
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", sss, NULL);
}
}
@@ -574,8 +574,8 @@
sscanf(params, "%*s %1000s", s);
Esnprintf(sss, sizeof(sss),
"exec %s -single -ext_init_win %i -theme %s "
- "-econfdir %s -ecachedir %s -display %s", command, w, s,
- UserEDir(), UserCacheDir(), dstr);
+ "-econfdir %s -ecachedir %s", command, w, s,
+ UserEDir(), UserCacheDir());
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", sss, NULL);
}
else if (!strcmp(s, "restart_wm"))
@@ -589,8 +589,8 @@
strncpy(s, atword(params, 2), 1000);
real_exec = (char *)Emalloc(strlen(s) + 6);
sprintf(real_exec,
- "exec %s " "-econfdir %s -ecachedir %s -display %s", s,
- UserEDir(), UserCacheDir(), dstr);
+ "exec %s " "-econfdir %s -ecachedir %s", s,
+ UserEDir(), UserCacheDir());
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", "exec", real_exec,
NULL);
}
@@ -1181,7 +1181,7 @@
AUDIO_PLAY("SOUND_WAIT");
XCloseDisplay(disp);
disp = NULL;
- Esnprintf(s, sizeof(s), "exec %s -display %s", atword(params, 2), dstr);
+ Esnprintf(s, sizeof(s), "exec %s", atword(params, 2));
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", s, NULL);
}
else if (!strcmp(s, "restart"))
@@ -1201,15 +1201,15 @@
Esnprintf(s, sizeof(s),
"exec %s -single -ext_init_win %i -theme %s "
"-econfdir %s -ecachedir %s "
- "-smfile %s -smid %s -display %s", command,
+ "-smfile %s -smid %s", command,
init_win_ext, themename, UserEDir(), UserCacheDir(),
- sm_file, sm_client_id, dstr);
+ sm_file, sm_client_id);
else
Esnprintf(s, sizeof(s),
"exec %s -single -ext_init_win %i -theme %s "
"-econfdir %s -ecachedir %s "
- "-smfile %s -display %s", command, init_win_ext,
- themename, UserEDir(), UserCacheDir(), sm_file, dstr);
+ "-smfile %s", command, init_win_ext,
+ themename, UserEDir(), UserCacheDir(), sm_file);
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", s, NULL);
}
else
@@ -1218,15 +1218,15 @@
Esnprintf(s, sizeof(s),
"exec %s -single -ext_init_win %i "
"-econfdir %s -ecachedir %s "
- "-smfile %s -smid %s -display %s", command,
+ "-smfile %s -smid %s", command,
init_win_ext, UserEDir(), UserCacheDir(), sm_file,
- sm_client_id, dstr);
+ sm_client_id);
else
Esnprintf(s, sizeof(s),
"exec %s -single -ext_init_win %i"
"-econfdir %s -ecachedir %s "
- "-smfile %s -display %s", command, init_win_ext,
- UserEDir(), UserCacheDir(), sm_file, dstr);
+ "-smfile %s", command, init_win_ext,
+ UserEDir(), UserCacheDir(), sm_file);
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", s, NULL);
}
}
@@ -1248,15 +1248,15 @@
Esnprintf(s, sizeof(s),
"exec %s -single -ext_init_win %i -theme %s "
"-econfdir %s -ecachedir %s "
- "-smfile %s -smid %s -display %s", command, init_win_ext,
+ "-smfile %s -smid %s", command, init_win_ext,
userthemepath, UserEDir(), UserCacheDir(), sm_file,
- sm_client_id, dstr);
+ sm_client_id);
else
Esnprintf(s, sizeof(s),
"exec %s -ext_init_win %i -theme %s "
"-econfdir %s -ecachedir %s "
- "-smfile %s -single -display %s", command, init_win_ext,
- userthemepath, UserEDir(), UserCacheDir(), sm_file, dstr);
+ "-smfile %s -single", command, init_win_ext,
+ userthemepath, UserEDir(), UserCacheDir(), sm_file);
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", s, NULL);
}
else if (!strcmp((char *)s, "error"))
-------------------------------------------------------
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
