Hello community, here is the log from the commit of package ekiga for openSUSE:Factory checked in at 2017-02-20 14:28:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ekiga (Old) and /work/SRC/openSUSE:Factory/.ekiga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ekiga" Changes: -------- --- /work/SRC/openSUSE:Factory/ekiga/ekiga.changes 2017-02-11 01:35:16.826987818 +0100 +++ /work/SRC/openSUSE:Factory/.ekiga.new/ekiga.changes 2017-02-20 14:28:08.438849024 +0100 @@ -1,0 +2,8 @@ +Wed Feb 15 10:20:52 UTC 2017 - [email protected] + +- add ekiga-audiooutput-fallback-to-primary-device-if-secondary.patch + * fixes problem that ekiga uses SILENT as default for secondary + (ring) output unless explicitly configured by user + * Upstream bug report: bgo#777717 + +------------------------------------------------------------------- New: ---- ekiga-audiooutput-fallback-to-primary-device-if-secondary.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ekiga.spec ++++++ --- /var/tmp/diff_new_pack.xRFPI4/_old 2017-02-20 14:28:09.234736716 +0100 +++ /var/tmp/diff_new_pack.xRFPI4/_new 2017-02-20 14:28:09.234736716 +0100 @@ -30,6 +30,7 @@ Patch0: boost-configure.patch # PATCH-FIX-UPSTREAM ekiga-appdata.patch [email protected] -- Add, translate and install appstream metainfo file taken from upstream git Patch1: ekiga-appdata.patch +Patch2: ekiga-audiooutput-fallback-to-primary-device-if-secondary.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_signals-devel %else @@ -107,6 +108,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 translation-update-upstream %build ++++++ ekiga-audiooutput-fallback-to-primary-device-if-secondary.patch ++++++ >From 4cd44fcc9e4c6f230cefd397cb75f4b911ea0a11 Mon Sep 17 00:00:00 2001 From: Martin Wilck <[email protected]> Date: Tue, 17 Jan 2017 19:22:39 +0100 Subject: [PATCH] audiooutput: fallback to primary device if secondary is not set Ekiga already falls back to the primary audio output device when the manager for the secondary device is NULL. But the gmconf bridge will set the SILENT device if an empty setting for the secondary device is encountered, which effectively mutes ekiga's ring tone unless the user actively reconfigures the secondary device. The primary device, if not set, defaults to the first detected audio device on the system, which is a more reasonable default than SILENT. This patch changes the behavior for the secondary device such that the primary device fallback is used for the secondary device if no configuration is found. Signed-off-by: Martin Wilck <[email protected]> References: https://bugs.launchpad.net/ubuntu/+source/ekiga/+bug/558304 Upstream Submission: https://github.com/GNOME/ekiga/pull/2 --- lib/engine/audiooutput/audiooutput-core.cpp | 2 +- lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/engine/audiooutput/audiooutput-core.cpp b/lib/engine/audiooutput/audiooutput-core.cpp index 9c5348966..cd988493b 100644 --- a/lib/engine/audiooutput/audiooutput-core.cpp +++ b/lib/engine/audiooutput/audiooutput-core.cpp @@ -189,7 +189,7 @@ void AudioOutputCore::set_device(AudioOutputPS ps, const AudioOutputDevice & dev break; case secondary: - if (device == current_device[primary]) + if (device == current_device[primary] || device.name == "") { current_manager[secondary] = NULL; current_device[secondary].type = ""; diff --git a/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp b/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp index 104fab0c5..36b395b7a 100644 --- a/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp +++ b/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp @@ -134,9 +134,7 @@ void AudioOutputCoreConfBridge::on_property_changed (std::string key, GmConfEntr (device.source == "") || (device.name == "") ) { PTRACE(1, "AudioOutputCore\tTried to set malformed device"); - device.type = AUDIO_OUTPUT_FALLBACK_DEVICE_TYPE; - device.source = AUDIO_OUTPUT_FALLBACK_DEVICE_SOURCE; - device.name = AUDIO_OUTPUT_FALLBACK_DEVICE_NAME; + device.name = ""; } audiooutput_core.set_device (secondary, device); } -- 2.11.0
