c346b19dd9
"nullable" for introspection, since it isn't available on SLE12 version of gobject-introspection (bsc#1000102). OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=434
72 lines
3.5 KiB
Diff
72 lines
3.5 KiB
Diff
From 84bfe584e4bd03a7b6e2c1e68c65bf99ae83c839 Mon Sep 17 00:00:00 2001
|
|
From: Pranav Kant <pranavk@collabora.co.uk>
|
|
Date: Tue, 18 Oct 2016 17:27:00 +0530
|
|
Subject: 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
|
|
*/
|
|
--
|
|
cgit v0.10.2
|
|
|