libical-glib: Get rid of all the allow-none annotations

allow-none has been deprecated and replaced by either nullable or optional.

12 files changed, 63 insertions, 64 deletions

diff --git a/src/libical-glib/api/i-cal-array.xml b/src/libical-glib/api/i-cal-array.xml
index 48edff92..bd7641da 100644
--- a/src/libical-glib/api/i-cal-array.xml
+++ b/src/libical-glib/api/i-cal-array.xml
@@ -54,7 +54,7 @@
     <method name="i_cal_array_element_at" corresponds="icalarray_element_at" annotation="skip" kind="private" since="1.0">
         <parameter type="ICalArray *" name="array" comment="The #ICalArray to be queried"/>
         <parameter type="gint" name="position" comment="The position the target element is located"/>
-        <returns type="GObject *" annotation="transfer none, allow-none" comment="The element located at the @position in the @array"/>
+        <returns type="GObject *" annotation="transfer none, nullable" comment="The element located at the @position in the @array"/>
         <comment xml:space="preserve">Gets the element located in the @position in the @array. NULL if position if out of bound.</comment>
     </method>
     <method name="i_cal_array_sort" corresponds="CUSTOM" annotation="skip" kind="others" since="1.0">
diff --git a/src/libical-glib/api/i-cal-attach.xml b/src/libical-glib/api/i-cal-attach.xml
index 8d3582d8..d361ee81 100644
--- a/src/libical-glib/api/i-cal-attach.xml
+++ b/src/libical-glib/api/i-cal-attach.xml
@@ -21,8 +21,8 @@
     </method>
     <method name="i_cal_attach_new_from_data" corresponds="CUSTOM" kind="constructor" since="1.0">
         <parameter type="const gchar *" name="data" comment="The data used to create the #ICalAttach"/>
-        <parameter type="GFunc" name="free_fn" translator="(icalattach_free_fn_t)" annotation="scope call, allow-none" comment="The function used to free the data when the create #ICalAttach is destroyed"/>
-        <parameter type="void *" name="free_fn_data" annotation="allow-none" comment="The userdata used for the free function @free_fn"/>
+        <parameter type="GFunc" name="free_fn" translator="(icalattach_free_fn_t)" annotation="scope call, nullable" comment="The function used to free the data when the create #ICalAttach is destroyed"/>
+        <parameter type="void *" name="free_fn_data" annotation="nullable" comment="The userdata used for the free function @free_fn"/>
         <returns type="ICalAttach *" annotation="transfer full" comment="The newly created #ICalAttach" />
         <comment xml:space="preserve">Creates a new #ICalAttach from the data.</comment>
         <custom>    g_return_val_if_fail (data != NULL, NULL);
@@ -62,7 +62,7 @@ static void unref_g_bytes(char *data, void *user_data)
     </method>
     <method name="i_cal_attach_get_url" corresponds="icalattach_get_url" kind="others" since="1.0">
         <parameter type="ICalAttach *" name="attach" comment="The #ICalAttach to be queried"/>
-        <returns type="const gchar *" annotation="allow-none, transfer none" comment="The url component of the @attach. %NULL if it is built from data or there is an error." />
+        <returns type="const gchar *" annotation="nullable, transfer none" comment="The url component of the @attach. %NULL if it is built from data or there is an error." />
         <comment xml:space="preserve">Gets the url, if the #ICalAttach is built from the url.</comment>
     </method>
     <method name="i_cal_attach_get_data" corresponds="CUSTOM" kind="others" since="1.0">
