/pidgin/main: 8bb0c64b18d6: Load default codec preferences if fs...

Mike Ruprecht cmaiku at gmail.com
Sat Jan 23 14:06:34 EST 2016


Changeset: 8bb0c64b18d6b5bbb946424dd7e579212acf2d24
Author:	 Mike Ruprecht <cmaiku at gmail.com>
Date:	 2016-01-22 02:53 -0600
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/8bb0c64b18d6

Description:

Load default codec preferences if fs-codec.conf doesn't exist

Previously, fs-codec.conf was required in the purple user config
directory in order to have audio/video calls work. Now Farstream
includes sane defaults and functions to access them. If fs-codec.conf
can't be read due to it not existing or an error reading it,
load the default codec preferences instead.

diffstat:

 libpurple/media/backend-fs2.c |  5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diffs (15 lines):

diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
--- a/libpurple/media/backend-fs2.c
+++ b/libpurple/media/backend-fs2.c
@@ -1707,6 +1707,11 @@ create_session(PurpleMediaBackendFs2 *se
 					"fs-codec.conf: %s\n",
 					err->message);
 		g_error_free(err);
+
+		purple_debug_info("backend-fs2",
+				"Loading default codec conf instead\n");
+		codec_conf = fs_utils_get_default_codec_preferences(
+				GST_ELEMENT(priv->conference));
 	}
 
 	/*



More information about the Commits mailing list