From 0a416bbdfe1ef9e2e4b610c6f7e242c7d3a7816e Mon Sep 17 00:00:00 2001 From: naddy Date: Wed, 30 Jan 2002 15:03:48 +0000 Subject: [PATCH] Upstream bug fixes. Submitted by maintainer Han Boetes . --- x11/fluxbox/patches/patch-src_StringUtil_cc | 12 ++++++++++ x11/fluxbox/patches/patch-src_Window_cc | 25 +++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 x11/fluxbox/patches/patch-src_StringUtil_cc create mode 100644 x11/fluxbox/patches/patch-src_Window_cc diff --git a/x11/fluxbox/patches/patch-src_StringUtil_cc b/x11/fluxbox/patches/patch-src_StringUtil_cc new file mode 100644 index 00000000000..f51b38d524a --- /dev/null +++ b/x11/fluxbox/patches/patch-src_StringUtil_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_StringUtil_cc,v 1.1 2002/01/30 15:03:48 naddy Exp $ +--- src/StringUtil.cc.orig Wed Jan 9 15:11:20 2002 ++++ src/StringUtil.cc Wed Jan 30 06:54:54 2002 +@@ -67,7 +67,7 @@ char *StringUtil::expandFilename(const c + + auto_ptr retval( new char[strlen(filename)+strlen(getenv("HOME"))+2]); + if (filename[0]=='~') { +- strcat(retval.get(), getenv("HOME")); ++ strcpy(retval.get(), getenv("HOME")); + strcat(retval.get(), &filename[1]); + } else + return StringUtil::strdup(filename); //return unmodified value diff --git a/x11/fluxbox/patches/patch-src_Window_cc b/x11/fluxbox/patches/patch-src_Window_cc new file mode 100644 index 00000000000..46fbaeabbb6 --- /dev/null +++ b/x11/fluxbox/patches/patch-src_Window_cc @@ -0,0 +1,25 @@ +$OpenBSD: patch-src_Window_cc,v 1.1 2002/01/30 15:03:48 naddy Exp $ +--- src/Window.cc.orig Fri Jan 11 13:21:59 2002 ++++ src/Window.cc Wed Jan 30 06:54:54 2002 +@@ -441,7 +441,9 @@ FluxboxWindow::FluxboxWindow(Window w, B + + FluxboxWindow::~FluxboxWindow(void) { + Fluxbox *fluxbox = Fluxbox::instance(); +- ++ //TODO: Move this to Workspace::removeWindow ++ if (client.transient_for) ++ fluxbox->setFocusedWindow(client.transient_for); + + if (moving || resizing) { + screen->hideGeometry(); +@@ -556,9 +558,7 @@ FluxboxWindow::~FluxboxWindow(void) { + fluxbox->removeWindowSearch(client.window); + screen->removeNetizen(client.window); + } +- //TODO: Move this to Workspace::removeWindow +- if (client.transient_for) +- fluxbox->setFocusedWindow(client.transient_for); ++ + #ifdef DEBUG + fprintf(stderr, "%s(%d): ~FluxboxWindow(this=%p) done\n", __FILE__, __LINE__, this); + #endif