Package: psi
Version: 0.9.3-1
Severity: normal
Tags: patch

Switching on "Enable Docklet" and "Use WindowMaker docklet" produces an
additional 32x32 window. The docklet works as expected, the additional
window does never update the contents and displays trash.

I run Window Maker (as you could guess) standalone, i.e. no
gnome/kde/yoursessionmanager.

The patch below solves the problem for me. How much does it
break?

Should I report that directly upstream?

Thanks a lot
Emanuel




diff -Naur deb/cutestuff/trayicon/trayicon_x11.cpp 
modified/cutestuff/trayicon/trayicon_x11.cpp
--- deb/cutestuff/trayicon/trayicon_x11.cpp     2005-03-19 13:56:30.000000000 
+0100
+++ modified/cutestuff/trayicon/trayicon_x11.cpp        2005-03-19 
14:03:03.000000000 +0100
@@ -294,12 +294,14 @@
 // TrayIconWindowMaker
 //----------------------------------------------------------------------------
 
-class TrayIconWharf : public TrayIcon::TrayIconPrivate
+class TrayIconWindowMaker: public TrayIcon::TrayIconPrivate
 {
 public:
-       TrayIconWharf(TrayIcon *object, const QPixmap &pm)
+       TrayIconWindowMaker(TrayIcon *object, const QPixmap &pm)
                : TrayIconPrivate(object, 44)
        {
+               initWM( winId() );
+                
                // set the class hint
                XClassHint classhint;
                classhint.res_name  = (char*)"psidock-wharf";
@@ -327,36 +329,6 @@
        }
 };
 
-class TrayIconWindowMaker : public TrayIcon::TrayIconPrivate
-{
-public:
-       TrayIconWindowMaker(TrayIcon *object, const QPixmap &pm);
-       ~TrayIconWindowMaker();
-
-       void setPixmap(const QPixmap &pm);
-
-private:
-       TrayIconWharf *wharf;
-};
-
-TrayIconWindowMaker::TrayIconWindowMaker(TrayIcon *object, const QPixmap &pm)
-       : TrayIconPrivate(object, 32)
-{
-       wharf = new TrayIconWharf(object, pm);
-
-       initWM( wharf->winId() );
-}
-
-TrayIconWindowMaker::~TrayIconWindowMaker()
-{
-       delete wharf;
-}
-
-void TrayIconWindowMaker::setPixmap(const QPixmap &pm)
-{
-       wharf->setPixmap(pm);
-}
-
 //----------------------------------------------------------------------------
 // TrayIcon
 //----------------------------------------------------------------------------





-- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.11-a
Locale: LANG=en_GB, LC_CTYPE=en_GB (charmap=ISO-8859-1)

Versions of packages psi depends on:
ii  libc6                    2.3.2.ds1-20    GNU C Library: Shared libraries an
ii  libgcc1                  1:3.4.3-6       GCC support library
ii  libqca1                  1.0-6           Qt Cryptographic Architecture - sh
ii  libqt3c102-mt            3:3.3.3-8       Qt GUI Library (Threaded runtime v
ii  libstdc++5               1:3.3.5-8       The GNU Standard C++ Library v3
ii  libx11-6                 4.3.0.dfsg.1-10 X Window System protocol client li
ii  libxext6                 4.3.0.dfsg.1-10 X Window System miscellaneous exte
ii  xlibs                    4.3.0.dfsg.1-10 X Keyboard Extension (XKB) configu
ii  zlib1g                   1:1.2.2-3       compression library - runtime

-- no debconf information


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to