Merge lp:~agateau/kde-runtime/fdo-notifications into lp:~kubuntu-packagers/kubuntu-packaging/kde-runtime

[Aurélien Gâteau]

=== modified file 'debian/changelog'
--- debian/changelog	2009-07-11 02:56:04 +0000
+++ debian/changelog	2009-07-17 13:41:39 +0000
@@ -1,3 +1,11 @@
+kdebase-runtime (4:4.2.96-0ubuntu2) karmic; urgency=low
+
+  * Backport support for freedesktop.org notifications. Makes it possible for
+    GNOME and KDE applications to display notifications using the native
+    desktop notification system.
+
+ -- Aurélien Gâteau <[e-mail]>  Fri, 17 Jul 2009 14:13:55 +0200
+
 kdebase-runtime (4:4.2.96-0ubuntu1) karmic; urgency=low
 
   [ Christian Mangold ]
 
=== added file 'debian/patches/kubuntu_86_fdo_notifications.diff'
--- debian/patches/kubuntu_86_fdo_notifications.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/kubuntu_86_fdo_notifications.diff	2009-07-17 13:41:39 +0000
@@ -0,0 +1,16 @@
+From 8861cfc7b4a8a3278773db766b836bbdce33e718 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <[e-mail]>
+Date: Wed, 17 Jun 2009 15:26:14 +0200
+Subject: [PATCH] Removed event-id
+
+---
+--- a/knotify/notifybypopup.cpp
++++ b/knotify/notifybypopup.cpp
+@@ -357,7 +357,6 @@ bool NotifyByPopup::sendNotificationDBus(int id, int replacesId, KNotifyConfig*
+ 
+ 	args.append( appCaption ); // app_name
+ 	args.append( dbus_replaces_id ); // replaces_id
+-	args.append( config->eventid ); // event_id
+ 	args.append( iconName ); // app_icon
+ 	args.append( config->title ); // summary
+ 	args.append( config->text ); // body
 
=== added file 'debian/patches/kubuntu_87_fdo_notifications.diff'
--- debian/patches/kubuntu_87_fdo_notifications.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/kubuntu_87_fdo_notifications.diff	2009-07-17 13:41:39 +0000
@@ -0,0 +1,40 @@
+From 86dd34fb4efba8163272c171912484ea077b0ed0 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <[e-mail]>
+Date: Thu, 18 Jun 2009 17:45:23 +0200
+Subject: [PATCH] Switch to org.freedesktop.Notifications
+
+---
+--- a/knotify/notifybypopup.cpp
++++ b/knotify/notifybypopup.cpp
+@@ -38,9 +38,9 @@
+ #include <QDBusConnectionInterface>
+ #include <kconfiggroup.h>
+ 
+-static const char dbusServiceName[] = "org.kde.VisualNotifications";
+-static const char dbusInterfaceName[] = "org.kde.VisualNotifications";
+-static const char dbusPath[] = "/VisualNotifications";
++static const char dbusServiceName[] = "org.freedesktop.Notifications";
++static const char dbusInterfaceName[] = "org.freedesktop.Notifications";
++static const char dbusPath[] = "/org/freedesktop/Notifications";
+ 
+ NotifyByPopup::NotifyByPopup(QObject *parent) 
+   : KNotifyPlugin(parent) , m_animationTimer(0), m_dbusServiceExists(false)
+@@ -348,7 +348,8 @@ bool NotifyByPopup::sendNotificationDBus(int id, int replacesId, KNotifyConfig*
+ 	// NOTE readEntry here is not KConfigGroup::readEntry - this is a custom class
+ 	// It returns QString.
+ 	QString timeoutStr = config->readEntry( "Timeout" );
+-	int timeout = !timeoutStr.isEmpty() ? timeoutStr.toInt() : 0;
++	// -1 means: notification server decides
++	int timeout = !timeoutStr.isEmpty() ? timeoutStr.toInt() : -1;
+ 
+ 	QList<QVariant> args;
+ 
+@@ -358,7 +359,7 @@ bool NotifyByPopup::sendNotificationDBus(int id, int replacesId, KNotifyConfig*
+ 	args.append( appCaption ); // app_name
+ 	args.append( dbus_replaces_id ); // replaces_id
+ 	args.append( iconName ); // app_icon
+-	args.append( config->title ); // summary
++	args.append( config->title.isEmpty() ? appCaption : config->title ); // summary
+ 	args.append( config->text ); // body
+ 	// galago spec defines action list to be list like
+ 	// (act_id1, action1, act_id2, action2, ...)
 
=== added file 'debian/patches/kubuntu_88_fdo_notifications.diff'
--- debian/patches/kubuntu_88_fdo_notifications.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/kubuntu_88_fdo_notifications.diff	2009-07-17 13:41:39 +0000
@@ -0,0 +1,182 @@
+From da943498b3affdfa6f61befd16e01c6311b01721 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <[e-mail]>
+Date: Tue, 30 Jun 2009 11:58:22 +0200
+Subject: [PATCH] Use the correct format for image_data hint
+
+---
+--- a/knotify/CMakeLists.txt
++++ b/knotify/CMakeLists.txt
+@@ -12,6 +12,7 @@ notifybylogfile.cpp
+ notifybytaskbar.cpp
+ notifybyexecute.cpp
+ notifybyktts.cpp
++imageconverter.cpp
+ )
+ 
+ qt4_add_dbus_interfaces(knotify_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
+--- /dev/null
++++ b/knotify/imageconverter.cpp
+@@ -0,0 +1,101 @@
++/*
++   Copyright (C) 2009 by Aurélien Gâteau <[e-mail]>
++
++   This program 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, 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
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
++
++ */
++#include "imageconverter.h"
++
++#include <QDBusArgument>
++#include <QDBusMetaType>
++#include <QImage>
++
++namespace ImageConverter
++{
++
++/**
++ * A structure representing an image which can be marshalled to fit the
++ * notification spec.
++ */
++struct SpecImage
++{
++	int width, height, rowStride;
++	bool hasAlpha;
++	int bitsPerSample, channels;
++	QByteArray data;
++};
++
++QDBusArgument &operator<<(QDBusArgument &argument, const SpecImage &image)
++{
++	argument.beginStructure();
++	argument << image.width << image.height << image.rowStride << image.hasAlpha;
++	argument << image.bitsPerSample << image.channels << image.data;
++	argument.endStructure();
++	return argument;
++}
++
++const QDBusArgument &operator>>(const QDBusArgument &argument, SpecImage &image)
++{
++	argument.beginStructure();
++	argument >> image.width >> image.height >> image.rowStride >> image.hasAlpha;
++	argument >> image.bitsPerSample >> image.channels >> image.data;
++	argument.endStructure();
++	return argument;
++}
++
++QVariant variantForImage(const QImage &_image)
++{
++	qDBusRegisterMetaType<SpecImage>();
++
++	QImage image = _image.convertToFormat(QImage::Format_ARGB32);
++
++	int rowStride = image.width() * 4;
++
++	// Notification spec stores pixels in R,G,B,A order, regardless of
++	// endianess
++	// Qt represents pixels as 32 bit unsigned int. So the order depend on
++	// endianess:
++	// - In big endian the order is A,R,G,B
++	// - In little endian the order is B,G,R,A
++	QByteArray data;
++	data.resize(rowStride * image.height());
++	char* dst = data.data();
++	for (int y=0; y<image.height(); ++y) {
++		QRgb* src = (QRgb*)image.scanLine(y);
++		QRgb* end = src + image.width();
++		for (;src != end; ++src) {
++			// Probably slow, but free of endianess issues
++			*dst++ = qRed(*src);
++			*dst++ = qGreen(*src);
++			*dst++ = qBlue(*src);
++			*dst++ = qAlpha(*src);
++		}
++	}
++
++	SpecImage specImage;
++	specImage.width = image.width();
++	specImage.height = image.height();
++	specImage.rowStride = rowStride;
++	specImage.hasAlpha = true;
++	specImage.bitsPerSample = 8;
++	specImage.channels = 4;
++	specImage.data = data;
++
++	return QVariant::fromValue(specImage);
++}
++
++} // namespace
++
++Q_DECLARE_METATYPE(ImageConverter::SpecImage)
+--- /dev/null
++++ b/knotify/imageconverter.h
+@@ -0,0 +1,36 @@
++/*
++   Copyright (C) 2009 by Aurélien Gâteau <[e-mail]>
++
++   This program 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, 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
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
++
++ */
++#ifndef IMAGECONVERTER_H
++#define IMAGECONVERTER_H
++
++class QVariant;
++class QImage;
++
++namespace ImageConverter
++{
++
++/**
++ * Returns a variant representing an image using the format describe in the
++ * galago spec
++ */
++QVariant variantForImage(const QImage &image);
++
++} // namespace
++
++#endif /* IMAGECONVERTER_H */
+--- a/knotify/notifybypopup.cpp
++++ b/knotify/notifybypopup.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include "notifybypopup.h"
+ #include "knotifyconfig.h"
++#include "imageconverter.h"
+ 
+ #include <kdebug.h>
+ #include <kpassivepopup.h>
+@@ -378,8 +379,10 @@ bool NotifyByPopup::sendNotificationDBus(int id, int replacesId, KNotifyConfig*
+ 
+ 	QVariantMap map;
+ 	// let's see if we've got an image, and store the image in the hints map
+-	if (!config->image.isNull())
+-		map["image_data"] = config->image.data();
++	if (!config->image.isNull()) {
++		QImage image = config->image.toImage();
++		map["image_data"] = ImageConverter::variantForImage(image);
++	}
+ 
+ 	args.append( map ); // hints
+ 	args.append( timeout ); // expire timout
 
=== added file 'debian/patches/kubuntu_89_fdo_notifications.diff'
--- debian/patches/kubuntu_89_fdo_notifications.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/kubuntu_89_fdo_notifications.diff	2009-07-17 13:41:39 +0000
@@ -0,0 +1,127 @@
+From 3b884757032294e77c4094fb5e10cab20e6b987d Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <[e-mail]>
+Date: Tue, 30 Jun 2009 15:20:33 +0200
+Subject: [PATCH] Move notification timeout handling to knotify.
+
+---
+--- a/knotify/knotify.cpp
++++ b/knotify/knotify.cpp
+@@ -110,7 +110,7 @@ void KNotify::closeNotification(int id)
+ 	delete e;
+ }
+ 
+-int KNotify::event( const QString & event, const QString & appname, const ContextList & contexts, const QString & title, const QString & text, const KNotifyImage & image, const QStringList & actions, WId winId )
++int KNotify::event( const QString & event, const QString & appname, const ContextList & contexts, const QString & title, const QString & text, const KNotifyImage & image, const QStringList & actions, int timeout, WId winId )
+ {
+ 	m_counter++;
+ 	Event *e=new Event(appname , contexts , event );
+@@ -121,6 +121,7 @@ int KNotify::event( const QString & event, const QString & appname, const Contex
+ 	e->config.text=text;
+ 	e->config.actions=actions;
+ 	e->config.image=image;
++	e->config.timeout=timeout;
+ 	e->config.winId=(WId)winId;
+ 	
+ 	m_notifications.insert(m_counter,e);
+@@ -207,7 +208,8 @@ void KNotifyAdaptor::closeNotification(int id)
+ }
+ 
+ int KNotifyAdaptor::event(const QString &event, const QString &fromApp, const QVariantList& contexts,
+-						const QString &title, const QString &text, const QByteArray& image,  const QStringList& actions , qlonglong winId)
++						const QString &title, const QString &text, const QByteArray& image,  const QStringList& actions,
++						int timeout, qlonglong winId)
+ //						  const QDBusMessage & , int _return )
+ 								  
+ {
+@@ -231,7 +233,7 @@ int KNotifyAdaptor::event(const QString &event, const QString &fromApp, const QV
+ 			contextlist << qMakePair(context_key , s);
+ 	}
+ 	
+-	return static_cast<KNotify *>(parent())->event(event, fromApp, contextlist, title, text, image, actions, WId(winId));
++	return static_cast<KNotify *>(parent())->event(event, fromApp, contextlist, title, text, image, actions, timeout, WId(winId));
+ }
+ 
+ void KNotifyAdaptor::reemit(int id, const QVariantList& contexts)
+--- a/knotify/knotify.h
++++ b/knotify/knotify.h
+@@ -52,7 +52,8 @@ class KNotify : public QObject
+ 		void closeNotification( int id);
+ 		
+ 		int event(const QString &event, const QString &fromApp, const ContextList& contexts ,
+-				const QString &title, const QString &text, const KNotifyImage& image,  const QStringList& actions , WId winId = 0);
++				const QString &title, const QString &text, const KNotifyImage& image,  const QStringList& actions,
++				int timeout, WId winId = 0);
+ 		
+ 		void update(int id, const QString &title, const QString &text, const KNotifyImage& image,  const QStringList& actions);
+ 		void reemit(int id, const ContextList& contexts);
+@@ -108,6 +109,7 @@ class KNotifyAdaptor : public QDBusAbstractAdaptor
+ 							"<arg name=\"text\" type=\"s\" direction=\"in\"/>"
+ 							"<arg name=\"pixmap\" type=\"ay\" direction=\"in\"/>"
+ 							"<arg name=\"actions\" type=\"as\" direction=\"in\"/>"
++							"<arg name=\"timeout\" type=\"i\" direction=\"in\"/>"
+ 							"<arg name=\"winId\" type=\"x\" direction=\"in\"/>"
+ 						"</method>"
+ 						"<method name=\"update\">"
+@@ -134,7 +136,8 @@ class KNotifyAdaptor : public QDBusAbstractAdaptor
+ 		void closeNotification( int id);
+ 		
+ 		int event(const QString &event, const QString &fromApp, const QVariantList& contexts ,
+-								const QString &title, const QString &text, const QByteArray& pixmap,  const QStringList& actions , qlonglong winId );
++								const QString &title, const QString &text, const QByteArray& pixmap,  const QStringList& actions , int timeout,
++								qlonglong winId );
+ 		
+ 		void reemit(int id, const QVariantList& contexts);
+ 		void update(int id, const QString &title, const QString &text, const QByteArray& pixmap,  const QStringList& actions );
+--- a/knotify/knotifyconfig.h
++++ b/knotify/knotifyconfig.h
+@@ -84,6 +84,12 @@ class KNotifyConfig
+ 		 */
+ 		KNotifyImage image;
+ 		/**
++		 * How long the notification should be presented (in seconds).
++		 * -1 means server decides,
++		 *  0 means infinite.
++		 */
++		int timeout;
++		/**
+ 		 * The windowsID of the window that initiated the notification
+ 		 * (it is a window in the client)
+ 		 */
+--- a/knotify/notifybypopup.cpp
++++ b/knotify/notifybypopup.cpp
+@@ -95,10 +95,9 @@ void NotifyByPopup::notify( int id, KNotifyConfig * config )
+ 	pop->setAutoDelete( true );
+ 	connect(pop, SIGNAL(destroyed()) , this, SLOT(slotPopupDestroyed()) );
+ 
+-	// NOTE readEntry here is not KConfigGroup::readEntry - this is a custom class
+-	// It returns QString.
+-	QString timeoutStr = config->readEntry( "Timeout" );
+-	pop->setTimeout( !timeoutStr.isEmpty() ? timeoutStr.toInt() : 0 );
++	// Default to 6 seconds if no timeout has been defined
++	int timeout = config->timeout == -1 ? 6 : config->timeout;
++	pop->setTimeout(timeout);
+ 
+ 	pop->adjustSize();
+ 	pop->show(QPoint(screen.left() + screen.width()/2 - pop->width()/2  , m_nextPosition));
+@@ -346,12 +345,6 @@ bool NotifyByPopup::sendNotificationDBus(int id, int replacesId, KNotifyConfig*
+ 
+ 	QDBusMessage m = QDBusMessage::createMethodCall( dbusServiceName, dbusPath, dbusInterfaceName, "Notify" );
+ 
+-	// NOTE readEntry here is not KConfigGroup::readEntry - this is a custom class
+-	// It returns QString.
+-	QString timeoutStr = config->readEntry( "Timeout" );
+-	// -1 means: notification server decides
+-	int timeout = !timeoutStr.isEmpty() ? timeoutStr.toInt() : -1;
+-
+ 	QList<QVariant> args;
+ 
+ 	QString appCaption, iconName;
+@@ -385,7 +378,7 @@ bool NotifyByPopup::sendNotificationDBus(int id, int replacesId, KNotifyConfig*
+ 	}
+ 
+ 	args.append( map ); // hints
+-	args.append( timeout ); // expire timout
++	args.append( config->timeout ); // expire timout
+ 
+ 	m.setArguments( args );
+ 	QDBusMessage replyMsg = QDBusConnection::sessionBus().call(m);
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2009-05-13 17:38:23 +0000
+++ debian/patches/series	2009-07-17 13:41:39 +0000
@@ -6,3 +6,7 @@
 kubuntu_07_oxygenify_knetattach_icon.diff
 kubuntu_08_suggest_soprano_backend_sesame.diff
 kubuntu_85_language_selector.diff
+kubuntu_86_fdo_notifications.diff
+kubuntu_87_fdo_notifications.diff
+kubuntu_88_fdo_notifications.diff
+kubuntu_89_fdo_notifications.diff