X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=78b5322373021c7e6267be94059a133c15089dda;hb=382d37553d9dc7679464cf71aecf8590cc06a2cb;hp=303f809b4c677fd684314ab96ee1f9a4b22320ee;hpb=53e75c5be435b8af86ba2de3dedb59ad4f74e6d9;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 303f809b..78b53223 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);
@@ -213,7 +212,7 @@ gint main(gint argc, gchar **argv)
     prop_startup(); /* get atoms values for the display */
     extensions_query_all(); /* find which extensions are present */
 
-    if (screen_annex(program_name)) { /* it will be ours! */
+    if (screen_annex()) { /* it will be ours! */
         do {
             modkeys_startup(reconfigure);
 
@@ -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)