1
From 0b889388a7f45258fa2291dd577b2ea7ca8d42c0 Mon Sep 17 00:00:00 2001
2
From: Stef Walter <stefw@gnome.org>
3
Date: Mon, 11 Feb 2013 16:43:54 +0000
4
Subject: Use GObject.Object instead of GLib.Object in introspection annotations
6
A gobject-introspection change broke the former.
8
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=693440
9
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1163786
11
Index: gcr-3.6.2/gck/gck-misc.c
12
===================================================================
13
--- gcr-3.6.2.orig/gck/gck-misc.c 2012-10-27 15:03:06.000000000 +0200
14
+++ gcr-3.6.2/gck/gck-misc.c 2013-04-03 11:15:51.006103179 +0200
18
* gck_list_unref_free: (skip)
19
- * @reflist: (element-type GLib.Object): list of Gobject reference counted pointers
20
+ * @reflist: (element-type GObject.Object): list of Gobject reference counted pointers
22
* Free a list of GObject based pointers. All objects in the list
23
* will be unreffed and then the list itself will be freed.
27
* gck_list_ref_copy: (skip)
28
- * @reflist: (element-type GLib.Object): list of GObject reference counted
29
+ * @reflist: (element-type GObject.Object): list of GObject reference counted
32
* Copy a list of GObject based pointers. All objects
33
* in the list will be reffed and the list will be copied.
35
- * Return value: (transfer full) (element-type GLib.Object): the copied and
36
+ * Return value: (transfer full) (element-type GObject.Object): the copied and
37
* reffed list, when done, free it with gck_list_unref_free ()
40
Index: gcr-3.6.2/gcr/gcr-collection-model.c
41
===================================================================
42
--- gcr-3.6.2.orig/gcr/gcr-collection-model.c 2012-09-19 11:01:28.000000000 +0200
43
+++ gcr-3.6.2/gcr/gcr-collection-model.c 2013-04-03 11:15:50.838103171 +0200
46
* Get a list of checked/selected objects.
48
- * Returns: (transfer container) (element-type GLib.Object): a list of selected
49
+ * Returns: (transfer container) (element-type GObject.Object): a list of selected
50
* objects, which should be freed with g_list_free()
55
* gcr_collection_model_set_selected_objects:
56
* @self: the collection model
57
- * @selected: (element-type GLib.Object): a list of objects to select
58
+ * @selected: (element-type GObject.Object): a list of objects to select
60
* Set the checked/selected objects.
62
Index: gcr-3.6.2/gcr/gcr-collection.c
63
===================================================================
64
--- gcr-3.6.2.orig/gcr/gcr-collection.c 2012-10-27 15:03:44.000000000 +0200
65
+++ gcr-3.6.2/gcr/gcr-collection.c 2013-04-03 11:15:50.814103170 +0200
68
* GcrCollection::added:
69
* @self: the collection
70
- * @object: (type GLib.Object): object that was added
71
+ * @object: (type GObject.Object): object that was added
73
* This signal is emitted when an object is added to the collection.
77
* GcrCollection::removed:
78
* @self: the collection
79
- * @object: (type GLib.Object): object that was removed
80
+ * @object: (type GObject.Object): object that was removed
82
* This signal is emitted when an object is removed from the collection.
86
* Get a list of the objects in this collection.
88
- * Returns: (transfer container) (element-type GLib.Object): a list of the objects
89
+ * Returns: (transfer container) (element-type GObject.Object): a list of the objects
90
* in this collection, which should be freed with g_list_free()
93
Index: gcr-3.6.2/gcr/gcr-list-selector.c
94
===================================================================
95
--- gcr-3.6.2.orig/gcr/gcr-list-selector.c 2012-09-19 11:01:28.000000000 +0200
96
+++ gcr-3.6.2/gcr/gcr-list-selector.c 2013-04-03 11:15:50.878103173 +0200
99
* Get a list of selected objects.
101
- * Returns: (transfer container) (element-type GLib.Object): the list of
102
+ * Returns: (transfer container) (element-type GObject.Object): the list of
103
* selected objects, to be released with g_list_free()
108
* gcr_list_selector_set_selected:
109
* @self: The selector
110
- * @selected: (element-type GLib.Object): the list of objects to select
111
+ * @selected: (element-type GObject.Object): the list of objects to select
113
* Select certain objects in the selector.
115
Index: gcr-3.6.2/gcr/gcr-tree-selector.c
116
===================================================================
117
--- gcr-3.6.2.orig/gcr/gcr-tree-selector.c 2012-09-19 11:01:28.000000000 +0200
118
+++ gcr-3.6.2/gcr/gcr-tree-selector.c 2013-04-03 11:15:50.922103175 +0200
121
* Get a list of selected objects.
123
- * Returns: (transfer container) (element-type GLib.Object): the list of selected
124
+ * Returns: (transfer container) (element-type GObject.Object): the list of selected
125
* objects, to be released with g_list_free()
130
* gcr_tree_selector_set_selected:
131
* @self: The selector
132
- * @selected: (element-type GLib.Object): The list of objects to select.
133
+ * @selected: (element-type GObject.Object): The list of objects to select.
135
* Select certain objects in the selector.