aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authormarkt <markt>2006-08-08 19:25:48 (GMT)
committermarkt <markt>2006-08-08 19:25:48 (GMT)
commit9b9d5a9617612928710570e024632ba62f0ff74f (patch)
tree187697534c1eee0ce1c4ce73574bc277e61b9b06 /src/Screen.cc
parente2c31b7285f4bba232547bb61f97abf29fdca34e (diff)
downloadfluxbox_pavel-9b9d5a9617612928710570e024632ba62f0ff74f.zip
fluxbox_pavel-9b9d5a9617612928710570e024632ba62f0ff74f.tar.bz2
fix some compiler warnings in gcc 4.1
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index d2117ff..65359e4 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1281,7 +1281,8 @@ bool BScreen::isKdeDockapp(Window client) const {
1281 bool iskdedockapp = false; 1281 bool iskdedockapp = false;
1282 Atom ajunk; 1282 Atom ajunk;
1283 int ijunk; 1283 int ijunk;
1284 unsigned long *data = 0, uljunk; 1284 unsigned char *data = 0;
1285 unsigned long uljunk;
1285 Display *disp = FbTk::App::instance()->display(); 1286 Display *disp = FbTk::App::instance()->display();
1286 // Check if KDE v2.x dock applet 1287 // Check if KDE v2.x dock applet
1287 if (XGetWindowProperty(disp, client, 1288 if (XGetWindowProperty(disp, client,
@@ -1289,7 +1290,7 @@ bool BScreen::isKdeDockapp(Window client) const {
1289 "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False), 1290 "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False),
1290 0l, 1l, False, 1291 0l, 1l, False,
1291 XA_WINDOW, &ajunk, &ijunk, &uljunk, 1292 XA_WINDOW, &ajunk, &ijunk, &uljunk,
1292 &uljunk, (unsigned char **) &data) == Success) { 1293 &uljunk, &data) == Success) {
1293 1294
1294 if (data) 1295 if (data)
1295 iskdedockapp = true; 1296 iskdedockapp = true;
@@ -1304,7 +1305,7 @@ bool BScreen::isKdeDockapp(Window client) const {
1304 if (XGetWindowProperty(disp, client, 1305 if (XGetWindowProperty(disp, client,
1305 kwm1, 0l, 1l, False, 1306 kwm1, 0l, 1l, False,
1306 kwm1, &ajunk, &ijunk, &uljunk, 1307 kwm1, &ajunk, &ijunk, &uljunk,
1307 &uljunk, (unsigned char **) &data) == Success && data) { 1308 &uljunk, &data) == Success && data) {
1308 iskdedockapp = (data && data[0] != 0); 1309 iskdedockapp = (data && data[0] != 0);
1309 XFree((void *) data); 1310 XFree((void *) data);
1310 data = 0; 1311 data = 0;