Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
main.c misc.c
Log Message:
Do not require dox to be installed.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- main.c 28 Feb 2004 15:14:01 -0000 1.76
+++ main.c 5 Mar 2004 17:05:53 -0000 1.77
@@ -27,17 +27,24 @@
static void
runDocBrowser(void)
{
-
char file[FILEPATH_LEN_MAX];
+ Esnprintf(file, sizeof(file), "%s/dox", EDirBin());
+ if (!canexec(file))
+ return;
+ Esnprintf(file, sizeof(file), "%s/E-docs", EDirRoot());
+ if (!canread(file))
+ return;
+
if (fork())
EDBUG_RETURN_;
Esnprintf(file, sizeof(file), "exec %s/dox %s/E-docs",
EDirBin(), EDirRoot());
+
execl(usershell(getuid()), usershell(getuid()), "-c", (char *)file, NULL);
- exit(0);
+ exit(0);
}
int
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/misc.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- misc.c 28 Feb 2004 15:14:01 -0000 1.43
+++ misc.c 5 Mar 2004 17:05:53 -0000 1.44
@@ -27,13 +27,10 @@
static char *dir = NULL;
static char *cacheDir = NULL;
-static const char *const bins[] = { "dox", "eesh", "epp" };
-static const char *const docs[] =
- { "E-docs/MAIN", "E-docs/Edoc_bg.png", "E-docs/E_logo.png" };
+static const char *const bins[] = { "eesh", "epp" };
static const char *const thms[] = { "themes/DEFAULT/epplets/epplets.cfg" };
#define N_BINS (sizeof(bins)/sizeof(char*))
-#define N_DOCS (sizeof(docs)/sizeof(char*))
#define N_THMS (sizeof(thms)/sizeof(char*))
void
@@ -72,25 +69,6 @@
}
}
- for (i = 0; i < N_DOCS; i++)
- {
- Esnprintf(s, sizeof(s), "%s/%s", EDirRoot(), docs[i]);
- if (!exists(s))
- {
- Alert(_
- ("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n" "\n"
- "Enlightenment's documentation is not present or correctly
installed\n"
- "\n"
- "This is a fatal error and Enlightenment will cease to run.\n"
- "Please rectify this situation and ensure it is installed\n"
- "correctly.\n" "\n"
- "The reason this could be missing is due to badly created\n"
- "packages, someone manually deleting those files or perhaps\n"
- "an error in installing Enlightenment.\n"));
- EExit(NULL);
- }
- }
-
for (i = 0; i < N_THMS; i++)
{
Esnprintf(s, sizeof(s), "%s/%s", EDirRoot(), thms[i]);
-------------------------------------------------------
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
