diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/menuitem.c | 6 | ||||
| -rw-r--r-- | libdbusmenu-glib/menuitem.h | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index d0401dc..8621528 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.2-0ubuntu1~ppa2~autoid2) UNRELEASED; urgency=low + + * Upstream Merge + * Menuitem ID handling properly. + + -- Ted Gould <ted@ubuntu.com> Thu, 04 Feb 2010 19:55:16 -0800 + libdbusmenu (0.2.2-0ubuntu1~ppa2~autoid1) lucid; urgency=low * Upstream Merge diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 6739257..a6f0e40 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -395,15 +395,15 @@ dbusmenu_menuitem_new_with_id (gint id) Return value: The ID of the @mi. */ -guint +gint dbusmenu_menuitem_get_id (DbusmenuMenuitem * mi) { g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), 0); GValue retval = {0}; - g_value_init(&retval, G_TYPE_UINT); + g_value_init(&retval, G_TYPE_INT); g_object_get_property(G_OBJECT(mi), "id", &retval); - return g_value_get_uint(&retval); + return g_value_get_int(&retval); } /** diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h index 4fc144e..69f82e5 100644 --- a/libdbusmenu-glib/menuitem.h +++ b/libdbusmenu-glib/menuitem.h @@ -127,7 +127,7 @@ GType dbusmenu_menuitem_get_type (void); DbusmenuMenuitem * dbusmenu_menuitem_new (void) G_GNUC_WARN_UNUSED_RESULT; DbusmenuMenuitem * dbusmenu_menuitem_new_with_id (gint id) G_GNUC_WARN_UNUSED_RESULT; -guint dbusmenu_menuitem_get_id (DbusmenuMenuitem * mi); +gint dbusmenu_menuitem_get_id (DbusmenuMenuitem * mi); GList * dbusmenu_menuitem_get_children (DbusmenuMenuitem * mi); GList * dbusmenu_menuitem_take_children (DbusmenuMenuitem * mi) G_GNUC_WARN_UNUSED_RESULT; |