1 files changed, 21 insertions, 10 deletions

diff --git a/src/WinClient.cc b/src/WinClient.cc
index 68e5600..0295481 100644
--- a/src/WinClient.cc
+++ b/src/WinClient.cc
@@ -29,7 +29,7 @@
 
 #include "Xutil.hh"
 
-#include "EventManager.hh"
+#include "FbTk/EventManager.hh"
 #include "FbTk/MultLayers.hh"
 
 #include <iostream>
@@ -358,12 +358,20 @@ void WinClient::updateTitle() {
     titleSig().notify();
 }
 
-void WinClient::setTitle(FbTk::FbString &title) {
+void WinClient::setTitle(const FbTk::FbString &title) {
     m_title = title;
     m_title_override = true;
     titleSig().notify();
 }
 
+void WinClient::setIcon(const FbTk::PixmapWithMask& pm) {
+
+    m_icon.pixmap().copy(pm.pixmap());
+    m_icon.mask().copy(pm.mask());
+    m_icon_override = true;
+    titleSig().notify();
+}
+
 void WinClient::saveBlackboxAttribs(FluxboxWindow::BlackboxAttributes &blackbox_attribs, int nelements) {
     changeProperty(FbAtoms::instance()->getFluxboxAttributesAtom(),
                    XA_CARDINAL, 32, PropModeReplace,
@@ -429,15 +437,18 @@ void WinClient::updateWMHints() {
         if (wmhint->flags & WindowGroupHint && !window_group)
             window_group = wmhint->window_group;
 
-        if ((bool)(wmhint->flags & IconPixmapHint) && wmhint->icon_pixmap != 0)
-            m_icon.pixmap().copy(wmhint->icon_pixmap, 0, 0);
-        else
-            m_icon.pixmap().release();
+        if (! m_icon_override) {
 
-        if ((bool)(wmhint->flags & IconMaskHint) && wmhint->icon_mask != 0)
-            m_icon.mask().copy(wmhint->icon_mask, 0, 0);
-        else
-            m_icon.mask().release();
+            if ((bool)(wmhint->flags & IconPixmapHint) && wmhint->icon_pixmap != 0)
+                m_icon.pixmap().copy(wmhint->icon_pixmap, 0, 0);
+            else
+                m_icon.pixmap().release();
+
+            if ((bool)(wmhint->flags & IconMaskHint) && wmhint->icon_mask != 0)
+                m_icon.mask().copy(wmhint->icon_mask, 0, 0);
+            else
+                m_icon.mask().release();
+        }
 
         if (fbwindow()) {
             if (wmhint->flags & XUrgencyHint) {