1 files changed, 14 insertions, 10 deletions

diff --git a/src/WinClient.cc b/src/WinClient.cc
index b8149b2..0eee037 100644
--- a/src/WinClient.cc
+++ b/src/WinClient.cc
@@ -411,6 +411,7 @@ void WinClient::updateBlackboxHints() {
     int format;
     Atom atom_return;
     unsigned long num, len;
+    unsigned char *data;
     FbAtoms *atoms = FbAtoms::instance();
 
     if (m_blackbox_hint) {
@@ -422,19 +423,21 @@ void WinClient::updateBlackboxHints() {
                  PropBlackboxHintsElements, False,
                  atoms->getFluxboxHintsAtom(), &atom_return,
                  &format, &num, &len,
-                 (unsigned char **) &m_blackbox_hint) &&
-        m_blackbox_hint) {
+                 &data) &&
+        data) {
 
         if (num != (unsigned)PropBlackboxHintsElements) {
-            XFree(m_blackbox_hint);
+            XFree(data);
             m_blackbox_hint = 0;
-        }
+        } else
+            m_blackbox_hint = (FluxboxWindow::BlackboxHints *) data;
     }
 }
 
 void WinClient::updateMWMHints() {
     int format;
     Atom atom_return;
+    unsigned char *data;
     unsigned long num = 0, len = 0;
 
     if (m_mwm_hint) {
@@ -447,13 +450,14 @@ void WinClient::updateMWMHints() {
                    PropMwmHintsElements, false,
                    motif_wm_hints, &atom_return,
                    &format, &num, &len,
-                   (unsigned char **) &m_mwm_hint) &&
-          m_mwm_hint)) {
+                   &data) &&
+          data)) {
         if (num != static_cast<unsigned int>(PropMwmHintsElements)) {
             XFree(m_mwm_hint);
             m_mwm_hint = 0;
             return;
         }
+        m_mwm_hint = (MwmHints *) data;
     }
 }
 
@@ -602,12 +606,12 @@ Window WinClient::getGroupLeftWindow() const {
     unsigned long num = 0, len = 0;
     Atom group_left_hint = XInternAtom(display(), "_FLUXBOX_GROUP_LEFT", False);
 
-    Window *data = 0;
+    unsigned char *data = 0;
     if (property(group_left_hint, 0,
                    1, false,
                    XA_WINDOW, &atom_return,
                    &format, &num, &len,
-                   (unsigned char **) &data) &&
+                   &data) &&
         data) {
         if (num != 1) {
             XFree(data);
@@ -638,12 +642,12 @@ bool WinClient::hasGroupLeftWindow() const {
     unsigned long num = 0, len = 0;
     Atom group_left_hint = XInternAtom(display(), "_FLUXBOX_GROUP_LEFT", False);
 
-    Window *data = 0;
+    unsigned char *data = 0;
     if (property(group_left_hint, 0,
                    1, false,
                    XA_WINDOW, &atom_return,
                    &format, &num, &len,
-                   (unsigned char **) &data) &&
+                   &data) &&
         data) {
             XFree(data);
             if (num != 1)