gboolean ob_sm_use = TRUE;
gchar *ob_sm_id = NULL;
gchar *ob_sm_save_file = NULL;
+gchar *ob_config_type = NULL;
static ObState state;
static gboolean xsync = FALSE;
static gint exitcode = 0;
static guint remote_control = 0;
static gboolean being_replaced = FALSE;
-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);
config_startup(i);
/* parse/load user options */
- if (parse_load_rc(config_type, &doc, &node)) {
+ if (parse_load_rc(ob_config_type, &doc, &node)) {
parse_tree(i, doc, node->xmlChildrenNode);
parse_close(doc);
} else
g_message(_("Unable to find a valid config file, using some simple defaults"));
- if (config_type != NULL)
+ if (ob_config_type != NULL)
PROP_SETS(RootWindow(ob_display, ob_screen),
- ob_config, config_type);
+ ob_config, ob_config_type);
/* we're done with parsing now, kill it */
parse_shutdown(i);
}
/* we also remove some environment variables, so put them back */
- if (config_type)
- setenv("OPENBOX_CONFIG_NAMESPACE", config_type, 1);
+ if (ob_config_type)
+ setenv("OPENBOX_CONFIG_NAMESPACE", ob_config_type, 1);
/* re-run me */
execvp(argv[0], argv); /* try how we were run */
/* free stuff passed in from the command line or environment */
g_free(ob_sm_save_file);
g_free(ob_sm_id);
- g_free(config_type);
+ g_free(ob_config_type);
g_free(program_name);
return exitcode;
unsetenv("DESKTOP_STARTUP_ID");
if (getenv("OPENBOX_CONFIG_NAMESPACE")) {
- config_type = g_strdup(getenv("OPENBOX_CONFIG_NAMESPACE"));
+ ob_config_type = g_strdup(getenv("OPENBOX_CONFIG_NAMESPACE"));
/* don't pass it on except if we restart */
unsetenv("OPENBOX_CONFIG_NAMESPACE");
}
remote_control = 2;
*/
}
+ else if (!strcmp(argv[i], "--config-namespace")) {
+ if (i == *argc - 1) /* no args left */
+ /* not translated cuz it's sekret */
+ g_printerr("--config-namespace requires an argument\n");
+ else {
+ ob_config_type = g_strdup(argv[i+1]);
+ remove_args(argc, argv, i, 2);
+ --i; /* this arg was removed so go back */
+ ob_debug_type(OB_DEBUG_SM, "--config-namespace %s\n",
+ ob_sm_save_file);
+ }
+ }
else if (!strcmp(argv[i], "--sm-save-file")) {
if (i == *argc - 1) /* no args left */
/* not translated cuz it's sekret */