From e95af4b8e1facef6fe42346ecc73ef14cb92b640 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Fri, 15 May 2009 15:03:35 -0500
Subject: Reworking the DBus interface slightly.  Making it so that the
 properties are now sent in a dict and that there isn't an arbitrary listing
 of things.  It's either grab all or grab one.  Seems to apply to the use
 cases better.

---
 libdbusmenu-glib/dbus-menu.xml | 7 +------
 libdbusmenu-glib/server.c      | 8 --------
 2 files changed, 1 insertion(+), 14 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml
index 7c41ac2..51c529b 100644
--- a/libdbusmenu-glib/dbus-menu.xml
+++ b/libdbusmenu-glib/dbus-menu.xml
@@ -41,16 +41,11 @@ License version 3 and version 2.1 along with this program.  If not, see
 		</method>
 		<method name="GetProperties">
 			<arg type="u" name="id" direction="in" />
-			<arg type="as" name="property" direction="in" />
-			<arg type="a(ss)" name="value" direction="out" />
+			<arg type="a{ss}" name="properties" direction="out" />
 		</method>
 		<method name="Call">
 			<arg type="u" name="id" direction="in" />
 		</method>
-		<method name="ListProperties">
-			<arg type="u" name="id" direction="in" />
-			<arg type="as" name="properties" direction="out" />
-		</method>
 
 <!-- Signals -->
 		<signal name="IdPropUpdate">
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c
index 37659af..3e2fd78 100644
--- a/libdbusmenu-glib/server.c
+++ b/libdbusmenu-glib/server.c
@@ -36,7 +36,6 @@ License version 3 and version 2.1 along with this program.  If not, see
 /* DBus Prototypes */
 static gboolean _dbusmenu_server_get_property (DbusmenuServer * server, guint id, gchar * property, gchar ** value, GError ** error);
 static gboolean _dbusmenu_server_get_properties (void);
-static gboolean _dbusmenu_server_list_properties (void);
 static gboolean _dbusmenu_server_call (DbusmenuServer * server, guint id, GError ** error);
 
 #include "dbusmenu-server.h"
@@ -369,13 +368,6 @@ _dbusmenu_server_get_properties (void)
 	return TRUE;
 }
 
-static gboolean
-_dbusmenu_server_list_properties (void)
-{
-
-	return TRUE;
-}
-
 static gboolean
 _dbusmenu_server_call (DbusmenuServer * server, guint id, GError ** error)
 {
-- 
cgit v1.2.3