gnome-media r3837 - in trunk: . gst-mixer/src

[malureau svn gnome org]

Author: malureau
Date: Thu Apr 17 21:29:55 2008
New Revision: 3837
URL: http://svn.gnome.org/viewvc/gnome-media?rev=3837&view=rev

Log:
2008-04-17  Marc-Andre Lureau  <marcandre lureau gmail com>

	* gst-mixer/src/preferences.c (cb_gconf): mixer track
	enable/disable toggles toggle the wrong tracks!
	(Closes: #528252)


Modified:
   trunk/ChangeLog
   trunk/gst-mixer/src/preferences.c

Modified: trunk/gst-mixer/src/preferences.c
==============================================================================
--- trunk/gst-mixer/src/preferences.c	(original)
+++ trunk/gst-mixer/src/preferences.c	Thu Apr 17 21:29:55 2008
@@ -352,8 +352,7 @@
   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 @@
       gtk_tree_model_get (model, &iter,
 			  COL_TRACK, &track,
 			  -1);
-      if (strcmp (track->label, gconf_entry_get_key (entry) + strlen (keybase))) {
+      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 ;
       }