diff options
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/openbox.c | 28 | ||||
| -rw-r--r-- | openbox/startupnotify.c | 5 |
2 files changed, 20 insertions, 13 deletions
diff --git a/openbox/openbox.c b/openbox/openbox.c index 2de1f7e7..dfcda4b3 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -104,6 +104,7 @@ static gchar *config_type = NULL; static void signal_handler(gint signal, gpointer data); static void remove_args(gint *argc, gchar **argv, gint index, gint num); +static void parse_env(); static void parse_args(gint *argc, gchar **argv); static Cursor load_cursor(const gchar *name, guint fontval); @@ -126,6 +127,8 @@ gint main(gint argc, gchar **argv) /* parse the command line args, which can change the argv[0] */ parse_args(&argc, argv); + /* parse the environment variables */ + parse_env(); program_name = g_path_get_basename(argv[0]); g_set_prgname(program_name); @@ -405,6 +408,10 @@ gint main(gint argc, gchar **argv) argv = nargv; } + /* we also remove some environment variables, so put them back */ + if (config_type) + setenv("OPENBOX_CONFIG_NAMESPACE", config_type, 1); + /* re-run me */ execvp(argv[0], argv); /* try how we were run */ execlp(argv[0], program_name, (gchar*)NULL); /* last resort */ @@ -461,7 +468,6 @@ static void print_help() g_print(_(" --version Display the version and exit\n")); g_print(_(" --replace Replace the currently running window manager\n")); g_print(_(" --sm-disable Disable connection to the session manager\n")); - g_print(_(" --config TYPE Specify the configuration profile to use\n")); g_print(_("\nPassing messages to a running Openbox instance:\n")); g_print(_(" --reconfigure Reload Openbox's configuration\n")); g_print(_("\nDebugging options:\n")); @@ -482,6 +488,18 @@ static void remove_args(gint *argc, gchar **argv, gint index, gint num) *argc -= num; } +static void parse_env() +{ + /* unset this so we don't pass it on unknowingly */ + unsetenv("DESKTOP_STARTUP_ID"); + + if (getenv("OPENBOX_CONFIG_NAMESPACE")) { + config_type = g_strdup(getenv("OPENBOX_CONFIG_NAMESPACE")); + /* don't pass it on except if we restart */ + unsetenv("OPENBOX_CONFIG_NAMESPACE"); + } +} + static void parse_args(gint *argc, gchar **argv) { gint i; @@ -524,14 +542,6 @@ static void parse_args(gint *argc, gchar **argv) remote_control = 2; */ } - else if (!strcmp(argv[i], "--config")) { - if (i == *argc - 1) /* no args left */ - g_printerr(_("--config requires an argument\n")); - else { - config_type = g_strdup(argv[i+1]); - ++i; - } - } else if (!strcmp(argv[i], "--sm-save-file")) { if (i == *argc - 1) /* no args left */ /* not translated cuz it's sekret */ diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c index 03cb752b..45a2b4c2 100644 --- a/openbox/startupnotify.c +++ b/openbox/startupnotify.c @@ -24,10 +24,7 @@ #ifndef USE_LIBSN -void sn_startup(gboolean reconfig) { - /* unset this so we don't pass it on unknowingly */ - if (!reconfig) unsetenv("DESKTOP_STARTUP_ID"); -} +void sn_startup(gboolean reconfig) {} void sn_shutdown(gboolean reconfig) {} gboolean sn_app_starting() { return FALSE; } Time sn_app_started(const gchar *id, const gchar *wmclass) |