/[gentoo-x86]/net-libs/farstream/files/farstream-0.1.2-introspection-tag-order.patch
Gentoo

Contents of /net-libs/farstream/files/farstream-0.1.2-introspection-tag-order.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Mon Jul 16 08:19:25 2012 UTC (11 months ago) by tetromino
Branch: MAIN
CVS Tags: HEAD
Fix building with gobject-introspection-1.33.x (bug #425096, thanks to Marek Bartosiewicz).

(Portage version: 2.2.0_alpha118/cvs/Linux x86_64)

1 From 39450457190675716c8e66700e35b05334a6a1a0 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
3 Date: Fri, 25 May 2012 17:06:59 -0400
4 Subject: [PATCH] Gtk-doc tags belong after the description
5
6 ---
7 farstream/fs-session.c | 16 +++++++---------
8 farstream/fs-stream.c | 15 ++++++---------
9 2 files changed, 13 insertions(+), 18 deletions(-)
10
11 diff --git a/farstream/fs-session.c b/farstream/fs-session.c
12 index 80794d1..abb1bc3 100644
13 --- a/farstream/fs-session.c
14 +++ b/farstream/fs-session.c
15 @@ -270,9 +270,6 @@ fs_session_class_init (FsSessionClass *klass)
16 /**
17 * FsSession:codec-preferences:
18 *
19 - * Type: GLib.List(FsCodec)
20 - * Transfer: full
21 - *
22 * This is the current preferences list for the local codecs. It is
23 * set by the user to specify the codec options and priorities. The user may
24 * change its value with fs_session_set_codec_preferences() at any time
25 @@ -283,6 +280,9 @@ fs_session_class_init (FsSessionClass *klass)
26 * or %FS_CODEC_ID_ANY. If the encoding name is "reserve-pt", then the
27 * payload type of the codec will be "reserved" and not be used by any
28 * dynamically assigned payload type.
29 + *
30 + * Type: GLib.List(FsCodec)
31 + * Transfer: full
32 */
33 g_object_class_install_property (gobject_class,
34 PROP_CODEC_PREFERENCES,
35 @@ -296,9 +296,6 @@ fs_session_class_init (FsSessionClass *klass)
36 /**
37 * FsSession:codecs:
38 *
39 - * Type: GLib.List(FsCodec)
40 - * Transfer: full
41 - *
42 * This is the list of codecs used for this session. It will include the
43 * codecs and payload type used to receive media on this session. It will
44 * also include any configuration parameter that must be transmitted reliably
45 @@ -317,6 +314,8 @@ fs_session_class_init (FsSessionClass *klass)
46 * It is a #GList of #FsCodec. User must free this codec list using
47 * fs_codec_list_destroy() when done.
48 *
49 + * Type: GLib.List(FsCodec)
50 + * Transfer: full
51 */
52 g_object_class_install_property (gobject_class,
53 PROP_CODECS,
54 @@ -329,9 +328,6 @@ fs_session_class_init (FsSessionClass *klass)
55 /**
56 * FsSession:codecs-without-config:
57 *
58 - * Type: GLib.List(FsCodec)
59 - * Transfer: full
60 - *
61 * This is the same list of codecs as #FsSession:codecs without
62 * the configuration information that describes the data sent. It is suitable
63 * for configurations where a list of codecs is shared by many senders.
64 @@ -349,6 +345,8 @@ fs_session_class_init (FsSessionClass *klass)
65 * It is a #GList of #FsCodec. User must free this codec list using
66 * fs_codec_list_destroy() when done.
67 *
68 + * Type: GLib.List(FsCodec)
69 + * Transfer: full
70 */
71 g_object_class_install_property (gobject_class,
72 PROP_CODECS_WITHOUT_CONFIG,
73 diff --git a/farstream/fs-stream.c b/farstream/fs-stream.c
74 index b9e1320..110641d 100644
75 --- a/farstream/fs-stream.c
76 +++ b/farstream/fs-stream.c
77 @@ -176,13 +176,12 @@ fs_stream_class_init (FsStreamClass *klass)
78 /**
79 * FsStream:remote-codecs:
80 *
81 - * Type: GLib.List(FsCodec)
82 - * Transfer: full
83 - *
84 * This is the list of remote codecs for this stream. They must be set by the
85 * user as soon as they are known using fs_stream_set_remote_codecs()
86 * (generally through external signaling). It is a #GList of #FsCodec.
87 *
88 + * Type: GLib.List(FsCodec)
89 + * Transfer: full
90 */
91 g_object_class_install_property (gobject_class,
92 PROP_REMOTE_CODECS,
93 @@ -195,15 +194,14 @@ fs_stream_class_init (FsStreamClass *klass)
94 /**
95 * FsStream:negotiated-codecs:
96 *
97 - * Type: GLib.List(FsCodec)
98 - * Transfer: full
99 - *
100 * This is the list of negotiatied codecs, it is the same list as the list
101 * of #FsCodec from the parent #FsSession, except that the codec config data
102 * has been replaced with the data from the remote codecs for this stream.
103 * This is the list of #FsCodec used to receive data from this stream.
104 * It is a #GList of #FsCodec.
105 *
106 + * Type: GLib.List(FsCodec)
107 + * Transfer: full
108 */
109 g_object_class_install_property (gobject_class,
110 PROP_NEGOTIATED_CODECS,
111 @@ -216,9 +214,6 @@ fs_stream_class_init (FsStreamClass *klass)
112 /**
113 * FsStream:current-recv-codecs:
114 *
115 - * Type: GLib.List(FsCodec)
116 - * Transfer: full
117 - *
118 * This is the list of codecs that have been received by this stream.
119 * The user must free the list if fs_codec_list_destroy().
120 * The "farstream-recv-codecs-changed" message is send on the #GstBus
121 @@ -228,6 +223,8 @@ fs_stream_class_init (FsStreamClass *klass)
122 * also be emitted if the pad already exists, but the source material that
123 * will come to it is different.
124 *
125 + * Type: GLib.List(FsCodec)
126 + * Transfer: full
127 */
128 g_object_class_install_property (gobject_class,
129 PROP_CURRENT_RECV_CODECS,
130 --
131 1.7.8.6

  ViewVC Help
Powered by ViewVC 1.1.20