synced WindowID with KDE/kdelibs/kdeui/notifications/kstatusnotifieritemdbus_p.cpp...

[quassel.git] / src / qtui / statusnotifieritemdbus.cpp

diff --git a/src/qtui/statusnotifieritemdbus.cpp b/src/qtui/statusnotifieritemdbus.cpp
index 9c0487b..28f5dda 100644 (file)
--- a/src/qtui/statusnotifieritemdbus.cpp
+++ b/src/qtui/statusnotifieritemdbus.cpp
@@ -19,9 +19,10 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include "mainwin.h"
+#include "qtui.h"
 #include "statusnotifieritemdbus.h"
 #include "statusnotifieritem.h"
-#include "qtui.h"
 
 #include <QDBusConnection>
 #include <QPixmap>
@@ -38,6 +39,19 @@
 #include "statusnotifierwatcher.h"
 #include "statusnotifieritemadaptor.h"
 
+#ifdef Q_OS_WIN64    
+__inline int toInt(WId wid) 
+{
+        return (int)((__int64)wid);
+}
+
+#else
+__inline int toInt(WId wid) 
+{
+        return (int)wid;
+}
+#endif        
+
 // Marshall the ImageStruct data into a D-BUS argument
 const QDBusArgument &operator<<(QDBusArgument &argument, const DBusImageStruct &icon)
 {
@@ -146,14 +160,31 @@ StatusNotifierItemDBus::StatusNotifierItemDBus(StatusNotifierItem *parent)
     m_dbus(QDBusConnection::connectToBus(QDBusConnection::SessionBus, m_service))
 {
    new StatusNotifierItemAdaptor(this);
-   qDebug() << "service is" << m_service;
-   m_dbus.registerService(m_service);
+   //qDebug() << "service is" << m_service;
+   registerService();
    m_dbus.registerObject("/StatusNotifierItem", this);
 }
 
 StatusNotifierItemDBus::~StatusNotifierItemDBus()
 {
-    m_dbus.unregisterService(m_service);
+    unregisterService();
+}
+
+// FIXME: prevent double registrations, also test this on platforms != KDE
+//
+void StatusNotifierItemDBus::registerService()
+{
+    //qDebug() << "registering to" << m_service;
+    m_dbus.registerService(m_service);
+}
+
+// FIXME: see above
+void StatusNotifierItemDBus::unregisterService()
+{
+    //qDebug() << "unregistering from" << m_service;
+    if(m_dbus.isConnected()) {
+        m_dbus.unregisterService(m_service);
+    }
 }
 
 QString StatusNotifierItemDBus::service() const
@@ -180,13 +211,13 @@ QString StatusNotifierItemDBus::Id() const
 }
 
 QString StatusNotifierItemDBus::Status() const
- {
+{
     return m_statusNotifierItem->metaObject()->enumerator(m_statusNotifierItem->metaObject()->indexOfEnumerator("State")).valueToKey(m_statusNotifierItem->state());
 }
 
 int StatusNotifierItemDBus::WindowId() const
 {
-    return (int)QtUi::mainWindow()->winId();
+    return toInt(QtUi::mainWindow()->winId());
 }