diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-05-14 21:32:12 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-05-14 21:32:12 +0000 |
| commit | f58ece609523b5cc4c825c4af185e5a6fdd00210 (patch) | |
| tree | 595503641d8d4865d501f5bd7bc10e20c92507e7 /openbox | |
| parent | b906db3e11c06997261297cdb1992fd1b05738ff (diff) | |
remove config namespaces
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/openbox.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/openbox/openbox.c b/openbox/openbox.c index 303f809b..ee3911d9 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -101,7 +101,6 @@ static KeyCode keys[OB_NUM_KEYS]; 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); @@ -238,15 +237,17 @@ gint main(gint argc, gchar **argv) config_startup(i); /* parse/load user options */ - if (parse_load_rc(config_type, &doc, &node)) { + if (parse_load_rc(NULL, &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) PROP_SETS(RootWindow(ob_display, ob_screen), ob_config, config_type); +*/ /* we're done with parsing now, kill it */ parse_shutdown(i); @@ -489,8 +490,6 @@ static void parse_env() { /* unset this so we don't pass it on unknowingly */ unsetenv("DESKTOP_STARTUP_ID"); - - config_type = getenv("OPENBOX_CONFIG_NAMESPACE"); } static void parse_args(gint *argc, gchar **argv) |