aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2006-06-19 18:31:36 (GMT)
committerfluxgen <fluxgen>2006-06-19 18:31:36 (GMT)
commit20cb065cf32eff75dc4142aef56f63aba959b8ce (patch)
treea253f7d2df9eeca583ac7afc2ef2ce155035410c
parentdd2e6c62b178e9ec5933c5b9246ddb5e6f990cd1 (diff)
downloadfluxbox-20cb065cf32eff75dc4142aef56f63aba959b8ce.zip
fluxbox-20cb065cf32eff75dc4142aef56f63aba959b8ce.tar.bz2
better fix for iconbar bug
-rw-r--r--src/Ewmh.cc7
-rw-r--r--src/WinClient.cc1
2 files changed, 7 insertions, 1 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index b80c4cf..502c92c 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -220,6 +220,9 @@ void Ewmh::setupClient(WinClient &winclient) {
220 if (!newtitle.empty()) { 220 if (!newtitle.empty()) {
221 winclient.setIconTitle(newtitle); 221 winclient.setIconTitle(newtitle);
222 } 222 }
223
224 if ( winclient.fbwindow() )
225 winclient.fbwindow()->titleSig().notify();
223} 226}
224 227
225void Ewmh::setupFrame(FluxboxWindow &win) { 228void Ewmh::setupFrame(FluxboxWindow &win) {
@@ -913,11 +916,15 @@ bool Ewmh::propertyNotify(WinClient &winclient, Atom the_property) {
913 FbTk::FbString newtitle = winclient.textProperty(the_property); 916 FbTk::FbString newtitle = winclient.textProperty(the_property);
914 if (!newtitle.empty()) 917 if (!newtitle.empty())
915 winclient.setTitle(newtitle); 918 winclient.setTitle(newtitle);
919 if (winclient.fbwindow())
920 winclient.fbwindow()->titleSig().notify();
916 return true; 921 return true;
917 } else if (the_property == m_net_wm_icon_name) { 922 } else if (the_property == m_net_wm_icon_name) {
918 FbTk::FbString newtitle = winclient.textProperty(the_property); 923 FbTk::FbString newtitle = winclient.textProperty(the_property);
919 if (!newtitle.empty()) 924 if (!newtitle.empty())
920 winclient.setIconTitle(newtitle); 925 winclient.setIconTitle(newtitle);
926 if (winclient.fbwindow())
927 winclient.fbwindow()->titleSig().notify();
921 return true; 928 return true;
922 } 929 }
923 930
diff --git a/src/WinClient.cc b/src/WinClient.cc
index 9317c81..acb8250 100644
--- a/src/WinClient.cc
+++ b/src/WinClient.cc
@@ -355,7 +355,6 @@ void WinClient::setTitle(FbTk::FbString &title) {
355 m_title_override = true; 355 m_title_override = true;
356 if (m_win) 356 if (m_win)
357 m_win->updateTitleFromClient(*this); 357 m_win->updateTitleFromClient(*this);
358 m_title_override = false;
359} 358}
360 359
361void WinClient::setIconTitle(FbTk::FbString &icon_title) { 360void WinClient::setIconTitle(FbTk::FbString &icon_title) {