diff --git a/src/libical-glib/api/i-cal-component.xml b/src/libical-glib/api/i-cal-component.xml
index bb262dde..ad55c043 100644
--- a/src/libical-glib/api/i-cal-component.xml
+++ b/src/libical-glib/api/i-cal-component.xml
@@ -550,7 +550,7 @@ static void foreach_recurrence_cb(icalcomponent *in_comp, struct icaltime_span *
     <method name="i_cal_component_get_timezone" corresponds="icalcomponent_get_timezone" kind="get" since="1.0">
         <parameter type="ICalComponent *" name="comp" comment="A #ICalComponent"/>
         <parameter type="const gchar *" name="tzid" comment="A string representing timezone"/>
-        <returns type="ICalTimezone *" annotation="transfer full, allow-none" translator_argus="(GObject *)comp, FALSE" comment="A #ICalTimezone."/>
+        <returns type="ICalTimezone *" annotation="transfer full, nullable" translator_argus="(GObject *)comp, FALSE" comment="A #ICalTimezone."/>
         <comment xml:space="preserve">Returns the icaltimezone in the component corresponding to the TZID, or NULL if it can't be found.</comment>
     </method>
     <method name="i_cal_property_recurrence_is_excluded" corresponds="icalproperty_recurrence_is_excluded" since="1.0">
diff --git a/src/libical-glib/api/i-cal-derived-parameter.xml b/src/libical-glib/api/i-cal-derived-parameter.xml
index 1a309e4a..54122a0d 100644
--- a/src/libical-glib/api/i-cal-derived-parameter.xml
+++ b/src/libical-glib/api/i-cal-derived-parameter.xml
@@ -247,7 +247,7 @@
     </method>
     <method name="i_cal_parameter_get_altrep" corresponds="icalparameter_get_altrep" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_altrep" corresponds="icalparameter_set_altrep" kind="set" since="1.0">
@@ -262,7 +262,7 @@
     </method>
     <method name="i_cal_parameter_get_charset" corresponds="icalparameter_get_charset" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_charset" corresponds="icalparameter_set_charset" kind="set" since="1.0">
@@ -277,7 +277,7 @@
     </method>
     <method name="i_cal_parameter_get_cn" corresponds="icalparameter_get_cn" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_cn" corresponds="icalparameter_set_cn" kind="set" since="1.0">
@@ -292,7 +292,7 @@
     </method>
     <method name="i_cal_parameter_get_cutype" corresponds="icalparameter_get_cutype" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="ICalParameterCutype" annotation="allow-none" comment="The property of the @value" />
+        <returns type="ICalParameterCutype" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_cutype" corresponds="icalparameter_set_cutype" kind="set" since="1.0">
@@ -307,7 +307,7 @@
     </method>
     <method name="i_cal_parameter_get_delegatedfrom" corresponds="icalparameter_get_delegatedfrom" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_delegatedfrom" corresponds="icalparameter_set_delegatedfrom" kind="set" since="1.0">
@@ -322,7 +322,7 @@
     </method>
     <method name="i_cal_parameter_get_delegatedto" corresponds="icalparameter_get_delegatedto" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_delegatedto" corresponds="icalparameter_set_delegatedto" kind="set" since="1.0">
@@ -337,7 +337,7 @@
     </method>
     <method name="i_cal_parameter_get_dir" corresponds="icalparameter_get_dir" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_dir" corresponds="icalparameter_set_dir" kind="set" since="1.0">
@@ -397,7 +397,7 @@
     </method>
     <method name="i_cal_parameter_get_filename" corresponds="icalparameter_get_filename" kind="get" since="2.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_filename" corresponds="icalparameter_set_filename" kind="set" since="2.0">
@@ -412,7 +412,7 @@
     </method>
     <method name="i_cal_parameter_get_fmttype" corresponds="icalparameter_get_fmttype" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_fmttype" corresponds="icalparameter_set_fmttype" kind="set" since="1.0">
@@ -427,7 +427,7 @@
     </method>
     <method name="i_cal_parameter_get_iana" corresponds="icalparameter_get_iana" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_iana" corresponds="icalparameter_set_iana" kind="set" since="1.0">
@@ -442,7 +442,7 @@
     </method>
     <method name="i_cal_parameter_get_id" corresponds="icalparameter_get_id" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_id" corresponds="icalparameter_set_id" kind="set" since="1.0">
@@ -457,7 +457,7 @@
     </method>
     <method name="i_cal_parameter_get_language" corresponds="icalparameter_get_language" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_language" corresponds="icalparameter_set_language" kind="set" since="1.0">
@@ -472,7 +472,7 @@
     </method>
     <method name="i_cal_parameter_get_latency" corresponds="icalparameter_get_latency" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_latency" corresponds="icalparameter_set_latency" kind="set" since="1.0">
@@ -502,7 +502,7 @@
     </method>
     <method name="i_cal_parameter_get_localize" corresponds="icalparameter_get_localize" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_localize" corresponds="icalparameter_set_localize" kind="set" since="1.0">
@@ -517,7 +517,7 @@
     </method>
     <method name="i_cal_parameter_get_managedid" corresponds="icalparameter_get_managedid" kind="get" since="2.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_managedid" corresponds="icalparameter_set_managedid" kind="set" since="2.0">
@@ -532,7 +532,7 @@
     </method>
     <method name="i_cal_parameter_get_member" corresponds="icalparameter_get_member" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_member" corresponds="icalparameter_set_member" kind="set" since="1.0">
@@ -547,7 +547,7 @@
     </method>
     <method name="i_cal_parameter_get_modified" corresponds="icalparameter_get_modified" kind="get" since="2.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_modified" corresponds="icalparameter_set_modified" kind="set" since="2.0">
@@ -562,7 +562,7 @@
     </method>
     <method name="i_cal_parameter_get_options" corresponds="icalparameter_get_options" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_options" corresponds="icalparameter_set_options" kind="set" since="1.0">
@@ -592,7 +592,7 @@
     </method>
     <method name="i_cal_parameter_get_publiccomment" corresponds="icalparameter_get_publiccomment" kind="get" since="2.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_publiccomment" corresponds="icalparameter_set_publiccomment" kind="set" since="2.0">
@@ -622,7 +622,7 @@
     </method>
     <method name="i_cal_parameter_get_reason" corresponds="icalparameter_get_reason" kind="get" since="2.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_reason" corresponds="icalparameter_set_reason" kind="set" since="2.0">
@@ -757,7 +757,7 @@
     </method>
     <method name="i_cal_parameter_get_schedulestatus" corresponds="icalparameter_get_schedulestatus" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_schedulestatus" corresponds="icalparameter_set_schedulestatus" kind="set" since="1.0">
@@ -772,7 +772,7 @@
     </method>
     <method name="i_cal_parameter_get_sentby" corresponds="icalparameter_get_sentby" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_sentby" corresponds="icalparameter_set_sentby" kind="set" since="1.0">
@@ -787,7 +787,7 @@
     </method>
     <method name="i_cal_parameter_get_size" corresponds="icalparameter_get_size" kind="get" since="2.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_size" corresponds="icalparameter_set_size" kind="set" since="2.0">
@@ -832,7 +832,7 @@
     </method>
     <method name="i_cal_parameter_get_tzid" corresponds="icalparameter_get_tzid" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_tzid" corresponds="icalparameter_set_tzid" kind="set" since="1.0">
@@ -862,7 +862,7 @@
     </method>
     <method name="i_cal_parameter_get_x" corresponds="icalparameter_get_x" kind="get" since="1.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_x" corresponds="icalparameter_set_x" kind="set" since="1.0">
diff --git a/src/libical-glib/api/i-cal-derived-value.xml b/src/libical-glib/api/i-cal-derived-value.xml
index aa58a233..5f965756 100644
--- a/src/libical-glib/api/i-cal-derived-value.xml
+++ b/src/libical-glib/api/i-cal-derived-value.xml
@@ -210,7 +210,7 @@
 	</method>
 	<method name="i_cal_value_get_x" corresponds="icalvalue_get_x" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="const gchar *" annotation="allow-none, transfer none" comment="The x within #ICalValue"/>
+		<returns type="const gchar *" annotation="nullable, transfer none" comment="The x within #ICalValue"/>
 		<comment>Gets the x of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_recur" corresponds="icalvalue_set_recur" kind="set" since="1.0">
@@ -225,7 +225,7 @@
 	</method>
 	<method name="i_cal_value_get_recur" corresponds="icalvalue_get_recur" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="ICalRecurrence *" annotation="allow-none, transfer full" comment="The recur within #ICalValue"/>
+		<returns type="ICalRecurrence *" annotation="nullable, transfer full" comment="The recur within #ICalValue"/>
 		<comment>Gets the recur of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_trigger" corresponds="icalvalue_set_trigger" kind="set" since="1.0">
@@ -240,7 +240,7 @@
 	</method>
 	<method name="i_cal_value_get_trigger" corresponds="icalvalue_get_trigger" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="ICalTrigger *" annotation="allow-none, transfer full" comment="The trigger within #ICalValue"/>
+		<returns type="ICalTrigger *" annotation="nullable, transfer full" comment="The trigger within #ICalValue"/>
 		<comment>Gets the trigger of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_datetime" corresponds="icalvalue_set_datetime" kind="set" since="1.0">
@@ -255,7 +255,7 @@
 	</method>
 	<method name="i_cal_value_get_datetime" corresponds="icalvalue_get_datetime" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="ICalTime *" annotation="allow-none, transfer full" comment="The datetime within #ICalValue"/>
+		<returns type="ICalTime *" annotation="nullable, transfer full" comment="The datetime within #ICalValue"/>
 		<comment>Gets the datetime of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_datetimedate" corresponds="icalvalue_set_datetimedate" kind="set" since="3.0">
@@ -270,7 +270,7 @@
 	</method>
 	<method name="i_cal_value_get_datetimedate" corresponds="icalvalue_get_datetimedate" kind="get" since="3.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="ICalTime *" annotation="allow-none, transfer full" comment="The datetimedate within #ICalValue"/>
+		<returns type="ICalTime *" annotation="nullable, transfer full" comment="The datetimedate within #ICalValue"/>
 		<comment>Gets the datetimedate (DATE-TIME or DATE) of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_datetimeperiod" corresponds="icalvalue_set_datetimeperiod" kind="set" since="1.0">
@@ -285,7 +285,7 @@
 	</method>
 	<method name="i_cal_value_get_datetimeperiod" corresponds="icalvalue_get_datetimeperiod" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="ICalDatetimeperiod *" annotation="allow-none, transfer full" comment="The datetimeperiod within #ICalValue"/>
+		<returns type="ICalDatetimeperiod *" annotation="nullable, transfer full" comment="The datetimeperiod within #ICalValue"/>
 		<comment>Gets the datetimeperiod of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_geo" corresponds="icalvalue_set_geo" kind="set" since="1.0">
@@ -300,7 +300,7 @@
 	</method>
 	<method name="i_cal_value_get_geo" corresponds="icalvalue_get_geo" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="ICalGeo *" annotation="allow-none, transfer full" comment="The geo within #ICalValue"/>
+		<returns type="ICalGeo *" annotation="nullable, transfer full" comment="The geo within #ICalValue"/>
 		<comment>Gets the geo of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_attach" corresponds="icalvalue_set_attach" kind="set" since="1.0">
@@ -315,7 +315,7 @@
 	</method>
 	<method name="i_cal_value_get_attach" corresponds="icalvalue_get_attach" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="ICalAttach *" annotation="allow-none, transfer none" translator_argus="(GObject *)value" comment="The attach within #ICalValue"/>
+		<returns type="ICalAttach *" annotation="nullable, transfer none" translator_argus="(GObject *)value" comment="The attach within #ICalValue"/>
 		<comment>Gets the attach of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_reset_kind" corresponds="icalvalue_reset_kind" kind="other" since="1.0">
@@ -454,7 +454,7 @@
 	</method>
 	<method name="i_cal_value_get_caladdress" corresponds="icalvalue_get_caladdress" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="const gchar *" annotation="allow-none, transfer none" comment="The caladdress within #ICalValue"/>
+		<returns type="const gchar *" annotation="nullable, transfer none" comment="The caladdress within #ICalValue"/>
 		<comment>Gets the caladdress of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_period" corresponds="icalvalue_set_period" kind="set" since="1.0">
@@ -469,7 +469,7 @@
 	</method>
 	<method name="i_cal_value_get_period" corresponds="icalvalue_get_period" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="ICalPeriod *" annotation="allow-none, transfer full" comment="The period within #ICalValue"/>
+		<returns type="ICalPeriod *" annotation="nullable, transfer full" comment="The period within #ICalValue"/>
 		<comment>Gets the period of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_status" corresponds="icalvalue_set_status" kind="set" since="1.0">
@@ -499,7 +499,7 @@
 	</method>
 	<method name="i_cal_value_get_binary" corresponds="icalvalue_get_binary" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="const gchar *" annotation="allow-none, transfer none" comment="The binary within #ICalValue"/>
+		<returns type="const gchar *" annotation="nullable, transfer none" comment="The binary within #ICalValue"/>
 		<comment>Gets the binary of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_text" corresponds="icalvalue_set_text" kind="set" since="1.0">
@@ -514,7 +514,7 @@
 	</method>
 	<method name="i_cal_value_get_text" corresponds="icalvalue_get_text" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="const gchar *" annotation="allow-none, transfer none" comment="The text within #ICalValue"/>
+		<returns type="const gchar *" annotation="nullable, transfer none" comment="The text within #ICalValue"/>
 		<comment>Gets the text of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_duration" corresponds="icalvalue_set_duration" kind="set" since="1.0">
@@ -529,7 +529,7 @@
 	</method>
 	<method name="i_cal_value_get_duration" corresponds="icalvalue_get_duration" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="ICalDuration *" annotation="allow-none, transfer full" comment="The duration within #ICalValue"/>
+		<returns type="ICalDuration *" annotation="nullable, transfer full" comment="The duration within #ICalValue"/>
 		<comment>Gets the duration of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_integer" corresponds="icalvalue_set_integer" kind="set" since="1.0">
@@ -559,7 +559,7 @@
 	</method>
 	<method name="i_cal_value_get_uri" corresponds="icalvalue_get_uri" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="const gchar *" annotation="allow-none, transfer none" comment="The uri within #ICalValue"/>
+		<returns type="const gchar *" annotation="nullable, transfer none" comment="The uri within #ICalValue"/>
 		<comment>Gets the uri of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_class" corresponds="icalvalue_set_class" kind="set" since="1.0">
@@ -604,7 +604,7 @@
 	</method>
 	<method name="i_cal_value_get_query" corresponds="icalvalue_get_query" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="const gchar *" annotation="allow-none, transfer none" comment="The query within #ICalValue"/>
+		<returns type="const gchar *" annotation="nullable, transfer none" comment="The query within #ICalValue"/>
 		<comment>Gets the query of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_string" corresponds="icalvalue_set_string" kind="set" since="1.0">
@@ -619,7 +619,7 @@
 	</method>
 	<method name="i_cal_value_get_string" corresponds="icalvalue_get_string" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="const gchar *" annotation="allow-none, transfer none" comment="The string within #ICalValue"/>
+		<returns type="const gchar *" annotation="nullable, transfer none" comment="The string within #ICalValue"/>
 		<comment>Gets the string of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_transp" corresponds="icalvalue_set_transp" kind="set" since="1.0">
@@ -649,7 +649,7 @@
 	</method>
 	<method name="i_cal_value_get_requeststatus" corresponds="icalvalue_get_requeststatus" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="ICalReqstat *" annotation="allow-none, transfer full" comment="The requeststatus within #ICalValue"/>
+		<returns type="ICalReqstat *" annotation="nullable, transfer full" comment="The requeststatus within #ICalValue"/>
 		<comment>Gets the requeststatus of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_date" corresponds="icalvalue_set_date" kind="set" since="1.0">
@@ -664,7 +664,7 @@
 	</method>
 	<method name="i_cal_value_get_date" corresponds="icalvalue_get_date" kind="get" since="1.0">
 		<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried"/>
-		<returns type="ICalTime *" annotation="allow-none, transfer full" comment="The date within #ICalValue"/>
+		<returns type="ICalTime *" annotation="nullable, transfer full" comment="The date within #ICalValue"/>
 		<comment>Gets the date of #ICalValue.</comment>
 	</method>
 	<method name="i_cal_value_set_action" corresponds="icalvalue_set_action" kind="set" since="1.0">
diff --git a/src/libical-glib/api/i-cal-parameter.xml b/src/libical-glib/api/i-cal-parameter.xml
index c8bddb91..9951174a 100644
--- a/src/libical-glib/api/i-cal-parameter.xml
+++ b/src/libical-glib/api/i-cal-parameter.xml
@@ -61,7 +61,7 @@
     </method>
     <method name="i_cal_parameter_get_xname" corresponds="icalparameter_get_xname" kind="get" since="1.0">
         <parameter type="ICalParameter *" name="param" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve">Gets the xname property of the native part of the #ICalParameter.</comment>
     </method>
     <method name="i_cal_parameter_set_xvalue" corresponds="icalparameter_set_xvalue" kind="set" since="1.0">
@@ -71,7 +71,7 @@
     </method>
     <method name="i_cal_parameter_get_xvalue" corresponds="icalparameter_get_xvalue" kind="get" since="1.0">
         <parameter type="ICalParameter *" name="param" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve">Gets the xvalue property of the native part of the #ICalParameter.</comment>
     </method>
     <method name="i_cal_parameter_set_iana_name" corresponds="icalparameter_set_iana_name" kind="set" since="1.0">
@@ -81,7 +81,7 @@
     </method>
     <method name="i_cal_parameter_get_iana_name" corresponds="icalparameter_get_iana_name" kind="get" since="1.0">
         <parameter type="ICalParameter *" name="param" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve">Gets the iana_name property of the native part of the #ICalParameter.</comment>
     </method>
     <method name="i_cal_parameter_set_iana_value" corresponds="icalparameter_set_iana_value" kind="set" since="1.0">
@@ -91,7 +91,7 @@
     </method>
     <method name="i_cal_parameter_get_iana_value" corresponds="icalparameter_get_iana_value" kind="get" since="1.0">
         <parameter type="ICalParameter *" name="param" comment="The #ICalParameter to be queried"/>
-        <returns type="const gchar *" annotation="allow-none" comment="The property of the @value" />
+        <returns type="const gchar *" annotation="nullable" comment="The property of the @value" />
         <comment xml:space="preserve">Gets the iana_value property of the native part of the #ICalParameter.</comment>
     </method>
     <method name="i_cal_parameter_has_same_name" corresponds="icalparameter_has_same_name" kind="others" since="1.0">
diff --git a/src/libical-glib/api/i-cal-parser.xml b/src/libical-glib/api/i-cal-parser.xml
index 7e901de2..ede94772 100644
--- a/src/libical-glib/api/i-cal-parser.xml
+++ b/src/libical-glib/api/i-cal-parser.xml
@@ -36,13 +36,13 @@ typedef gchar *(*ICalParserLineGenFunc)(gchar *bytes, size_t size, gpointer user
     </method>
     <method name="i_cal_parser_add_line" corresponds="icalparser_add_line" since="1.0">
         <parameter type="ICalParser *" name="parser" annotation="in, transfer full" comment="The #ICalParser used to parse the string into the #ICalComponent"/>
-        <parameter type="gchar *" name="str" annotation="allow-none, transfer none" comment="A line of string representation of the #ICalComponent"/>
-        <returns type="ICalComponent *" annotation="allow-none, transfer full" translator_argus="(gpointer) parser" comment="The complete #ICalComponent."/>
+        <parameter type="gchar *" name="str" annotation="nullable, transfer none" comment="A line of string representation of the #ICalComponent"/>
+        <returns type="ICalComponent *" annotation="nullable, transfer full" translator_argus="(gpointer) parser" comment="The complete #ICalComponent."/>
         <comment xml:space="preserve">Add a line at one time into the #ICalParser until the parsing is complete and #ICalComponent will be returned.</comment>
     </method>
     <method name="i_cal_parser_clean" corresponds="icalparser_clean" since="1.0">
         <parameter type="ICalParser *" name="parser" comment="The parser to be cleaned and queried"/>
-        <returns type="ICalComponent *" annotation="allow-none, transfer full" translator_argus="(gpointer) parser" comment="The root #ICalComponent in @parser."/>
+        <returns type="ICalComponent *" annotation="nullable, transfer full" translator_argus="(gpointer) parser" comment="The root #ICalComponent in @parser."/>
         <comment xml:space="preserve">We won't get a clean exit if some components did not have an "END" tag. Clear off any component that may be left in the list.</comment>
     </method>
     <method name="i_cal_parser_get_state" corresponds="icalparser_get_state" kind="get" since="1.0">
diff --git a/src/libical-glib/api/i-cal-time.xml b/src/libical-glib/api/i-cal-time.xml
index 4a97f226..5119c977 100644
--- a/src/libical-glib/api/i-cal-time.xml
+++ b/src/libical-glib/api/i-cal-time.xml
@@ -95,7 +95,7 @@
     </method>
     <method name="i_cal_time_get_tzid" corresponds="icaltime_get_tzid" kind="get" since="1.0">
         <parameter type="const ICalTime *" name="tt" annotation="in, transfer none" comment="The #ICalTime to be queried"/>
-        <returns type="const gchar *" annotation="allow-none, transfer none" comment="The tzid of #ICalTime, or NULL if floating type" />
+        <returns type="const gchar *" annotation="nullable, transfer none" comment="The tzid of #ICalTime, or NULL if floating type" />
         <comment xml:space="preserve">Returns the tzid, or NULL for a floating time.</comment>
     </method>
     <method name="i_cal_time_day_of_year" corresponds="icaltime_day_of_year" since="1.0">
diff --git a/src/libical-glib/api/i-cal-timezone.xml b/src/libical-glib/api/i-cal-timezone.xml
index dfa4140d..0900e612 100644
--- a/src/libical-glib/api/i-cal-timezone.xml
+++ b/src/libical-glib/api/i-cal-timezone.xml
@@ -15,7 +15,7 @@
 -->
 <structure namespace="ICal" name="Timezone" native="icaltimezone" is_possible_global="true" destroy_func="i_cal_timezone_destroy">
     <method name="i_cal_timezone_new" corresponds="icaltimezone_new" kind="constructor" since="1.0">
-        <returns type="ICalTimezone *" annotation="transfer full, allow-none" translator="i_cal_timezone_new_full" translator_argus="NULL, FALSE" comment="The newly created object of the type #ICalTimezone." />
+        <returns type="ICalTimezone *" annotation="transfer full, nullable" translator="i_cal_timezone_new_full" translator_argus="NULL, FALSE" comment="The newly created object of the type #ICalTimezone." />
         <comment xml:space="preserve">The constructor of the type #ICalTimezone.</comment>
     </method>
     <method name="i_cal_timezone_destroy" corresponds="CUSTOM" annotation="skip" kind="private" since="1.0">
diff --git a/src/libical-glib/api/i-cal-value.xml b/src/libical-glib/api/i-cal-value.xml
index adfaf2a9..4418af91 100644
--- a/src/libical-glib/api/i-cal-value.xml
+++ b/src/libical-glib/api/i-cal-value.xml
@@ -78,7 +78,7 @@ be cloned."/>
     </method>
     <method name="i_cal_value_encode_ical_string" corresponds="CUSTOM" since="1.0">
         <parameter type="const gchar *" name="szText" comment="A string"/>
-        <returns type="gchar *" annotation="allow-none, transfer full" comment="The encoded string. NULL if fail."/>
+        <returns type="gchar *" annotation="nullable, transfer full" comment="The encoded string. NULL if fail."/>
         <comment xml:space="preserve">Encodes a character string in ical format, escape certain characters, etc.</comment>
         <custom>    gchar *szEncText;
     gchar *buffer = NULL;
@@ -99,7 +99,7 @@ be cloned."/>
     </method>
     <method name="i_cal_value_decode_ical_string" corresponds="CUSTOM" since="1.0">
         <parameter type="const gchar *" name="szText" comment="A string"/>
-        <returns type="gchar *" annotation="allow-none, transfer full" comment="The decoded string. NULL if fail."/>
+        <returns type="gchar *" annotation="nullable, transfer full" comment="The decoded string. NULL if fail."/>
         <comment xml:space="preserve">Extracts the original character string encoded by the above function.</comment>
         <custom>    gchar *szDecText;
     gchar *buffer = NULL;
diff --git a/src/libical-glib/i-cal-object.c.in b/src/libical-glib/i-cal-object.c.in
index c822509c..e5881bc5 100644
--- a/src/libical-glib/i-cal-object.c.in
+++ b/src/libical-glib/i-cal-object.c.in
@@ -324,7 +324,7 @@ static void i_cal_object_init(ICalObject *iobject)
  * @native: a native libical structure
  * @native_destroy_func: a function to be called on @native when it should be freed
  * @is_global_memory: whether @native is a global shared memory structure
- * @owner: (allow-none): an owner of @native
+ * @owner: (nullable): an owner of @native
  *
  * Creates an #ICalObject descendant of type @type and initialize private members
  * of it. The descendants should call this function in their _new() function, or use
@@ -586,8 +586,8 @@ void i_cal_object_set_owner(ICalObject *iobject, GObject *owner)
  * if not NULL, is referenced for thread safety. Unref it with g_object_unref
  * when done with it.
  *
- * Returns: (transfer full) (allow-none): Current owner of the libical
- *    native structure. returns NULL, when there is no owner.
+ * Returns: (transfer full) (nullable): Current owner of the libical
+ *    native structure. Returns %NULL when there is no owner.
  *
  * Since: 1.0
  **/
diff --git a/src/libical-glib/tools/generator.c b/src/libical-glib/tools/generator.c
index 609c9297..c3ef96b9 100644
--- a/src/libical-glib/tools/generator.c
+++ b/src/libical-glib/tools/generator.c
@@ -1580,8 +1580,7 @@ static gboolean annotation_contains_nullable(GList *annotations) /* gchar * */
     GList *link;
 
     for (link = annotations; link; link = g_list_next(link)) {
-        if (g_strcmp0(link->data, "allow-none") == 0 ||
-            g_strcmp0(link->data, "nullable") == 0) {
+        if (g_strcmp0(link->data, "nullable") == 0) {
               break;
         }
     }