summaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 43d0517..5aebad4 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2207,12 +2207,11 @@ bool FluxboxWindow::getState() {
2207 Atom atom_return; 2207 Atom atom_return;
2208 bool ret = false; 2208 bool ret = false;
2209 int foo; 2209 int foo;
2210 unsigned char *state; 2210 unsigned long *state, ulfoo, nitems;
2211 unsigned long ulfoo, nitems;
2212 if (!m_client->property(FbAtoms::instance()->getWMStateAtom(), 2211 if (!m_client->property(FbAtoms::instance()->getWMStateAtom(),
2213 0l, 2l, false, FbAtoms::instance()->getWMStateAtom(), 2212 0l, 2l, false, FbAtoms::instance()->getWMStateAtom(),
2214 &atom_return, &foo, &nitems, &ulfoo, 2213 &atom_return, &foo, &nitems, &ulfoo,
2215 &state) || !state) 2214 (unsigned char **) &state) || !state)
2216 return false; 2215 return false;
2217 2216
2218 if (nitems >= 1) { 2217 if (nitems >= 1) {
@@ -2240,20 +2239,18 @@ void FluxboxWindow::restoreAttributes() {
2240 Atom atom_return; 2239 Atom atom_return;
2241 int foo; 2240 int foo;
2242 unsigned long ulfoo, nitems; 2241 unsigned long ulfoo, nitems;
2243 unsigned char *data;
2244 FbAtoms *fbatoms = FbAtoms::instance(); 2242 FbAtoms *fbatoms = FbAtoms::instance();
2245 2243
2246 BlackboxAttributes *net; 2244 BlackboxAttributes *net;
2247 if (m_client->property(fbatoms->getFluxboxAttributesAtom(), 0l, 2245 if (m_client->property(fbatoms->getFluxboxAttributesAtom(), 0l,
2248 PropBlackboxAttributesElements, false, 2246 PropBlackboxAttributesElements, false,
2249 fbatoms->getFluxboxAttributesAtom(), &atom_return, &foo, 2247 fbatoms->getFluxboxAttributesAtom(), &atom_return, &foo,
2250 &nitems, &ulfoo, &data) && 2248 &nitems, &ulfoo, (unsigned char **) &net) &&
2251 data) { 2249 net) {
2252 if (nitems != (unsigned)PropBlackboxAttributesElements) { 2250 if (nitems != (unsigned)PropBlackboxAttributesElements) {
2253 XFree(data); 2251 XFree(net);
2254 return; 2252 return;
2255 } 2253 }
2256 net = (BlackboxAttributes *) data;
2257 m_blackbox_attrib.flags = net->flags; 2254 m_blackbox_attrib.flags = net->flags;
2258 m_blackbox_attrib.attrib = net->attrib; 2255 m_blackbox_attrib.attrib = net->attrib;
2259 m_blackbox_attrib.workspace = net->workspace; 2256 m_blackbox_attrib.workspace = net->workspace;
@@ -2263,7 +2260,7 @@ void FluxboxWindow::restoreAttributes() {
2263 m_blackbox_attrib.premax_w = net->premax_w; 2260 m_blackbox_attrib.premax_w = net->premax_w;
2264 m_blackbox_attrib.premax_h = net->premax_h; 2261 m_blackbox_attrib.premax_h = net->premax_h;
2265 2262
2266 XFree(data); 2263 XFree(static_cast<void *>(net));
2267 } else 2264 } else
2268 return; 2265 return;
2269 2266