Mercurial > pidgin.yaz
diff pidgin/gtkmedia.c @ 28176:584fa66dfb31
Remove the "accepted" signal from PurpleMedia as it was redundant.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Wed, 05 Aug 2009 03:37:45 +0000 |
| parents | 813f2eb3fdc8 |
| children | c8ff0a9cf8cc |
line wrap: on
line diff
--- a/pidgin/gtkmedia.c Wed Aug 05 02:17:12 2009 +0000 +++ b/pidgin/gtkmedia.c Wed Aug 05 03:37:45 2009 +0000 @@ -501,17 +501,6 @@ } static void -pidgin_media_accepted_cb(PurpleMedia *media, const gchar *session_id, - const gchar *participant, PidginMedia *gtkmedia) -{ - pidgin_media_set_state(gtkmedia, PIDGIN_MEDIA_ACCEPTED); - pidgin_media_emit_message(gtkmedia, _("Call in progress.")); - gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar), - 0, _("Call in progress.")); - gtk_widget_show(GTK_WIDGET(gtkmedia)); -} - -static void pidgin_media_accept_cb(PurpleMedia *media, int index) { purple_media_stream_info(media, PURPLE_MEDIA_INFO_ACCEPT, @@ -843,6 +832,12 @@ if (type == PURPLE_MEDIA_INFO_REJECT) { pidgin_media_emit_message(gtkmedia, _("You have rejected the call.")); + } else if (type == PURPLE_MEDIA_INFO_ACCEPT) { + pidgin_media_set_state(gtkmedia, PIDGIN_MEDIA_ACCEPTED); + pidgin_media_emit_message(gtkmedia, _("Call in progress.")); + gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar), + 0, _("Call in progress.")); + gtk_widget_show(GTK_WIDGET(gtkmedia)); } } @@ -869,8 +864,6 @@ g_signal_connect(G_OBJECT(media->priv->media), "error", G_CALLBACK(pidgin_media_error_cb), media); - g_signal_connect(G_OBJECT(media->priv->media), "accepted", - G_CALLBACK(pidgin_media_accepted_cb), media); g_signal_connect(G_OBJECT(media->priv->media), "state-changed", G_CALLBACK(pidgin_media_state_changed_cb), media); g_signal_connect(G_OBJECT(media->priv->media), "stream-info",