X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fstatusnotifieritemdbus.cpp;h=893b24dd7a9023082ab908cd2f2a5907ea7a3f22;hb=7a1f4908421fe7e542940aae057eeaf33b301c92;hp=5e67e698a3ae86a71acdef7ebb74d6da06a8f0af;hpb=55362eeaa19678bd8ba36ecce134d98cc0d7eccd;p=quassel.git

diff --git a/src/qtui/statusnotifieritemdbus.cpp b/src/qtui/statusnotifieritemdbus.cpp
index 5e67e698..893b24dd 100644
--- a/src/qtui/statusnotifieritemdbus.cpp
+++ b/src/qtui/statusnotifieritemdbus.cpp
@@ -4,9 +4,9 @@
  *   Quasselfied 2010 by Manuel Nickschas <sputnick@quassel-irc.org>       *
  *                                                                         *
  *   This file is free software; you can redistribute it and/or modify     *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   it under the terms of the GNU Library General Public License (LGPL)   *
+ *   as published by the Free Software Foundation; either version 2 of the *
+ *   License, or (at your option) any later version.                       *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -39,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)
 {
@@ -149,7 +162,6 @@ StatusNotifierItemDBus::StatusNotifierItemDBus(StatusNotifierItem *parent)
    new StatusNotifierItemAdaptor(this);
    //qDebug() << "service is" << m_service;
    registerService();
-   m_dbus.registerObject("/StatusNotifierItem", this);
 }
 
 StatusNotifierItemDBus::~StatusNotifierItemDBus()
@@ -157,12 +169,18 @@ StatusNotifierItemDBus::~StatusNotifierItemDBus()
     unregisterService();
 }
 
+QDBusConnection StatusNotifierItemDBus::dbusConnection() const
+{
+    return m_dbus;
+}
+
 // FIXME: prevent double registrations, also test this on platforms != KDE
 //
 void StatusNotifierItemDBus::registerService()
 {
     //qDebug() << "registering to" << m_service;
     m_dbus.registerService(m_service);
+    m_dbus.registerObject("/StatusNotifierItem", this);
 }
 
 // FIXME: see above
@@ -170,6 +188,7 @@ void StatusNotifierItemDBus::unregisterService()
 {
     //qDebug() << "unregistering from" << m_service;
     if(m_dbus.isConnected()) {
+        m_dbus.unregisterObject("/StatusNotifierItem");
         m_dbus.unregisterService(m_service);
     }
 }
@@ -204,7 +223,7 @@ QString StatusNotifierItemDBus::Status() const
 
 int StatusNotifierItemDBus::WindowId() const
 {
-    return (int)QtUi::mainWindow()->winId();
+    return toInt(QtUi::mainWindow()->winId());
 }
 
 
@@ -262,6 +281,19 @@ DBusToolTipStruct StatusNotifierItemDBus::ToolTip() const
     return toolTip;
 }
 
+QString StatusNotifierItemDBus::IconThemePath() const
+{
+    return m_statusNotifierItem->iconThemePath();
+}
+
+//Menu
+
+QDBusObjectPath StatusNotifierItemDBus::Menu() const
+{
+    return QDBusObjectPath(m_statusNotifierItem->menuObjectPath());
+}
+
+
 //Interaction
 
 void StatusNotifierItemDBus::ContextMenu(int x, int y)