From 6f032f50c8bec41cd56e36ec09af118a9684af5b Mon Sep 17 00:00:00 2001
From: Aurelien Gateau <aurelien.gateau@canonical.com>
Date: Fri, 8 Oct 2010 17:02:24 +0200
Subject: Fix implementation of org.kde.StatusNotifierWatcher interface

ProtocolVersion, IsStatusNotifierHostRegistered and
RegisteredStatusNotifierItems are properties, not methods.
---
 src/notification-watcher.xml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'src/notification-watcher.xml')

diff --git a/src/notification-watcher.xml b/src/notification-watcher.xml
index 5f19dd2..1a99af3 100644
--- a/src/notification-watcher.xml
+++ b/src/notification-watcher.xml
@@ -3,25 +3,18 @@
 	<interface name="org.kde.StatusNotifierWatcher">
 
 <!-- Properties -->
-		<!-- None currently -->
+		<property name="ProtocolVersion" type="i" access="read" />
+		<property name="IsStatusNotifierHostRegistered" type="b" access="read" />
+		<property name="RegisteredStatusNotifierItems" type="as" access="read" />
 
 <!-- Methods -->
 		<method name="RegisterStatusNotifierItem">
 		    <annotation name="org.freedesktop.DBus.GLib.Async" value="true" />
 			<arg type="s" name="service" direction="in" />
 		</method>
-		<method name="RegisteredStatusNotifierItems">
-			<arg type="as" name="services" direction="out" />
-		</method>
-		<method name="ProtocolVersion">
-			<arg type="s" name="version" direction="out" />
-		</method>
 		<method name="RegisterNotificationHost">
 			<arg type="s" name="service" direction="in" />
 		</method>
-		<method name="IsNotificationHostRegistered">
-			<arg type="b" name="hasHost" direction="out" />
-		</method>
 		<method name="XAyatanaRegisterNotificationApprover">
 		    <annotation name="org.freedesktop.DBus.GLib.Async" value="true" />
 			<!-- The path where to find the approver interface -->
-- 
cgit v1.2.3


From ea206ef1316942b005fd538dc8a251bd239291cd Mon Sep 17 00:00:00 2001
From: Aurelien Gateau <aurelien.gateau@canonical.com>
Date: Fri, 8 Oct 2010 18:04:27 +0200
Subject: NotificationHost => StatusNotifierHost, Service => StatusNotifierItem

---
 src/notification-watcher.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/notification-watcher.xml')

diff --git a/src/notification-watcher.xml b/src/notification-watcher.xml
index 1a99af3..b03c5e3 100644
--- a/src/notification-watcher.xml
+++ b/src/notification-watcher.xml
@@ -12,7 +12,7 @@
 		    <annotation name="org.freedesktop.DBus.GLib.Async" value="true" />
 			<arg type="s" name="service" direction="in" />
 		</method>
-		<method name="RegisterNotificationHost">
+		<method name="RegisterStatusNotifierHost">
 			<arg type="s" name="service" direction="in" />
 		</method>
 		<method name="XAyatanaRegisterNotificationApprover">
@@ -24,15 +24,13 @@
 		</method>
 
 <!-- Signals -->
-		<signal name="ServiceRegistered">
+		<signal name="StatusNotifierItemRegistered">
 			<arg type="s" name="service" direction="out" />
 		</signal>
-		<signal name="ServiceUnregistered">
+		<signal name="StatusNotifierItemUnregistered">
 			<arg type="s" name="service" direction="out" />
 		</signal>
-		<signal name="NotificationHostRegistered">
-		</signal>
-		<signal name="NotificationHostUnregistered">
+		<signal name="StatusNotifierHostRegistered">
 		</signal>
 
 	</interface>
-- 
cgit v1.2.3