[california/wip/725764-ics] Binding fixes

[Jim Nelson <jnelson src gnome org>]

commit adce880f729227349efd9c268944c1a8359b1d82
Author: Jim Nelson <jim yorba org>
Date:   Mon Apr 14 19:30:24 2014 -0700

    Binding fixes

 vapi/libecal-1.2.vapi                 |   20 ++++++++++----------
 vapi/libecal-1.2/libecal-1.2.metadata |    5 ++++-
 2 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi
index e6b8807..f49e3f9 100644
--- a/vapi/libecal-1.2.vapi
+++ b/vapi/libecal-1.2.vapi
@@ -48,7 +48,7 @@ namespace E {
                public async bool get_object_list_as_comps (string sexp, GLib.Cancellable? cancellable) 
throws GLib.Error;
                public bool get_object_list_as_comps_sync (string sexp, GLib.SList out_ecalcomps, 
GLib.Cancellable? cancellable) throws GLib.Error;
                public bool get_object_list_sync (string sexp, GLib.SList out_icalcomps, GLib.Cancellable? 
cancellable) throws GLib.Error;
-               public bool get_object_sync (string uid, string rid, out unowned iCal.icalcomponent 
out_icalcomp, GLib.Cancellable? cancellable) throws GLib.Error;
+               public bool get_object_sync (string uid, string? rid, out iCal.icalcomponent out_icalcomp, 
GLib.Cancellable? cancellable) throws GLib.Error;
                public async bool get_objects_for_uid (string uid, GLib.Cancellable? cancellable) throws 
GLib.Error;
                public bool get_objects_for_uid_sync (string uid, GLib.SList out_ecalcomps, GLib.Cancellable? 
cancellable) throws GLib.Error;
                public E.CalClientSourceType get_source_type ();
@@ -339,15 +339,6 @@ namespace E {
                MODIFIED,
                DELETED
        }
-       [CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_CLIENT_ERROR_", has_type_id = false)]
-       public enum CalClientError {
-               NO_SUCH_CALENDAR,
-               OBJECT_NOT_FOUND,
-               INVALID_OBJECT,
-               UNKNOWN_USER,
-               OBJECT_ID_ALREADY_EXISTS,
-               INVALID_RANGE
-       }
        [CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_CLIENT_SOURCE_TYPE_")]
        public enum CalClientSourceType {
                EVENTS,
@@ -536,6 +527,15 @@ namespace E {
                Journal,
                AnyType
        }
+       [CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_CLIENT_ERROR_")]
+       public errordomain CalClientError {
+               NO_SUCH_CALENDAR,
+               OBJECT_NOT_FOUND,
+               INVALID_OBJECT,
+               UNKNOWN_USER,
+               OBJECT_ID_ALREADY_EXISTS,
+               INVALID_RANGE
+       }
        [CCode (cheader_filename = "libecal/libecal.h", instance_pos = 3.9)]
        public delegate bool CalRecurInstanceFn (E.CalComponent comp, time_t instance_start, time_t 
instance_end);
        [CCode (cheader_filename = "libecal/libecal.h")]
diff --git a/vapi/libecal-1.2/libecal-1.2.metadata b/vapi/libecal-1.2/libecal-1.2.metadata
index d68e0c8..9756b90 100644
--- a/vapi/libecal-1.2/libecal-1.2.metadata
+++ b/vapi/libecal-1.2/libecal-1.2.metadata
@@ -37,6 +37,8 @@ e_cal_client_discard_alarm_sync.cancellable nullable="1"
 
 e_cal_client_error_create transfer_ownership="1"
 
+ECalClientError errordomain="1"
+
 e_cal_client_free_ecalcomp_slist.ecalcomps type_arguments="E.CalComponent"
 e_cal_client_free_icalcomp_slist.ecalcomps type_arguments="iCal.CalComponent"
 
@@ -86,8 +88,9 @@ e_cal_client_get_object_list_as_comps_sync.ecalcomps is_out="1" value_owned="1"
 e_cal_client_get_object_list_sync.icalcomps is_out="1" value_owned="1" type_arguments="iCal.icalcomponent"
 e_cal_client_get_object_list_sync.cancellable nullable="1"
 
-e_cal_client_get_object_sync.icalcomp value_owned="1"
+e_cal_client_get_object_sync.out_icalcomp value_owned="1"
 e_cal_client_get_object_sync.cancellable nullable="1"
+e_cal_client_get_object_sync.rid nullable="1"
 
 e_cal_client_get_objects_for_uid async="1"
 e_cal_client_get_objects_for_uid.cancellable nullable="1"