[Libreoffice-commits] core.git: include/LibreOfficeKit

[Pranav Kant]

 include/LibreOfficeKit/LibreOfficeKitGtk.h |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 84bfe584e4bd03a7b6e2c1e68c65bf99ae83c839
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Tue Oct 18 17:27:00 2016 +0530

    tdf#102511: Add (allow-none) for backward GI compatibility
    
    (allow-none), though deprecated since GI 1.42, is required to
    maintain the backward compatibility since (nullable), added in
    GI 1.42, is not understood by GI tools < 1.42 preventing the
    clients from passing a null parameter to various functions in the
    widget.
    
    We can remove this deprecated (allow-none) annotation once we
    bump the GI version in LibreOffice to atleast 1.42
    
    Change-Id: I98a1f3d2205ec5afd8060f16e69c5f938f229e26

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index cb96f20..a2312d6 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -42,7 +42,7 @@ GType                          lok_doc_view_get_type               (void) G_GNUC
 
 /**
  * lok_doc_view_new:
- * @pPath: (nullable): LibreOffice install path. Pass null to set it to default
+ * @pPath: (nullable): (allow-none): LibreOffice install path. Pass null to set it to default
  * path which in most cases would be $libdir/libreoffice/program
  * @cancellable: The cancellable object that you can use to cancel this
  * operation.
@@ -56,9 +56,9 @@ GtkWidget*                     lok_doc_view_new                    (const gchar*
 
 /**
  * lok_doc_view_new_from_user_profile:
- * @pPath: (nullable): LibreOffice install path. Pass null to set it to default
+ * @pPath: (nullable): (allow-none): LibreOffice install path. Pass null to set it to default
  * path which in most cases would be $libdir/libreoffice/program
- * @pUserProfile: (nullable): User profile URL. Must be either a file URL or a
+ * @pUserProfile: (nullable): (allow-none): User profile URL. Must be either a file URL or a
  * special vnd.sun.star.pathname URL. Pass non-null to be able to use this
  * widget and LibreOffice itself in parallel.
  * @cancellable: The cancellable object that you can use to cancel this
@@ -75,7 +75,7 @@ GtkWidget*                     lok_doc_view_new_from_user_profile  (const gchar*
 /**
  * lok_doc_view_new_from_widget:
  * @pDocView: The #LOKDocView instance
- * @pRenderingArguments: (nullable): lok::Document::initializeForRendering() arguments.
+ * @pRenderingArguments: (nullable): (allow-none): lok::Document::initializeForRendering() arguments.
  *
  * Returns: (transfer none): The #LOKDocView widget instance.
  */
@@ -86,7 +86,7 @@ GtkWidget*                     lok_doc_view_new_from_widget        (LOKDocView*
  * lok_doc_view_open_document:
  * @pDocView: The #LOKDocView instance
  * @pPath: (transfer full): The path of the document that #LOKDocView widget should try to open
- * @pRenderingArguments: (nullable): lok::Document::initializeForRendering() arguments.
+ * @pRenderingArguments: (nullable): (allow-none): lok::Document::initializeForRendering() arguments.
  * @cancellable:
  * @callback:
  * @userdata:
@@ -309,7 +309,7 @@ gboolean                        lok_doc_view_paste                 (LOKDocView*
  * lok_doc_view_set_document_password:
  * @pDocView: The #LOKDocView instance
  * @pUrl: the URL of the document to set password for, as sent with signal `password-required`
- * @pPassword: (nullable): the password, NULL for no password
+ * @pPassword: (nullable): (allow-none): the password, NULL for no password
  *
  * Set the password for password protected documents
  */