put openbox saved sessions in CACHE_HOME not DATA_HOME. more correct! i think.

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 8aefd76adcee0b9d26939eb41a9a23f9fc7cc427..6a58cca6e5b667825dfd43c51fc25ef0aa5930f7 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -40,7 +40,6 @@
 #include "group.h"
 #include "config.h"
 #include "ping.h"
-#include "mainloop.h"
 #include "gettext.h"
 #include "render/render.h"
 #include "render/theme.h"
@@ -145,7 +144,7 @@ gint main(gint argc, gchar **argv)
         /* Send client message telling the OB process to:
          * remote_control = 1 -> reconfigure
          * remote_control = 2 -> restart */
-        OBT_PROP_MSG(ob_screen, RootWindow(obt_display, ob_screen),
+        OBT_PROP_MSG(ob_screen, obt_root(ob_screen),
                      OB_CONTROL, remote_control, 0, 0, 0, 0);
         obt_display_close(obt_display);
         exit(EXIT_SUCCESS);
@@ -234,8 +233,7 @@ gint main(gint argc, gchar **argv)
 
 /*
                 if (config_type != NULL)
-                    PROP_SETS(RootWindow(obt_display, ob_screen),
-                              ob_config, config_type);
+                    PROP_SETS(obt_root(ob_screen), ob_config, config_type);
 */
 
                 /* we're done with parsing now, kill it */
@@ -258,7 +256,7 @@ gint main(gint argc, gchar **argv)
                 if (ob_rr_theme == NULL)
                     ob_exit_with_error(_("Unable to load a theme."));
 
-                OBT_PROP_SETS(RootWindow(obt_display, ob_screen),
+                OBT_PROP_SETS(obt_root(ob_screen),
                               OB_THEME, utf8, ob_rr_theme->name);
             }
 
@@ -301,10 +299,9 @@ gint main(gint argc, gchar **argv)
                 focus_nothing();
 
                 /* focus what was focused if a wm was already running */
-                if (OBT_PROP_GET32(RootWindow(obt_display, ob_screen),
+                if (OBT_PROP_GET32(obt_root(ob_screen),
                                    NET_ACTIVE_WINDOW, WINDOW, &xid) &&
-                    (w = g_hash_table_lookup(window_map, &xid)) &&
-                    WINDOW_IS_CLIENT(w))
+                    (w = window_find(xid)) && WINDOW_IS_CLIENT(w))
                 {
                     client_focus(WINDOW_AS_CLIENT(w));
                 }