Upstream bug fixes.

Submitted by maintainer Han Boetes <han@mijncomputer.nl>.
This commit is contained in:
naddy 2002-01-30 15:03:48 +00:00
parent aae3c80aae
commit 0a416bbdfe
2 changed files with 37 additions and 0 deletions

View File

@ -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<char> 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

View File

@ -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