summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-10-04 06:09:11 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-10-04 06:09:11 (GMT)
commitb265d0d8703cf38e526bc60229cd51eabab27f0f (patch)
tree4c01796b976930ae7219033927c60b80818531d6
parent22f3df9aa81efc071cb13d43a372ead97548eebc (diff)
downloadfluxbox_lack-b265d0d8703cf38e526bc60229cd51eabab27f0f.zip
fluxbox_lack-b265d0d8703cf38e526bc60229cd51eabab27f0f.tar.bz2
fix CustomMenu and ClientMenu commands from fluxbox-remote
-rw-r--r--ChangeLog2
-rw-r--r--src/Screen.cc3
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0214d31..72c45f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.1.2 2Changes for 1.1.2
3*08/10/04: 3*08/10/04:
4 * Fix CustomMenu and ClientMenu commands from fluxbox-remote (Mark)
5 Screen.cc
4 * Break emacs-style keychains after one invalid key has been pressed (Mark) 6 * Break emacs-style keychains after one invalid key has been pressed (Mark)
5 Screen.cc Keys.cc/hh 7 Screen.cc Keys.cc/hh
6 * Fix flickering of shaped windows, #2131548 and #2001027 (Mark) 8 * Fix flickering of shaped windows, #2131548 and #2001027 (Mark)
diff --git a/src/Screen.cc b/src/Screen.cc
index 49b631d..96ede24 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -841,7 +841,8 @@ void BScreen::propertyNotify(Atom atom) {
841 &ret_bytes_after, (unsigned char **)&str); 841 &ret_bytes_after, (unsigned char **)&str);
842 } 842 }
843 843
844 FbTk::RefCount<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(str, false)); 844 static std::auto_ptr<FbTk::Command<void> > cmd(0);
845 cmd.reset(FbTk::CommandParser<void>::instance().parse(str, false));
845 if (cmd.get()) 846 if (cmd.get())
846 cmd->execute(); 847 cmd->execute();
847 XFree(str); 848 XFree(str);