make session management optional

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 85bf036d44b488f13a62e3fb659721507bffe07b..a1bf55fada21c71a28d822aa348848a32e41b594 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -11,7 +11,7 @@
 #include "focus.h"
 #include "dispatch.h"
 #include "extensions.h"
-#include "../render/render.h"
+#include "render/render.h"
 
 #ifdef USE_LIBSN
 #  define SN_API_NOT_YET_FROZEN
@@ -484,17 +484,17 @@ void screen_install_colormap(Client *client, gboolean install)
 
     if (client == NULL) {
        if (install)
-           XInstallColormap(ob_display, render_colormap);
+           XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
        else
-           XUninstallColormap(ob_display, render_colormap);
+           XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
     } else {
        if (XGetWindowAttributes(ob_display, client->window, &wa) &&
             wa.colormap != None) {
             xerror_set_ignore(TRUE);
            if (install)
-               XInstallColormap(ob_display, wa.colormap);
+               XInstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
            else
-               XUninstallColormap(ob_display, wa.colormap);
+               XUninstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
             xerror_set_ignore(FALSE);
        }
     }