make the mainloop not depend on an X display, and make it uses the obt_display automa...

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 2cab7e27e6b1b91639d7a8891e1bcfb49b1557e8..8aefd76adcee0b9d26939eb41a9a23f9fc7cc427 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -135,11 +135,8 @@ gint main(gint argc, gchar **argv)
     program_name = g_path_get_basename(argv[0]);
     g_set_prgname(program_name);
 
-    if (!remote_control) {
-        parse_paths_startup();
-
+    if (!remote_control)
         session_startup(argc, argv);
-    }
 
     if (!obt_display_open(NULL))
         ob_exit_with_error(_("Failed to open the display from the DISPLAY environment variable."));
@@ -154,7 +151,7 @@ gint main(gint argc, gchar **argv)
         exit(EXIT_SUCCESS);
     }
 
-    ob_main_loop = obt_main_loop_new(obt_display);
+    ob_main_loop = obt_main_loop_new();
 
     /* set up signal handler */
     obt_main_loop_signal_add(ob_main_loop, SIGUSR1, signal_handler, NULL,NULL);
@@ -230,7 +227,7 @@ gint main(gint argc, gchar **argv)
                 if (obt_parse_load_config_file(i, "openbox", "rc.xml",
                                                "openbox_config"))
                 {
-                    obt_parse_tree(i, obt_parse_instance_root(i)->children);
+                    obt_parse_tree_from_root(i);
                     obt_parse_close(i);
                 } else
                     g_message(_("Unable to find a valid config file, using some simple defaults"));
@@ -371,8 +368,6 @@ gint main(gint argc, gchar **argv)
 
     obt_display_close(obt_display);
 
-    parse_paths_shutdown();
-
     if (restart) {
         if (restart_path != NULL) {
             gint argcp;