aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Kinnunen <fluxgen@fluxbox.org>2008-09-18 20:31:00 (GMT)
committerHenrik Kinnunen <fluxgen@fluxbox.org>2008-09-18 20:31:00 (GMT)
commitab8b21d18c16d9956b34bbbd7be8858aa048e500 (patch)
tree56c9af54d7d55b5948c6c1e7706775d0399e919e
parent2f4db57898920a3f17eaaa2586a39dad76d5c7e8 (diff)
parentea9f80399b4b0468b1c91acda3b5087b042e1673 (diff)
downloadfluxbox-ab8b21d18c16d9956b34bbbd7be8858aa048e500.zip
fluxbox-ab8b21d18c16d9956b34bbbd7be8858aa048e500.tar.bz2
Merge branch 'master' of fluxbox@git.fluxbox.org:fluxbox
Conflicts: ChangeLog
-rw-r--r--ChangeLog5
-rw-r--r--src/CurrentWindowCmd.cc6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 998ead4..a888269 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.1.2: 2Changes for 1.1.2
3*08/09/18: 3*08/09/18:
4 * Changed workspace count signal in BScreen to use the new signal 4 * Changed workspace count signal in BScreen to use the new signal
5 system. (Henrik) 5 system. (Henrik)
@@ -7,6 +7,9 @@ Changes for 1.1.2:
7 * Added new Signal/Slot system to FbTk (Henrik) 7 * Added new Signal/Slot system to FbTk (Henrik)
8 This is suppose to replace the obsolete Subject/Observer classes. 8 This is suppose to replace the obsolete Subject/Observer classes.
9 FbTk/Signal.hh, FbTk/Slot.hh, FbTk/MemFun.hh, tests/testSignals.cc 9 FbTk/Signal.hh, FbTk/Slot.hh, FbTk/MemFun.hh, tests/testSignals.cc
10 * Fix crash when using SetTitleDialog on a window that's been closed (Mark)
11 CurrentWindowCmd.cc
12-----------------------------
10Changes for 1.1.1 13Changes for 1.1.1
11*08/09/14: 14*08/09/14:
12 * Fixed a minor pixmap resource leak (Henrik) 15 * Fixed a minor pixmap resource leak (Henrik)
diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index 59b0186..dfb5c19 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -467,13 +467,17 @@ void SetLayerCmd::real_execute() {
467} 467}
468 468
469namespace { 469namespace {
470class SetTitleDialog: public TextDialog { 470class SetTitleDialog: public TextDialog, public FbTk::Observer {
471public: 471public:
472 SetTitleDialog(FluxboxWindow &win, const string &title): 472 SetTitleDialog(FluxboxWindow &win, const string &title):
473 TextDialog(win.screen(), title), window(win) { 473 TextDialog(win.screen(), title), window(win) {
474 win.dieSig().attach(this);
474 setText(win.title()); 475 setText(win.title());
475 } 476 }
476 477
478 // only attached signal is window destruction
479 void update(FbTk::Subject *subj) { delete this; }
480
477private: 481private:
478 void exec(const std::string &text) { 482 void exec(const std::string &text) {
479 window.winClient().setTitle(text); 483 window.winClient().setTitle(text);