Mercurial > pidgin
changeset 28111:a85f271831c3
merge of '56aef266e32da36a675d0806e9c68c98e8b714af'
and 'a447805fc4e48cb0552ae9af1d32da562e5c1dff'
| author | maiku@pidgin.im |
|---|---|
| date | Fri, 28 Aug 2009 07:32:07 +0000 |
| parents | a71a8e7e6bb0 (current diff) 776540f77394 (diff) |
| children | b8b90d4cf2f5 7193a541ca83 |
| files | |
| diffstat | 1 files changed, 27 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/media.c Fri Aug 28 07:30:33 2009 +0000 +++ b/libpurple/media.c Fri Aug 28 07:32:07 2009 +0000 @@ -2046,13 +2046,32 @@ FsError error_no; gst_structure_get_enum(msg->structure, "error-no", FS_TYPE_ERROR, (gint*)&error_no); - /* - * Unknown CName is only a problem for the - * multicast transmitter which isn't used. - */ - if (error_no != FS_ERROR_UNKNOWN_CNAME) - purple_debug_error("media", "farsight-error: %i: %s\n", error_no, - gst_structure_get_string(msg->structure, "error-msg")); + switch (error_no) { + case FS_ERROR_NO_CODECS: + purple_media_error(media, _("No codecs found. Install some GStreamer codecs found in GStreamer plugins packages.")); + purple_media_end(media, NULL, NULL); + break; + case FS_ERROR_NO_CODECS_LEFT: + purple_media_error(media, _("No codecs left. Your codec preferences in fs-codecs.conf are too strict.")); + purple_media_end(media, NULL, NULL); + break; + case FS_ERROR_UNKNOWN_CNAME: + /* + * Unknown CName is only a problem for the + * multicast transmitter which isn't used. + * It is also deprecated. + */ + break; + default: + purple_debug_error("media", "farsight-error: %i: %s\n", error_no, + gst_structure_get_string(msg->structure, "error-msg")); + break; + } + + if (FS_ERROR_IS_FATAL(error_no)) { + purple_media_error(media, _("A non-recoverable Farsight2 error has occurred.")); + purple_media_end(media, NULL, NULL); + } } else if (gst_structure_has_name(msg->structure, "farsight-new-local-candidate")) { FsStream *stream = g_value_get_object(gst_structure_get_value(msg->structure, "stream")); @@ -2570,7 +2589,7 @@ media->priv->conference, media_type, &err); if (err != NULL) { - purple_media_error(media, "Error creating session: %s\n", err->message); + purple_media_error(media, _("Error creating session: %s"), err->message); g_error_free(err); g_free(session); return FALSE;