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

[Aurélien Gâteau]

=== modified file 'debian/changelog'
--- debian/changelog	2009-07-11 17:51:42 +0000
+++ debian/changelog	2009-07-17 13:36:28 +0000
@@ -1,3 +1,11 @@
+kdebase (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 12:51:23 +0200
+
 kdebase (4:4.2.96-0ubuntu1) karmic; urgency=low
 
   * New upstream release

=== added file 'debian/patches/kubuntu_15_fdo_notifications.diff'
--- debian/patches/kubuntu_15_fdo_notifications.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/kubuntu_15_fdo_notifications.diff	2009-07-17 13:44:07 +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/apps/kdialog/kdialog.cpp
++++ b/apps/kdialog/kdialog.cpp
+@@ -119,7 +119,6 @@ bool sendVisualNotification(QString text, QString title, int timeout)
+ 
+   args.append("kdialog"); // app_name
+   args.append(0U); // replaces_id
+-  args.append("kdialogPassivePopup"); // event_id
+   args.append("dialog-information"); // app_icon
+   args.append(title); // summary
+   args.append(text); // body

=== added file 'debian/patches/kubuntu_16_fdo_notifications.diff'
--- debian/patches/kubuntu_16_fdo_notifications.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/kubuntu_16_fdo_notifications.diff	2009-07-17 13:44:07 +0000
@@ -0,0 +1,21 @@
+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/apps/kdialog/kdialog.cpp
++++ b/apps/kdialog/kdialog.cpp
+@@ -99,9 +99,9 @@ bool WinIdEmbedder::eventFilter(QObject *o, QEvent *e)
+ bool sendVisualNotification(QString text, QString title, int timeout)
+ {
+ #ifdef QT_QTDBUS_FOUND
+-  const QString dbusServiceName = "org.kde.VisualNotifications";
+-  const QString dbusInterfaceName = "org.kde.VisualNotifications";
+-  const QString dbusPath = "/VisualNotifications";
++  const QString dbusServiceName = "org.freedesktop.Notifications";
++  const QString dbusInterfaceName = "org.freedesktop.Notifications";
++  const QString dbusPath = "/org/freedesktop/Notifications";
+ 
+   // check if service already exists on plugin instantiation
+   QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface();

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-06-02 15:04:07 +0000
+++ debian/patches/series	2009-07-17 13:36:28 +0000
@@ -5,3 +5,5 @@
 kubuntu_12_folderview_retry.diff
 kubuntu_13_fix_phonon_include.diff
 kubuntu_14_dolphin_preview_on.diff
+kubuntu_15_fdo_notifications.diff
+kubuntu_16_fdo_notifications.diff