[Pkg-xfce-commits] r8491 - in /goodies/trunk/xfce4-volumed/debian: changelog patches/0001-remove-handling-of-legacy-active-card-xfconf-propert.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Sat Jun 28 11:37:52 2014
New Revision: 8491

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8491
Log:
* debian/patches:
  - actually add the
  0001-remove-handling-of-legacy-active-card-xfconf-propert patch to the
  package.

Added:
    goodies/trunk/xfce4-volumed/debian/patches/0001-remove-handling-of-legacy-active-card-xfconf-propert.patch
    goodies/trunk/xfce4-volumed/debian/patches/series
Modified:
    goodies/trunk/xfce4-volumed/debian/changelog

Modified: goodies/trunk/xfce4-volumed/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-volumed/debian/changelog?rev=8491&op=diff
==============================================================================
--- goodies/trunk/xfce4-volumed/debian/changelog	(original)
+++ goodies/trunk/xfce4-volumed/debian/changelog	Sat Jun 28 11:37:52 2014
@@ -1,3 +1,12 @@
+xfce4-volumed (0.1.13-5) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - actually add the
+    0001-remove-handling-of-legacy-active-card-xfconf-propert patch to the
+    package.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 28 Jun 2014 13:37:20 +0200
+
 xfce4-volumed (0.1.13-4) unstable; urgency=low
 
   [ Evgeni Golov ]

Added: goodies/trunk/xfce4-volumed/debian/patches/0001-remove-handling-of-legacy-active-card-xfconf-propert.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-volumed/debian/patches/0001-remove-handling-of-legacy-active-card-xfconf-propert.patch?rev=8491&op=file
==============================================================================
--- goodies/trunk/xfce4-volumed/debian/patches/0001-remove-handling-of-legacy-active-card-xfconf-propert.patch	(added)
+++ goodies/trunk/xfce4-volumed/debian/patches/0001-remove-handling-of-legacy-active-card-xfconf-propert.patch	Sat Jun 28 11:37:52 2014
@@ -0,0 +1,55 @@
+From 5c6d3af7c55dc3a2c9857ad563e4cc4f83cbc371 Mon Sep 17 00:00:00 2001
+From: Yves-Alexis Perez <corsac at debian.org>
+Date: Sat, 28 Jun 2014 11:08:20 +0200
+Subject: [PATCH] remove handling of 'legacy' active-card xfconf property
+
+Actually, it seems that xfce4-mixer never used active-card but kept the
+sound-card property, so completely remove the active-card one since it
+just confuse people.
+---
+ src/xvd_data_types.h |  3 +--
+ src/xvd_xfconf.c     | 14 ++------------
+ 2 files changed, 3 insertions(+), 14 deletions(-)
+
+diff --git a/src/xvd_data_types.h b/src/xvd_data_types.h
+index 16e5e1b..8698dc1 100644
+--- a/src/xvd_data_types.h
++++ b/src/xvd_data_types.h
+@@ -25,8 +25,7 @@
+ #endif
+ 
+ #define XFCONF_MIXER_CHANNEL_NAME "xfce4-mixer"
+-#define XFCONF_MIXER_ACTIVECARD "/active-card"
+-#define XFCONF_MIXER_ACTIVECARD_LEGACY "/sound-card"
++#define XFCONF_MIXER_ACTIVECARD "/sound-card"
+ #define XFCONF_MIXER_ACTIVETRACK "/active-track"
+ #define XFCONF_MIXER_VOL_STEP "/volume-step-size"
+ #define VOL_STEP_DEFAULT_VAL 5
+diff --git a/src/xvd_xfconf.c b/src/xvd_xfconf.c
+index a875437..f31fee4 100644
+--- a/src/xvd_xfconf.c
++++ b/src/xvd_xfconf.c
+@@ -179,18 +179,8 @@ xvd_xfconf_get_card(XvdInstance *Inst)
+ 	}
+ 	
+ 	if (FALSE == xfconf_channel_has_property (Inst->chan, XFCONF_MIXER_ACTIVECARD)) {
+-		// Transition purpose - we dont watch changes on the legacy property afterwards
+-		if (FALSE == xfconf_channel_has_property (Inst->chan, XFCONF_MIXER_ACTIVECARD_LEGACY)) {
+-			g_debug ("%s\n", "There is no card name stored in xfconf");
+-			return FALSE;
+-		}
+-		else {
+-			g_debug ("%s\n", "Using the legacy xfconf property for the card name, and saving its value into the new xfconf property");
+-			Inst->xfconf_card_name = xfconf_channel_get_string (Inst->chan, XFCONF_MIXER_ACTIVECARD_LEGACY, NULL);
+-			xvd_xfconf_set_card (Inst, Inst->xfconf_card_name);
+-			g_debug ("%s %s\n", "Xfconf card name:", Inst->xfconf_card_name);
+-			return Inst->xfconf_card_name != NULL;
+-		}
++		g_debug ("%s\n", "There is no card name stored in xfconf");
++		return FALSE;
+ 	}
+ 	
+ 	Inst->xfconf_card_name = xfconf_channel_get_string (Inst->chan, XFCONF_MIXER_ACTIVECARD, NULL);
+-- 
+2.0.0
+

Added: goodies/trunk/xfce4-volumed/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-volumed/debian/patches/series?rev=8491&op=file
==============================================================================
--- goodies/trunk/xfce4-volumed/debian/patches/series	(added)
+++ goodies/trunk/xfce4-volumed/debian/patches/series	Sat Jun 28 11:37:52 2014
@@ -0,0 +1 @@
+0001-remove-handling-of-legacy-active-card-xfconf-propert.patch