Mercurial > pidgin.yaz
diff finch/gntmedia.c @ 26453:12c7db418c3e
Remove purple_media_accept.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Mon, 30 Mar 2009 01:06:44 +0000 |
| parents | c0846d6659c6 |
| children | 49b7044be3de |
line wrap: on
line diff
--- a/finch/gntmedia.c Mon Mar 30 00:55:29 2009 +0000 +++ b/finch/gntmedia.c Mon Mar 30 01:06:44 2009 +0000 @@ -160,7 +160,7 @@ } static void -finch_media_accept_cb(PurpleMedia *media, FinchMedia *gntmedia) +finch_media_connected_cb(PurpleMedia *media, FinchMedia *gntmedia) { GntWidget *parent; @@ -227,7 +227,7 @@ g_object_unref(gntmedia); } } else if (state == PURPLE_MEDIA_STATE_CONNECTED) { - finch_media_accept_cb(media, gntmedia); + finch_media_connected_cb(media, gntmedia); } } @@ -242,6 +242,13 @@ } static void +finch_media_accept_cb(PurpleMedia *media, GntWidget *widget) +{ + purple_media_stream_info(media, PURPLE_MEDIA_INFO_ACCEPT, + NULL, NULL, TRUE); +} + +static void finch_media_hangup_cb(PurpleMedia *media, GntWidget *widget) { purple_media_stream_info(media, PURPLE_MEDIA_INFO_HANGUP, @@ -271,7 +278,7 @@ media->priv->media = g_value_get_object(value); g_object_ref(media->priv->media); g_signal_connect_swapped(G_OBJECT(media->priv->accept), "activate", - G_CALLBACK(purple_media_accept), media->priv->media); + G_CALLBACK(finch_media_accept_cb), media->priv->media); g_signal_connect_swapped(G_OBJECT(media->priv->reject), "activate", G_CALLBACK(finch_media_reject_cb), media->priv->media); g_signal_connect_swapped(G_OBJECT(media->priv->hangup), "activate",