diff options
| author | Ted Gould <ted@canonical.com> | 2009-05-15 15:03:35 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-05-15 15:03:35 -0500 |
| commit | e95af4b8e1facef6fe42346ecc73ef14cb92b640 (patch) | |
| tree | 7fb84c11c8c4b8d649287753295d5a1e93455c06 /libdbusmenu-glib | |
| parent | e45d87762470fc1b0ce363d95de49e94be17444f (diff) | |
| download | libdbusmenu-e95af4b8e1facef6fe42346ecc73ef14cb92b640.tar.gz libdbusmenu-e95af4b8e1facef6fe42346ecc73ef14cb92b640.tar.bz2 libdbusmenu-e95af4b8e1facef6fe42346ecc73ef14cb92b640.zip | |
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.
Diffstat (limited to 'libdbusmenu-glib')
| -rw-r--r-- | libdbusmenu-glib/dbus-menu.xml | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/server.c | 8 |
2 files changed, 1 insertions, 14 deletions
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" @@ -370,13 +369,6 @@ _dbusmenu_server_get_properties (void) } static gboolean -_dbusmenu_server_list_properties (void) -{ - - return TRUE; -} - -static gboolean _dbusmenu_server_call (DbusmenuServer * server, guint id, GError ** error) { DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server); |