[Xfce4-commits] <xfce4-vala:master> Update garcon-1 package

[Mike Massonnet]

Updating branch refs/heads/master
         to dd1689a0b5b1a37476f817564499c7ac9096b2a3 (commit)
       from 35b7eeaf00301c0bf2fe6ac327d7b27c6c47ed87 (commit)

commit dd1689a0b5b1a37476f817564499c7ac9096b2a3
Author: Mike Massonnet <mmassonnet at gmail.com>
Date:   Sat Oct 20 19:06:39 2012 +0200

    Update garcon-1 package
    
    Garcon.Menu.load(cancellable?), cancellable can be null.

 packages/garcon-1/garcon-1.gi       |    4 ++--
 packages/garcon-1/garcon-1.metadata |    1 +
 vapi/garcon-1.vapi                  |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/garcon-1/garcon-1.gi b/packages/garcon-1/garcon-1.gi
index 91e6bc7..1247f33 100644
--- a/packages/garcon-1/garcon-1.gi
+++ b/packages/garcon-1/garcon-1.gi
@@ -1011,8 +1011,8 @@
 			</vfunc>
 		</interface>
 		<constant name="GARCON_MAJOR_VERSION" type="int" value="0"/>
-		<constant name="GARCON_MICRO_VERSION" type="int" value="10"/>
-		<constant name="GARCON_MINOR_VERSION" type="int" value="1"/>
+		<constant name="GARCON_MICRO_VERSION" type="int" value="0"/>
+		<constant name="GARCON_MINOR_VERSION" type="int" value="2"/>
 		<union name="GarconMenuNodeData">
 		</union>
 	</namespace>
diff --git a/packages/garcon-1/garcon-1.metadata b/packages/garcon-1/garcon-1.metadata
index 04fc4ad..4158c28 100644
--- a/packages/garcon-1/garcon-1.metadata
+++ b/packages/garcon-1/garcon-1.metadata
@@ -1,3 +1,4 @@
 Garcon cheader_filename="garcon/garcon.h"
 garcon_menu_item_requires_terminal hidden="1"
 garcon_menu_item_supports_startup_notification hidden="1"
+garcon_menu_load.cancellable nullable="1"
diff --git a/vapi/garcon-1.vapi b/vapi/garcon-1.vapi
index 7bd56ed..414f8b5 100644
--- a/vapi/garcon-1.vapi
+++ b/vapi/garcon-1.vapi
@@ -18,7 +18,7 @@ namespace Garcon {
 		public unowned Garcon.Menu get_menu_with_name (string name);
 		public unowned GLib.List get_menus ();
 		public unowned Garcon.Menu get_parent ();
-		public bool load (GLib.Cancellable cancellable) throws GLib.Error;
+		public bool load (GLib.Cancellable? cancellable) throws GLib.Error;
 		[NoAccessorMethod]
 		public Garcon.MenuDirectory directory { owned get; set; }
 		public GLib.File file { get; construct; }