enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

make e_start run dbus-launch - if that fails, fall back. 

SVN revision: 37433
This commit is contained in:
Carsten Haitzler 2008-11-03 07:34:44 +00:00
parent 8835aeb316
commit 7c13349808
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/e_start_main.c
View File

@ -388,14 +388,27 @@ main(int argc, char **argv)
precache();
}
done:
/* try dbus-launch */
snprintf(buf, sizeof(buf), "%s/bin/enlightenment", _prefix_path);
args = alloca((argc + 1) * sizeof(char *));
args = alloca((argc + 3) * sizeof(char *));
if (!getenv("DBUS_SESSION_BUS_ADDRESS"))
{
args[0] = "dbus-launch";
args[1] = "--exit-with-session";
args[2] = buf;
for (i = 1; i < argc; i++) args[2 + i] = argv[i];
args[2 + i] = NULL;
execvp("dbus-launch", args);
}
/* dbus-launch failed - run e direct */
args[0] = "enlightenment";
for (i = 1; i < argc; i++) args[i] = argv[i];
args[i] = NULL;
snprintf(buf, sizeof(buf), "%s/bin/enlightenment", _prefix_path);
execv(buf, args);
printf("FAILED TO RUN:\n");
printf(" %s\n", buf);
perror("execv");