* New upstream release.

  * Fix annotations for GIR scanner

5 files changed, 80 insertions, 68 deletions

diff --git a/configure b/configure
index 549e682..0e314e4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for libdbusmenu 0.3.0.
+# Generated by GNU Autoconf 2.65 for libdbusmenu 0.3.1.
 #
 # Report bugs to <ted@canonical.com>.
 #
@@ -703,8 +703,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libdbusmenu'
 PACKAGE_TARNAME='libdbusmenu'
-PACKAGE_VERSION='0.3.0'
-PACKAGE_STRING='libdbusmenu 0.3.0'
+PACKAGE_VERSION='0.3.1'
+PACKAGE_STRING='libdbusmenu 0.3.1'
 PACKAGE_BUGREPORT='ted@canonical.com'
 PACKAGE_URL=''
 
@@ -1494,7 +1494,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libdbusmenu 0.3.0 to adapt to many kinds of systems.
+\`configure' configures libdbusmenu 0.3.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1564,7 +1564,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libdbusmenu 0.3.0:";;
+     short | recursive ) echo "Configuration of libdbusmenu 0.3.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1685,7 +1685,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libdbusmenu configure 0.3.0
+libdbusmenu configure 0.3.1
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2058,7 +2058,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libdbusmenu $as_me 0.3.0, which was
+It was created by libdbusmenu $as_me 0.3.1, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2872,7 +2872,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=libdbusmenu
- VERSION=0.3.0
+ VERSION=0.3.1
 
 
 # Some tools Automake needs.
@@ -13852,7 +13852,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libdbusmenu $as_me 0.3.0, which was
+This file was extended by libdbusmenu $as_me 0.3.1, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13918,7 +13918,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libdbusmenu config.status 0.3.0
+libdbusmenu config.status 0.3.1
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index d6c7d51..33ad44d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.3.0, ted@canonical.com)
+AC_INIT(libdbusmenu, 0.3.1, ted@canonical.com)
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.3.0, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.3.1, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
diff --git a/debian/changelog b/debian/changelog
index 869b894..107d641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.3.1-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    * Fix annotations for GIR scanner
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 04 Jun 2010 14:39:37 -0500
+
 libdbusmenu (0.3.0-0ubuntu1~ppa1) lucid; urgency=low
 
   * New upstream release.
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 6a3c4bc..93c7d38 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1199,7 +1199,7 @@ dbusmenu_menuitem_get_root (DbusmenuMenuitem * mi)
 /**
 	dbusmenu_menuitem_buildxml:
 	@mi: #DbusmenuMenuitem to represent in XML
-	@array: A list of string that will be turned into an XML file
+	@array: (element-type utf8): A list of string that will be turned into an XML file
 
 	This function will add strings to the array @array.  It will put
 	at least one entry if this menu item has no children.  If it has
@@ -1247,7 +1247,7 @@ foreach_helper (gpointer data, gpointer user_data)
 	dbusmenu_menuitem_foreach:
 	@mi: The #DbusmenItem to start from
 	@func: Function to call on every node in the tree
-	@data: User data to pass to the function
+	@data: (closure): User data to pass to the function
 
 	This calls the function @func on this menu item and all
 	of the children of this item.  And their children.  And
@@ -1305,7 +1305,7 @@ dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, const
 	dbusmenu_menuitem_send_about_to_show:
 	@mi: The #DbusmenuMenuitem to send the signal on.
 	@cb: Callback to call when the call has returned.
-	@cb_data: Data to pass to the callback.
+	@cb_data: (closure): Data to pass to the callback.
 
 	This function is used to send the even that the submenu
 	of this item is about to be shown.  Callers to this event
diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index e5b5ae2..b04bba8 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -69,15 +69,15 @@ G_BEGIN_DECLS
 #define DBUSMENU_MENUITEM_ICON_NAME_BLANK            "blank-icon"
 
 /**
-	DbusmenuMenuitem:
-
-	This is the #GObject based object that represents a menu
-	item.  It gets created the same on both the client and
-	the server side and libdbusmenu-glib does the work of making
-	this object model appear on both sides of DBus.  Simple
-	really, though through updates and people coming on and off
-	the bus it can lead to lots of fun complex scenarios.
-*/
+ * DbusmenuMenuitem:
+ * 
+ * This is the #GObject based object that represents a menu
+ * item.  It gets created the same on both the client and
+ * the server side and libdbusmenu-glib does the work of making
+ * this object model appear on both sides of DBus.  Simple
+ * really, though through updates and people coming on and off
+ * the bus it can lead to lots of fun complex scenarios.
+ */
 typedef struct _DbusmenuMenuitem      DbusmenuMenuitem;
 struct _DbusmenuMenuitem
 {
@@ -85,36 +85,41 @@ struct _DbusmenuMenuitem
 };
 
 /**
-	dbusmenu_menuitem_about_to_show_cb:
-	@mi Menu item that should be shown
-	@user_data Extra user data sent with the function
-
-	Callback prototype for a callback that is called when the
-	menu should be shown.
-*/
+ * dbusmenu_menuitem_about_to_show_cb:
+ * @mi: Menu item that should be shown
+ * @user_data: (closure): Extra user data sent with the function
+ * 
+ * Callback prototype for a callback that is called when the
+ * menu should be shown.
+ */
 typedef void (*dbusmenu_menuitem_about_to_show_cb) (DbusmenuMenuitem * mi, gpointer user_data);
 
+/**
+ * dbusmenu_menuitem_buildxml_slot_t:
+ * @mi: (in): Menu item that should be built from
+ * @stringarray: (inout) (transfer none) (array) (element-type utf8): An array of strings that can be combined into an XML file.
+ * 
+ * This is the function that is called to represent this menu item
+ * as an XML fragment.  Should call it's own children.
+ */
+typedef void (*dbusmenu_menuitem_buildxml_slot_t) (DbusmenuMenuitem * mi, GPtrArray* stringarray);
 
 /**
-	DbusmenuMenuitemClass:
-	@property_changed: Slot for #DbusmenuMenuitem::property-changed.
-	@item_activated: Slot for #DbusmenuMenuitem::item-activated.
-	@child_added: Slot for #DbusmenuMenuitem::child-added.
-	@child_removed: Slot for #DbusmenuMenuitem::child-removed.
-	@child_moved: Slot for #DbusmenuMenuitem::child-moved.
-	@realized: Slot for #DbusmenuMenuitem::realized.
-	@buildxml: Virtual function that appends the strings required
-	           to represent this menu item in the menu XML file.
-	@handle_event: This function is to override how events are handled
-			by subclasses.  Look at #dbusmenu_menuitem_handle_event for
-			lots of good information.
-	@send_about_to_show: Virtual function that notifies server that the
-			client is about to show a menu.
-	@reserved1: Reserved for future use.
-	@reserved2: Reserved for future use.
-	@reserved3: Reserved for future use.
-	@reserved4: Reserved for future use.
-*/
+ * DbusmenuMenuitemClass:
+ * @property_changed: Slot for #DbusmenuMenuitem::property-changed.
+ * @item_activated: Slot for #DbusmenuMenuitem::item-activated.
+ * @child_added: Slot for #DbusmenuMenuitem::child-added.
+ * @child_removed: Slot for #DbusmenuMenuitem::child-removed.
+ * @child_moved: Slot for #DbusmenuMenuitem::child-moved.
+ * @realized: Slot for #DbusmenuMenuitem::realized.
+ * @buildxml: Virtual function that appends the strings required to represent this menu item in the menu XML file.
+ * @handle_event: This function is to override how events are handled by subclasses.  Look at #dbusmenu_menuitem_handle_event for lots of good information.
+ * @send_about_to_show: Virtual function that notifies server that the client is about to show a menu.
+ * @reserved1: Reserved for future use.
+ * @reserved2: Reserved for future use.
+ * @reserved3: Reserved for future use.
+ * @reserved4: Reserved for future use.
+ */
 typedef struct _DbusmenuMenuitemClass DbusmenuMenuitemClass;
 struct _DbusmenuMenuitemClass
 {
@@ -129,7 +134,7 @@ struct _DbusmenuMenuitemClass
 	void (*realized) (void);
 
 	/* Virtual functions */
-	void (*buildxml) (GPtrArray * stringarray);
+	dbusmenu_menuitem_buildxml_slot_t buildxml;
 	void (*handle_event) (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
 	void (*send_about_to_show) (DbusmenuMenuitem * mi, dbusmenu_menuitem_about_to_show_cb cb, gpointer cb_data);
 
@@ -179,23 +184,23 @@ void dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name,
 void dbusmenu_menuitem_send_about_to_show (DbusmenuMenuitem * mi, dbusmenu_menuitem_about_to_show_cb cb, gpointer cb_data);
 
 /**
-	SECTION:menuitem
-	@short_description: A lowlevel represenation of a menuitem
-	@stability: Unstable
-	@include: libdbusmenu-glib/menuitem.h
-
-	A #DbusmenuMenuitem is the lowest level of represenation of a
-	single item in a menu.  It gets created on the server side
-	and copied over to the client side where it gets rendered.  As
-	the server starts to change it, and grow it, and do all kinds
-	of fun stuff that information is transfered over DBus and the
-	client updates it's understanding of the object model.
-
-	Most people using either the client or the server should be
-	able to deal mostly with #DbusmenuMenuitem objects.  These
-	are simple, but then they can be attached to more complex
-	objects and handled appropriately.
-*/
+ * SECTION:menuitem
+ * @short_description: A lowlevel represenation of a menuitem
+ * @stability: Unstable
+ * @include: libdbusmenu-glib/menuitem.h
+ * 
+ * A #DbusmenuMenuitem is the lowest level of represenation of a
+ * single item in a menu.  It gets created on the server side
+ * and copied over to the client side where it gets rendered.  As
+ * the server starts to change it, and grow it, and do all kinds
+ * of fun stuff that information is transfered over DBus and the
+ * client updates it's understanding of the object model.
+ * 
+ * Most people using either the client or the server should be
+ * able to deal mostly with #DbusmenuMenuitem objects.  These
+ * are simple, but then they can be attached to more complex
+ * objects and handled appropriately.
+ */
 
 G_END_DECLS