r15677 - in /desktop/unstable/gnome-media/debian: changelog control patches/03_enable-disable-correct-track.patch

[samm-guest at users.alioth.debian.org]

Author: samm-guest
Date: Thu Apr 17 22:27:15 2008
New Revision: 15677

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15677
Log:
Update 03_enable-disable-correct-track.patch to the version committed to upstream's SVN.

Modified:
    desktop/unstable/gnome-media/debian/changelog
    desktop/unstable/gnome-media/debian/control
    desktop/unstable/gnome-media/debian/patches/03_enable-disable-correct-track.patch

Modified: desktop/unstable/gnome-media/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/changelog?rev=15677&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/changelog (original)
+++ desktop/unstable/gnome-media/debian/changelog Thu Apr 17 22:27:15 2008
@@ -4,8 +4,8 @@
     of each track in the volume control preferences. Taken from
     <http://bugzilla.gnome.org/28064>. 
   * Add 03_enable-disable-correct-track.patch to make the volume control
-    preferences enable and disable the correct tracks. Taken from
-    <http://bugzilla.gnome.org/528252>.
+    preferences enable and disable the correct tracks. Taken from upstream svn
+    r3837. Fixes: <http://bugzilla.gnome.org/528252>.
   * Add 04_sort-tracks-by-type.patch. Taken from
     <http://bugzilla.gnome.org/528064>.
 

Modified: desktop/unstable/gnome-media/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/control?rev=15677&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/control (original)
+++ desktop/unstable/gnome-media/debian/control Thu Apr 17 22:27:15 2008
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Marco Cabizza <marco87 at gmail.com>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
 Standards-Version: 3.7.3
 Build-Depends: libgnomevfs2-dev (>= 2.6.1.1-6),
                libgnomeui-dev (>= 2.13.2),

Modified: desktop/unstable/gnome-media/debian/patches/03_enable-disable-correct-track.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/patches/03_enable-disable-correct-track.patch?rev=15677&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/patches/03_enable-disable-correct-track.patch (original)
+++ desktop/unstable/gnome-media/debian/patches/03_enable-disable-correct-track.patch Thu Apr 17 22:27:15 2008
@@ -1,13 +1,23 @@
-Index: gst-mixer/src/preferences.c
-===================================================================
---- gst-mixer/src/preferences.c	(revision 3834)
-+++ gst-mixer/src/preferences.c	(working copy)
-@@ -363,7 +379,7 @@
+diff --git a/gst-mixer/src/preferences.c b/gst-mixer/src/preferences.c
+index b90acc7..7ada5f2 100644
+--- a/gst-mixer/src/preferences.c
++++ b/gst-mixer/src/preferences.c
+@@ -352,8 +352,7 @@ cb_gconf(GConfClient *client, guint connection_id,
+   model = gtk_tree_view_get_model (GTK_TREE_VIEW(prefs->treeview));
+   keybase = get_gconf_key (prefs->mixer, NULL);
+ 
+-  if (!strncmp (gconf_entry_get_key (entry),
+-		keybase, strlen (keybase)) &&
++  if (g_str_equal (gconf_entry_get_key (entry), keybase) &&
+       (value = gconf_entry_get_value (entry)) != NULL &&
+       (value->type == GCONF_VALUE_BOOL)) {
+     active = gconf_value_get_bool (value); 
+@@ -363,7 +362,7 @@ cb_gconf(GConfClient *client, guint connection_id,
        gtk_tree_model_get (model, &iter,
  			  COL_TRACK, &track,
  			  -1);
 -      if (strcmp (track->label, gconf_entry_get_key (entry) + strlen (keybase))) {
-+      if (strcmp (track->label, gconf_entry_get_key (entry) + strlen (keybase)) == 0) {
++      if (g_str_equal (track->label, gconf_entry_get_key (entry) + strlen (keybase))) {
  	gtk_list_store_set( GTK_LIST_STORE(model), &iter, COL_ACTIVE, active, -1);
  	break ;
        }