temprary fix for the memleaks in ::load() and ::set* when using ostrstreams. Need...

[chaz/openbox] / util / bsetroot.cc

diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index f0912cab39e0510dc0e59880194d80da33d9bfa6..db789612518eed82372b88779d0ca45e8af86662 100644 (file)
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -26,7 +26,7 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
 
   img_ctrl = new BImageControl*[getNumberOfScreens()];
   for (; i < getNumberOfScreens(); i++)
-    img_ctrl[i] = new BImageControl(this, getScreenInfo(i), True);
+    img_ctrl[i] = new BImageControl(*this, *getScreenInfo(i), True);
 
   for (i = 1; i < argc; i++) {
     if (! strcmp("-help", argv[i])) {
@@ -220,8 +220,8 @@ void bsetroot::gradient(void) {
       texture.getColorTo()->setPixel(BlackPixel(getXDisplay(), screen));
 
     pixmaps[screen] =
-      img_ctrl[screen]->renderImage(getScreenInfo(screen)->getWidth(),
-                                    getScreenInfo(screen)->getHeight(),
+      img_ctrl[screen]->renderImage(getScreenInfo(screen)->size().w(),
+                                    getScreenInfo(screen)->size().h(),
                                     &texture);
 
     XSetWindowBackgroundPixmap(getXDisplay(),