From b1642e68a321a80d7557863409455375906c14ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Fri, 10 Jul 2009 15:21:16 +0100 Subject: Put codec preferences in a configuration file --- data/Makefile.am | 4 ++++ data/codec-preferences | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 data/codec-preferences (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 52108fbe7..94737140f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -30,6 +30,10 @@ schemas_in_files = empathy.schemas.in schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +streamingprefsdir = $(datadir)/empathy +streamingprefs_DATA = \ + codec-preferences + if GCONF_SCHEMAS_INSTALL install-data-local: if test -z "$(DESTDIR)" ; then \ diff --git a/data/codec-preferences b/data/codec-preferences new file mode 100644 index 000000000..0cb0910bc --- /dev/null +++ b/data/codec-preferences @@ -0,0 +1,36 @@ +# Favorite audio codecs + +[audio/SPEEX:8000] +clock-rate=8000 + +[audio/SPEEX:16000] +clock-rate=16000 + +[audio/AMR] + +[audio/G729] + +[audio/ILBC] + +# Disabled audio codecs + +[audio/DV] +id=-1 + +[audio/MPA] +id=-1 + +[audio/VORBIS] +id=-1 + +[audio/MP3] +id=-1 + + +# Favorite video codecs + +[video/H264] + +[video/H263] + +[video/THEORA] -- cgit v1.2.3 From a885bc90fd4c27676090a59bb615b14258ff8579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Fri, 10 Jul 2009 15:41:27 +0100 Subject: Make it possible to set element properties from a config file --- data/Makefile.am | 3 ++- data/element-properties | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 data/element-properties (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 94737140f..81ca5a7b9 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -32,7 +32,8 @@ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) streamingprefsdir = $(datadir)/empathy streamingprefs_DATA = \ - codec-preferences + codec-preferences \ + element-properties if GCONF_SCHEMAS_INSTALL install-data-local: diff --git a/data/element-properties b/data/element-properties new file mode 100644 index 000000000..e8bd9c084 --- /dev/null +++ b/data/element-properties @@ -0,0 +1,17 @@ +# Put the desired properties in the style of +# +# [element name] +# prop1=val1 + +[gstrtpbin] +latency=100 + +[x264enc] +byte-stream=1 +bframes=0 +b-adapt=0 +cabac=0 +dct8x8=0 + +[ffenc_h263] +rtp-payload-size=1 -- cgit v1.2.3 From bb29218b8ad4e92e03f8b87236c9843392c5c0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Tue, 4 Aug 2009 15:43:53 -0400 Subject: Force skew method of clock slaving for alsa/osssrc --- data/element-properties | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'data') diff --git a/data/element-properties b/data/element-properties index e8bd9c084..17a283ada 100644 --- a/data/element-properties +++ b/data/element-properties @@ -15,3 +15,18 @@ dct8x8=0 [ffenc_h263] rtp-payload-size=1 + +# Work around bug in the re-timestamp slaving method in +# GStreamer (2 is skew) +[alsasrc] +slave-method=2 + +[osssrc] +slave-method=2 + +[oss4src] +slave-method=2 + +[sunaudiosrc] +slave-method=2 + -- cgit v1.2.3 From 09c7ee275295bcfc31c9ee76d8ef235c73821621 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 10 Jun 2009 12:19:47 +0100 Subject: Use the official MSN icon (#576467) --- data/icons/hicolor_apps_16x16_im-msn.png | Bin 762 -> 835 bytes data/icons/hicolor_apps_22x22_im-msn.png | Bin 1086 -> 1281 bytes data/icons/hicolor_apps_24x24_im-msn.png | Bin 1203 -> 1407 bytes data/icons/hicolor_apps_32x32_im-msn.png | Bin 1734 -> 1660 bytes data/icons/hicolor_apps_48x48_im-msn.png | Bin 2876 -> 2778 bytes data/icons/hicolor_apps_scalable_im-msn.svg | 380 +++++++++------------------- 6 files changed, 126 insertions(+), 254 deletions(-) (limited to 'data') diff --git a/data/icons/hicolor_apps_16x16_im-msn.png b/data/icons/hicolor_apps_16x16_im-msn.png index ebd6e2cd2..943ba35f6 100644 Binary files a/data/icons/hicolor_apps_16x16_im-msn.png and b/data/icons/hicolor_apps_16x16_im-msn.png differ diff --git a/data/icons/hicolor_apps_22x22_im-msn.png b/data/icons/hicolor_apps_22x22_im-msn.png index c1baa2160..97977f2ed 100644 Binary files a/data/icons/hicolor_apps_22x22_im-msn.png and b/data/icons/hicolor_apps_22x22_im-msn.png differ diff --git a/data/icons/hicolor_apps_24x24_im-msn.png b/data/icons/hicolor_apps_24x24_im-msn.png index 11bb9d4cc..3c2adcd1b 100644 Binary files a/data/icons/hicolor_apps_24x24_im-msn.png and b/data/icons/hicolor_apps_24x24_im-msn.png differ diff --git a/data/icons/hicolor_apps_32x32_im-msn.png b/data/icons/hicolor_apps_32x32_im-msn.png index 09613e8d5..c06eed2aa 100644 Binary files a/data/icons/hicolor_apps_32x32_im-msn.png and b/data/icons/hicolor_apps_32x32_im-msn.png differ diff --git a/data/icons/hicolor_apps_48x48_im-msn.png b/data/icons/hicolor_apps_48x48_im-msn.png index 124b27b98..1b960dd32 100644 Binary files a/data/icons/hicolor_apps_48x48_im-msn.png and b/data/icons/hicolor_apps_48x48_im-msn.png differ diff --git a/data/icons/hicolor_apps_scalable_im-msn.svg b/data/icons/hicolor_apps_scalable_im-msn.svg index eb6511638..561969416 100644 --- a/data/icons/hicolor_apps_scalable_im-msn.svg +++ b/data/icons/hicolor_apps_scalable_im-msn.svg @@ -2,301 +2,173 @@ - - - - image/svg+xml - - MSN Protocol - 2006-11-29 - - - Vinicius Scopel Depizzol - - - vdepizzol@gmail.com - - - MSN - Protocol - - - - - - - - - - - - - - + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + id="defs4"> - - - - - - - - + inkscape:collect="always" + id="linearGradient3816"> + id="stop3818" /> + id="stop3820" /> + inkscape:collect="always" + id="linearGradient2228"> + id="stop2230" /> + id="stop2232" /> + inkscape:collect="always" + id="linearGradient2219"> + id="stop2221" /> + id="stop2223" /> + cx="31.112698" + cy="19.008621" + fx="31.112698" + fy="19.008621" + r="8.6620579" + gradientTransform="matrix(1.904859,0,0,0.57723,-32.76529,27.09015)" /> - - + gradientTransform="matrix(1.427299,0,0,1.408267,0.332861,3.39912)" + x1="10.329217" + y1="14.96656" + x2="16.580788" + y2="20.092552" /> - - + gradientTransform="matrix(1.489007,0,0,1.428565,1.731241,3.002037)" + x1="20.998175" + y1="11.741063" + x2="18.544895" + y2="23.366545" /> - - - - - - - - - - - + inkscape:guide-bbox="true" + inkscape:window-width="1268" + inkscape:window-height="971" + inkscape:window-x="6" + inkscape:window-y="21" /> + + + + image/svg+xml + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From c359242189bc96481f63fbdcecbf8a3218f608d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 12 Aug 2009 18:41:45 +0200 Subject: Add streamingprefs_DATA to EXTRA_DIST (GNOME bug 591582) --- data/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 81ca5a7b9..7391b409e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -55,6 +55,7 @@ EXTRA_DIST = \ $(desktop_DATA) \ $(schemas_in_files) \ $(schemas_DATA) \ + $(streamingprefs_DATA) \ $(html_DATA) DISTCLEANFILES = \ -- cgit v1.2.3 From 8daae9d4540406968b405c850586b26ca2a1699c Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Tue, 18 Aug 2009 16:57:49 +0100 Subject: empathy-conf: rename use_nm to use_conn Signed-off-by: Jonny Lamb --- data/empathy.schemas.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in index f85c616b0..29b74730a 100644 --- a/data/empathy.schemas.in +++ b/data/empathy.schemas.in @@ -479,15 +479,15 @@ - /schemas/apps/empathy/use_nm - /apps/empathy/use_nm + /schemas/apps/empathy/use_conn + /apps/empathy/use_conn empathy bool true - NetworkManager should be used + Connection managers should be used - Whether or not the network manager should be used to automatically + Whether or not connectivity managers should be used to automatically disconnect/reconnect. -- cgit v1.2.3 From 4459108d4cc646d447c6a2548dfc02f4e4327cff Mon Sep 17 00:00:00 2001 From: Pierre-Luc Beaudoin Date: Wed, 19 Aug 2009 12:04:02 -0400 Subject: Turn reduced accuracy mode by default There is a 10 seconds delay before any information is sent when enabling location publishing. Still, enabling the privacy mode by default can only make sure that precise location is never sent for people who want privacy. --- data/empathy.schemas.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in index f85c616b0..edd8e5bdf 100644 --- a/data/empathy.schemas.in +++ b/data/empathy.schemas.in @@ -596,7 +596,7 @@ /apps/empathy/location/reduce_accuracy empathy bool - false + true Empathy should reduce the location's accuracy -- cgit v1.2.3