diff options
| author | Ted Gould <ted@gould.cx> | 2011-02-24 14:04:25 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-02-24 14:04:25 -0600 |
| commit | b62773082193e463d4fa717730734e7a352ebfec (patch) | |
| tree | 98f1f8f9aadd2cc23f3ea5487ea32a2f790eccfe | |
| parent | 8a35898a425f15ee144e7b87e0dec9f8e38431de (diff) | |
| parent | 3566852c8b4330cff84f4a7c6bcf18601264f747 (diff) | |
| download | libdbusmenu-b62773082193e463d4fa717730734e7a352ebfec.tar.gz libdbusmenu-b62773082193e463d4fa717730734e7a352ebfec.tar.bz2 libdbusmenu-b62773082193e463d4fa717730734e7a352ebfec.zip | |
* Upstream Merge
* Fixing state property
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/dbus-menu.xml | 2 | ||||
| -rw-r--r-- | libdbusmenu-glib/server.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 4400cd0..731930b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.98-0ubuntu5~ppa2) UNRELEASED; urgency=low + + * Upstream Merge + * Fixing state property + + -- Ted Gould <ted@ubuntu.com> Thu, 24 Feb 2011 14:04:08 -0600 + libdbusmenu (0.3.98-0ubuntu5~ppa1) natty; urgency=low * Upstream Merge diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml index 829c16e..0d2a2d6 100644 --- a/libdbusmenu-glib/dbus-menu.xml +++ b/libdbusmenu-glib/dbus-menu.xml @@ -179,7 +179,7 @@ License version 3 and version 2.1 along with this program. If not, see </dox:d> </property> - <property name="state" type="s" access="read"> + <property name="status" type="s" access="read"> <dox:d> Tells if the menus are in a normal state or they believe that they could use some attention. Cases for showing them would be if help diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index e3fd2cd..056d6cb 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -744,6 +744,8 @@ bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * return g_variant_new_uint32(DBUSMENU_VERSION_NUMBER); } else if (g_strcmp0(property, "text-direction") == 0) { return g_variant_new_string(dbusmenu_text_direction_get_nick(priv->text_direction)); + } else if (g_strcmp0(property, "status") == 0) { + return g_variant_new_string(dbusmenu_status_get_nick(priv->status)); } else { g_warning("Unknown property '%s'", property); } |