0002-Improved-support-for-org.freedesktop.Notifications.patch

     QT_MOD = core network gui
     SRCS += buffer.cpp buffersettings.cpp clientbacklogmanager.cpp treemodel.cpp networkmodel.cpp buffermodel.cpp \
             client.cpp clientsettings.cpp clientsyncer.cpp mappedselectionmodel.cpp selectionmodelsynchronizer.cpp
             client.cpp clientsettings.cpp clientsyncer.cpp mappedselectionmodel.cpp selectionmodelsynchronizer.cpp \
     		desktopnotifications.cpp
     HDRS += buffer.h buffersettings.h clientbacklogmanager.h treemodel.h networkmodel.h buffermodel.h \
             client.h clientsettings.h clientsyncer.h quasselui.h mappedselectionmodel.h selectionmodelsynchronizer.h
             client.h clientsettings.h clientsyncer.h quasselui.h mappedselectionmodel.h selectionmodelsynchronizer.h \
     		desktopnotifications.h
     sputdev {
       SRCS += messagemodel.cpp

     /*
      * This file was generated by dbusxml2cpp version 0.6
      * Command line was: dbusxml2cpp -p desktopnotifications org.freedesktop.Notifications.xml
+     *
      * dbusxml2cpp is Copyright (C) 2006 Trolltech ASA. All rights reserved.
+     *
      * This is an auto-generated file.
      * This file may have been hand-edited. Look for HAND-EDIT comments
      * before re-generating it.
      */
     #include "desktopnotifications.h"
     /*
      * Implementation of interface class OrgFreedesktopNotificationsInterface
      */
     OrgFreedesktopNotificationsInterface::OrgFreedesktopNotificationsInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
         : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+    {
+    }
     OrgFreedesktopNotificationsInterface::~OrgFreedesktopNotificationsInterface()
+    {
+    }

     /*
      * This file was generated by dbusxml2cpp version 0.6
      * Command line was: dbusxml2cpp -p desktopnotifications org.freedesktop.Notifications.xml
+     *
      * dbusxml2cpp is Copyright (C) 2006 Trolltech ASA. All rights reserved.
+     *
      * This is an auto-generated file.
      * Do not edit! All changes made to it will be lost.
      */
     #ifndef DESKTOPNOTIFICATIONS_H_1211193208
     #define DESKTOPNOTIFICATIONS_H_1211193208
     #include <QtCore/QObject>
     #include <QtCore/QByteArray>
     #include <QtCore/QList>
     #include <QtCore/QMap>
     #include <QtCore/QString>
     #include <QtCore/QStringList>
     #include <QtCore/QVariant>
     #include <QtDBus/QtDBus>
     /*
      * Proxy class for interface org.freedesktop.Notifications
      */
     class OrgFreedesktopNotificationsInterface: public QDBusAbstractInterface
+    {
         Q_OBJECT
     public:
         static inline const char *staticInterfaceName()
         { return "org.freedesktop.Notifications"; }
     public:
         OrgFreedesktopNotificationsInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
         ~OrgFreedesktopNotificationsInterface();
     public Q_SLOTS: // METHODS
         inline QDBusReply<void> CloseNotification(uint id)
+        {
             QList<QVariant> argumentList;
             argumentList << qVariantFromValue(id);
             return callWithArgumentList(QDBus::Block, QLatin1String("CloseNotification"), argumentList);
+        }
         inline QDBusReply<QStringList> GetCapabilities()
+        {
             QList<QVariant> argumentList;
             return callWithArgumentList(QDBus::Block, QLatin1String("GetCapabilities"), argumentList);
+        }
         inline QDBusReply<QString> GetServerInformation(QString &vendor, QString &version)
+        {
             QList<QVariant> argumentList;
             QDBusMessage reply = callWithArgumentList(QDBus::Block, QLatin1String("GetServerInformation"), argumentList);
             if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 3) {
                 vendor = qdbus_cast<QString>(reply.arguments().at(1));
                 version = qdbus_cast<QString>(reply.arguments().at(2));
+            }
             return reply;
+        }
         inline QDBusReply<uint> Notify(const QString &app_name, uint replaces_id, const QString &app_icon, const QString &summary, const QString &body, const QStringList &actions, const QVariantMap &hints, int expire_timeout)
+        {
             QList<QVariant> argumentList;
             argumentList << qVariantFromValue(app_name) << qVariantFromValue(replaces_id) << qVariantFromValue(app_icon) << qVariantFromValue(summary) << qVariantFromValue(body) << qVariantFromValue(actions) << qVariantFromValue(hints) << qVariantFromValue(expire_timeout);
             return callWithArgumentList(QDBus::Block, QLatin1String("Notify"), argumentList);
+        }
     Q_SIGNALS: // SIGNALS
         void ActionInvoked(uint id, const QString &action);
         void NotificationClosed(uint id, uint reason);
     };
     namespace org {
       namespace freedesktop {
         typedef ::OrgFreedesktopNotificationsInterface Notifications;
+      }
+    }
     #endif

     <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
     <node>
       <interface name="org.freedesktop.Notifications">
         <signal name="NotificationClosed">
           <arg name="id" type="u" direction="out"/>
           <arg name="reason" type="u" direction="out"/>
         </signal>
         <signal name="ActionInvoked">
           <arg name="id" type="u" direction="out"/>
           <arg name="action" type="s" direction="out"/>
         </signal>
         <method name="GetCapabilities">
           <arg type="as" direction="out"/>
         </method>
         <method name="GetServerInformation">
           <arg name="name" type="s" direction="out"/>
           <arg name="vendor" type="s" direction="out"/>
           <arg name="version" type="s" direction="out"/>
         </method>
         <method name="Notify">
           <arg type="u" direction="out"/>
           <arg name="app_name" type="s" direction="in"/>
           <arg name="replaces_id" type="u" direction="in"/>
           <arg name="app_icon" type="s" direction="in"/>
           <arg name="summary" type="s" direction="in"/>
           <arg name="body" type="s" direction="in"/>
           <arg name="actions" type="as" direction="in"/>
           <arg name="hints" type="a{sv}" direction="in"/>
           <annotation name="com.trolltech.QtDBus.QtTypeName.In6" value="QVariantMap"/>
           <arg name="expire_timeout" type="i" direction="in"/>
         </method>
         <method name="CloseNotification">
           <arg name="id" type="u" direction="in"/>
         </method>
       </interface>
     </node>

     #include "global.h"
     #include "qtuistyle.h"
     #include <Qt/QtDBus>
     #include "desktopnotifications.h"
     MainWin::MainWin(QtUi *_gui, QWidget *parent)
