Mercurial > pidgin.yaz

comparison finch/gntmedia.c @ 26453:12c7db418c3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove purple_media_accept.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Mon, 30 Mar 2009 01:06:44 +0000
parents c0846d6659c6
children 49b7044be3de
comparison
equal deleted inserted replaced
26452:c0846d6659c6 26453:12c7db418c3e
158 { 158 {
159 g_signal_emit(gntmedia, finch_media_signals[MESSAGE], 0, msg); 159 g_signal_emit(gntmedia, finch_media_signals[MESSAGE], 0, msg);
160 } 160 }
161 161
162 static void 162 static void
163 finch_media_accept_cb(PurpleMedia *media, FinchMedia *gntmedia) 163 finch_media_connected_cb(PurpleMedia *media, FinchMedia *gntmedia)
164 { 164 {
165 GntWidget *parent; 165 GntWidget *parent;
166 166
167 finch_media_emit_message(gntmedia, _("Call in progress.")); 167 finch_media_emit_message(gntmedia, _("Call in progress."));
168 168
225 * to free the FinchMedia widget. 225 * to free the FinchMedia widget.
226 */ 226 */
227 g_object_unref(gntmedia); 227 g_object_unref(gntmedia);
228 } 228 }
229 } else if (state == PURPLE_MEDIA_STATE_CONNECTED) { 229 } else if (state == PURPLE_MEDIA_STATE_CONNECTED) {
230 finch_media_accept_cb(media, gntmedia); 230 finch_media_connected_cb(media, gntmedia);
231 } 231 }
232 } 232 }
233 233
234 static void 234 static void
235 finch_media_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type, 235 finch_media_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
237 { 237 {
238 if (type == PURPLE_MEDIA_INFO_REJECT) { 238 if (type == PURPLE_MEDIA_INFO_REJECT) {
239 finch_media_emit_message(gntmedia, 239 finch_media_emit_message(gntmedia,
240 _("You have rejected the call.")); 240 _("You have rejected the call."));
241 } 241 }
242 }
243
244 static void
245 finch_media_accept_cb(PurpleMedia *media, GntWidget *widget)
246 {
247 purple_media_stream_info(media, PURPLE_MEDIA_INFO_ACCEPT,
248 NULL, NULL, TRUE);
242 } 249 }
243 250
244 static void 251 static void
245 finch_media_hangup_cb(PurpleMedia *media, GntWidget *widget) 252 finch_media_hangup_cb(PurpleMedia *media, GntWidget *widget)
246 { 253 {
269 if (media->priv->media) 276 if (media->priv->media)
270 g_object_unref(media->priv->media); 277 g_object_unref(media->priv->media);
271 media->priv->media = g_value_get_object(value); 278 media->priv->media = g_value_get_object(value);
272 g_object_ref(media->priv->media); 279 g_object_ref(media->priv->media);
273 g_signal_connect_swapped(G_OBJECT(media->priv->accept), "activate", 280 g_signal_connect_swapped(G_OBJECT(media->priv->accept), "activate",
274 G_CALLBACK(purple_media_accept), media->priv->media); 281 G_CALLBACK(finch_media_accept_cb), media->priv->media);
275 g_signal_connect_swapped(G_OBJECT(media->priv->reject), "activate", 282 g_signal_connect_swapped(G_OBJECT(media->priv->reject), "activate",
276 G_CALLBACK(finch_media_reject_cb), media->priv->media); 283 G_CALLBACK(finch_media_reject_cb), media->priv->media);
277 g_signal_connect_swapped(G_OBJECT(media->priv->hangup), "activate", 284 g_signal_connect_swapped(G_OBJECT(media->priv->hangup), "activate",
278 G_CALLBACK(finch_media_hangup_cb), media->priv->media); 285 G_CALLBACK(finch_media_hangup_cb), media->priv->media);
279 286