}
}
- reconfigure = FALSE;
-
ob_set_state(OB_STATE_RUNNING);
- if (startup_cmd) run_startup_cmd();
+ if (!reconfigure && startup_cmd) run_startup_cmd();
+
+ reconfigure = FALSE;
/* look for parsing errors */
{
{
g_print("Openbox %s\n", PACKAGE_VERSION);
g_print(_("Copyright (c)"));
- g_print(" 2008 Mikael Magnusson\n");
+ g_print(" 2004 Mikael Magnusson\n");
g_print(_("Copyright (c)"));
- g_print(" 2003-2006 Dana Jansens\n\n");
+ g_print(" 2002 Dana Jansens\n\n");
g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
g_print("This is free software, and you are welcome to redistribute it\n");
g_print("under certain conditions. See the file COPYING for details.\n\n");
G_SPAWN_SEARCH_PATH |
G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, NULL, &e);
- if (!g_shell_parse_argv(startup_cmd, NULL, &argv, &e)) {
+ if (!ok) {
g_message("Error launching startup command: %s",
e->message);
g_error_free(e);
}
else if (!strcmp(argv[i], "--startup")) {
if (i == *argc - 1) /* no args left */
- g_printerr(_("--startup requires an argument\n"));
+ g_printerr(_("%s requires an argument\n"), "--startup");
else {
/* this will be in the current locale encoding, which is
what we want */
}
else if (!strcmp(argv[i], "--config-file")) {
if (i == *argc - 1) /* no args left */
- g_printerr(_("--config-file requires an argument\n"));
+ g_printerr(_("%s requires an argument\n"), "--config-file");
else {
/* this will be in the current locale encoding, which is
what we want */