-...
         trayIconActive(false),
         timer(new QTimer(this)),
         settingsDlg(new SettingsDlg(this)),
         debugConsole(new DebugConsole(this))
         debugConsole(new DebugConsole(this)),
     	desktopNotifications(new org::freedesktop::Notifications(
     		"org.freedesktop.Notifications",
     		"/org/freedesktop/Notifications",
     		QDBusConnection::sessionBus(), this)),
     	notificationId(0)
+    {
       ui.setupUi(this);
       setWindowTitle("Quassel IRC");
-...
       if(style != "") {
         QApplication::setStyle(style);
+      }
       connect(desktopNotifications, SIGNAL(NotificationClosed(uint, uint)), this, SLOT(desktopNotificationClosed(uint, uint)));
       connect(desktopNotifications, SIGNAL(ActionInvoked(uint, const QString&)), this, SLOT(desktopNotificationInvoked(uint, const QString&)));
+    }
     void MainWin::init() {
-...
+    {
     	QStringList actions;
     	QMap<QString, QVariant> hints;
     	QDBusMessage msg = QDBusMessage::createMethodCall("org.freedesktop.Notifications", "/org/freedesktop/Notifications", "", "Notify");
     	hints["x"] = 100; // Standard hint: x location for the popup to show up
     	hints["y"] = 100; // Standard hint: y location for the popup to show up
     	msg << "Quassel"; // Application name
     	msg << quint32(0); // ID of previous notification to replace
     	msg << ""; // Icon to display
     	msg << "Quassel: " + title; // Summary / Header of the message to display
     	msg << message; // Body of the message to display
     	msg << actions; // Actions from which the user may choose
     	msg << hints; // Hints to the server displaying the message
     	msg << qint32(10000); // Timeout in milliseconds
     	actions << "click" << "Click Me!";
     	QDBusReply<uint> reply = desktopNotifications->Notify(
     		"Quassel", // Application name
     		notificationId, // ID of previous notification to replace
     		"", // Icon to display
     		title, // Summary / Header of the message to display
     		QString("%1: %2:\n%2").arg(QTime::currentTime().toString()).arg(title).arg(message), // Body of the message to display
     		actions, // Actions from which the user may choose
     		hints, // Hints to the server displaying the message
 // Timeout in milliseconds
     	);
     	if (!reply.isValid())
+    	{
     		/* ERROR */
     		qDebug() << "Error on sending notification...";
     		return;
+    	}
     	notificationId = reply.value();
     	qDebug() << "ID: " << notificationId << " Time: " << QTime::currentTime().toString();
+    }
     void MainWin::desktopNotificationClosed(uint id, uint reason)
+    {
     	qDebug() << "OID: " << notificationId << " ID: " << id << " Reason: " << reason << " Time: " << QTime::currentTime().toString();
     	notificationId = 0;
+    }
     	(void)QDBusConnection::sessionBus().call(msg); // Would return a message containing the id of this notification
     void MainWin::desktopNotificationInvoked(uint id, const QString & action)
+    {
     	qDebug() << "OID: " << notificationId << " ID: " << id << " Action: " << action << " Time: " << QTime::currentTime().toString();
+    }

     class NickListWidget;
     class DebugConsole;
     #include "desktopnotifications.h"
     //!\brief The main window of Quassel's QtUi.
     class MainWin : public QMainWindow {
-...
         void loadLayout();
         void saveLayout();
     	void desktopNotificationClosed(uint id, uint reason);
     	void desktopNotificationInvoked(uint id, const QString & action);
       signals:
         void connectToCore(const QVariantMap &connInfo);
         void disconnectFromCore();
-...
         QAction *actionEditNetworks;
         QList<QAction *> networkActions;
     	org::freedesktop::Notifications *desktopNotifications;
     	quint32 notificationId;
         friend class QtUi;
     };
+    -

Project

General

Profile

Quassel IRC