fixed auto_ptr assignment

2 files changed, 9 insertions, 6 deletions

diff --git a/src/Window.cc b/src/Window.cc
index 7401358..8f6e8d6 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.93 2002/10/23 17:31:23 fluxgen Exp $
+// $Id: Window.cc,v 1.94 2002/10/23 21:59:37 fluxgen Exp $
 
 #include "Window.hh"
 
@@ -299,8 +299,10 @@ tab(0) {
         
         XMapSubwindows(display, frame.window);
 
-        if (decorations.menu)
-                m_windowmenu = std::auto_ptr<Windowmenu>(new Windowmenu(*this));
+        if (decorations.menu) {
+                std::auto_ptr<Windowmenu> tmp(new Windowmenu(*this));
+                m_windowmenu = tmp;
+        }
 
         if (workspace_number < 0 || workspace_number >= screen->getCount())
                 screen->getCurrentWorkspace()->addWindow(this, place_window);
@@ -435,7 +437,7 @@ FluxboxWindow::~FluxboxWindow() {
 }
 
 bool FluxboxWindow::isGroupable() const {
-        if (isResizable() && isMaximizable() && ! isTransient())
+        if (isResizable() && isMaximizable() && !isTransient())
                 return true;
         return false;
 }
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index b219115..c8df4d9 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: fluxbox.cc,v 1.78 2002/10/16 20:02:00 fluxgen Exp $
+// $Id: fluxbox.cc,v 1.79 2002/10/23 22:00:46 fluxgen Exp $
 
 
 #include "fluxbox.hh"
@@ -425,7 +425,8 @@ key(0)
         timer.fireOnce(True);
 
         //create keybindings handler and load keys file 
-        key = auto_ptr<Keys>(new Keys(getXDisplay(), StringUtil::expandFilename(*m_rc_keyfile).c_str()));
+        auto_ptr<Keys> tmp(new Keys(getXDisplay(), StringUtil::expandFilename(*m_rc_keyfile).c_str()));
+        key = tmp;
 
         ungrab();
 }