projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] Update kdbus interface header (commit: b620b72c9127) 14/10/16
[platform/upstream/glib.git]
/
gio
/
ginitable.c
diff --git
a/gio/ginitable.c
b/gio/ginitable.c
index
9c7acfc
..
23d6069
100644
(file)
--- a/
gio/ginitable.c
+++ b/
gio/ginitable.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
@@
-87,8
+85,7
@@
g_initable_default_init (GInitableInterface *iface)
* If the object is not initialized, or initialization returns with an
* error, then all operations on the object except g_object_ref() and
* g_object_unref() are considered to be invalid, and have undefined
* If the object is not initialized, or initialization returns with an
* error, then all operations on the object except g_object_ref() and
* g_object_unref() are considered to be invalid, and have undefined
- * behaviour. See the <xref linkend="ginitable"/> section introduction
- * for more details.
+ * behaviour. See the [introduction][ginitable] for more details.
*
* Implementations of this method must be idempotent, i.e. multiple calls
* to this function with the same argument should return the same results.
*
* Implementations of this method must be idempotent, i.e. multiple calls
* to this function with the same argument should return the same results.
@@
-121,16
+118,17
@@
g_initable_init (GInitable *initable,
* @cancellable: optional #GCancellable object, %NULL to ignore.
* @error: a #GError location to store the error occurring, or %NULL to
* ignore.
* @cancellable: optional #GCancellable object, %NULL to ignore.
* @error: a #GError location to store the error occurring, or %NULL to
* ignore.
- * @first_property_name: the name of the first property, or %NULL if no
+ * @first_property_name:
(allow-none):
the name of the first property, or %NULL if no
* properties
* @...: the value if the first property, followed by and other property
* value pairs, and ended by %NULL.
*
* properties
* @...: the value if the first property, followed by and other property
* value pairs, and ended by %NULL.
*
- * Helper function for constructing #GInit
i
able object. This is
+ * Helper function for constructing #GInitable object. This is
* similar to g_object_new() but also initializes the object
* and returns %NULL, setting an error on failure.
*
* similar to g_object_new() but also initializes the object
* and returns %NULL, setting an error on failure.
*
- * Return value: (transfer full): a newly allocated #GObject, or %NULL on error
+ * Returns: (type GObject.Object) (transfer full): a newly allocated
+ * #GObject, or %NULL on error
*
* Since: 2.22
*/
*
* Since: 2.22
*/
@@
-162,11
+160,12
@@
g_initable_new (GType object_type,
* @error: a #GError location to store the error occurring, or %NULL to
* ignore.
*
* @error: a #GError location to store the error occurring, or %NULL to
* ignore.
*
- * Helper function for constructing #GInit
i
able object. This is
+ * Helper function for constructing #GInitable object. This is
* similar to g_object_newv() but also initializes the object
* and returns %NULL, setting an error on failure.
*
* similar to g_object_newv() but also initializes the object
* and returns %NULL, setting an error on failure.
*
- * Return value: (transfer full): a newly allocated #GObject, or %NULL on error
+ * Returns: (type GObject.Object) (transfer full): a newly allocated
+ * #GObject, or %NULL on error
*
* Since: 2.22
*/
*
* Since: 2.22
*/
@@
-202,11
+201,12
@@
g_initable_newv (GType object_type,
* @error: a #GError location to store the error occurring, or %NULL to
* ignore.
*
* @error: a #GError location to store the error occurring, or %NULL to
* ignore.
*
- * Helper function for constructing #GInit
i
able object. This is
+ * Helper function for constructing #GInitable object. This is
* similar to g_object_new_valist() but also initializes the object
* and returns %NULL, setting an error on failure.
*
* similar to g_object_new_valist() but also initializes the object
* and returns %NULL, setting an error on failure.
*
- * Return value: (transfer full): a newly allocated #GObject, or %NULL on error
+ * Returns: (type GObject.Object) (transfer full): a newly allocated
+ * #GObject, or %NULL on error
*
* Since: 2.22
*/
*
* Since: 2.22
*/