diff options
Diffstat (limited to 'src/Slit.cc')
-rw-r--r-- | src/Slit.cc | 40 |
1 files changed, 4 insertions, 36 deletions
diff --git a/src/Slit.cc b/src/Slit.cc index 08378ed..2ef77c4 100644 --- a/src/Slit.cc +++ b/src/Slit.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Slit.cc,v 1.92 2004/02/20 09:29:06 fluxgen Exp $ | 25 | // $Id: Slit.cc,v 1.93 2004/04/19 22:42:05 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Slit.hh" | 27 | #include "Slit.hh" |
28 | 28 | ||
@@ -487,39 +487,7 @@ void Slit::addClient(Window w) { | |||
487 | XWindowAttributes attrib; | 487 | XWindowAttributes attrib; |
488 | 488 | ||
489 | #ifdef KDE | 489 | #ifdef KDE |
490 | 490 | if (screen().isKdeDockapp(w)) | |
491 | //Check and see if new client is a KDE dock applet | ||
492 | //If so force reasonable size | ||
493 | bool iskdedockapp = false; | ||
494 | Atom ajunk; | ||
495 | int ijunk; | ||
496 | unsigned long *data = 0, uljunk; | ||
497 | |||
498 | // Check if KDE v2.x dock applet | ||
499 | if (XGetWindowProperty(disp, w, | ||
500 | m_kwm2_dockwindow, 0l, 1l, False, | ||
501 | m_kwm2_dockwindow, | ||
502 | &ajunk, &ijunk, &uljunk, &uljunk, | ||
503 | (unsigned char **) &data) == Success && data) { | ||
504 | iskdedockapp = (data && data[0] != 0); | ||
505 | XFree((void *) data); | ||
506 | data = 0; | ||
507 | } | ||
508 | |||
509 | // Check if KDE v1.x dock applet | ||
510 | if (!iskdedockapp) { | ||
511 | if (XGetWindowProperty(disp, w, | ||
512 | m_kwm1_dockwindow, 0l, 1l, False, | ||
513 | m_kwm1_dockwindow, | ||
514 | &ajunk, &ijunk, &uljunk, &uljunk, | ||
515 | (unsigned char **) &data) == Success && data) { | ||
516 | iskdedockapp = (data && data[0] != 0); | ||
517 | XFree((void *) data); | ||
518 | data = 0; | ||
519 | } | ||
520 | } | ||
521 | |||
522 | if (iskdedockapp) | ||
523 | client->resize(24, 24); | 491 | client->resize(24, 24); |
524 | else | 492 | else |
525 | #endif // KDE | 493 | #endif // KDE |
@@ -549,13 +517,13 @@ void Slit::addClient(Window w) { | |||
549 | client->enableEvents(); | 517 | client->enableEvents(); |
550 | 518 | ||
551 | // flush events | 519 | // flush events |
552 | XFlush(disp); | 520 | // XFlush(disp); |
553 | 521 | ||
554 | // add slit client to eventmanager | 522 | // add slit client to eventmanager |
555 | FbTk::EventManager::instance()->add(*this, client->clientWindow()); | 523 | FbTk::EventManager::instance()->add(*this, client->clientWindow()); |
556 | FbTk::EventManager::instance()->add(*this, client->iconWindow()); | 524 | FbTk::EventManager::instance()->add(*this, client->iconWindow()); |
557 | 525 | ||
558 | frame.window.show(); | 526 | // frame.window.show(); |
559 | clearWindow(); | 527 | clearWindow(); |
560 | reconfigure(); | 528 | reconfigure(); |
561 | 529 | ||