Mercurial > pidgin
comparison libpurple/protocols/jabber/jingle/transport.c @ 32672:3828a61c44da
A boring and large patch so I can merge heads.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Fri, 23 Dec 2011 08:21:58 +0000 |
parents | 4b101cad58e7 |
children |
comparison
equal
deleted
inserted
replaced
32671:0e69949b3e61 | 32672:3828a61c44da |
---|---|
106 } | 106 } |
107 | 107 |
108 static void | 108 static void |
109 jingle_transport_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) | 109 jingle_transport_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) |
110 { | 110 { |
111 g_return_if_fail(object != NULL); | |
111 g_return_if_fail(JINGLE_IS_TRANSPORT(object)); | 112 g_return_if_fail(JINGLE_IS_TRANSPORT(object)); |
112 | 113 |
113 switch (prop_id) { | 114 switch (prop_id) { |
114 default: | 115 default: |
115 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); | 116 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
118 } | 119 } |
119 | 120 |
120 static void | 121 static void |
121 jingle_transport_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) | 122 jingle_transport_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) |
122 { | 123 { |
124 g_return_if_fail(object != NULL); | |
123 g_return_if_fail(JINGLE_IS_TRANSPORT(object)); | 125 g_return_if_fail(JINGLE_IS_TRANSPORT(object)); |
124 | 126 |
125 switch (prop_id) { | 127 switch (prop_id) { |
126 default: | 128 default: |
127 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); | 129 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
168 } | 170 } |
169 | 171 |
170 xmlnode * | 172 xmlnode * |
171 jingle_transport_to_xml(JingleTransport *transport, xmlnode *content, JingleActionType action) | 173 jingle_transport_to_xml(JingleTransport *transport, xmlnode *content, JingleActionType action) |
172 { | 174 { |
175 g_return_val_if_fail(transport != NULL, NULL); | |
173 g_return_val_if_fail(JINGLE_IS_TRANSPORT(transport), NULL); | 176 g_return_val_if_fail(JINGLE_IS_TRANSPORT(transport), NULL); |
174 return JINGLE_TRANSPORT_GET_CLASS(transport)->to_xml(transport, content, action); | 177 return JINGLE_TRANSPORT_GET_CLASS(transport)->to_xml(transport, content, action); |
175 } | 178 } |
176 | 179 |