Updating branch refs/heads/xfce-4.10 to 9393482d5b4012f2277e87990a7f881178f29cab (commit) from fe5bee84ef4f84a446ad24a73a51308cd292f866 (commit)
commit 9393482d5b4012f2277e87990a7f881178f29cab Author: Guido Berhoerster <guido+x...@berhoerster.name> Date: Sat Oct 27 11:17:13 2012 +0200 Rename variable which may shadow index(3) (bug #9374) libxfce4mixer/libxfce4mixer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libxfce4mixer/libxfce4mixer.c b/libxfce4mixer/libxfce4mixer.c index 26683b8..99140a8 100644 --- a/libxfce4mixer/libxfce4mixer.c +++ b/libxfce4mixer/libxfce4mixer.c @@ -460,20 +460,20 @@ _xfce_mixer_add_track_labels (gpointer data, GstMixerTrack *track; gchar *label; gchar *xfce_mixer_label; - guint index; + guint track_index; for (iter = gst_mixer_list_tracks (mixer); iter != NULL; iter = g_list_next (iter)) { track = GST_MIXER_TRACK (iter->data); - g_object_get (track, "label", &label, "index", &index, NULL); + g_object_get (track, "label", &label, "index", &track_index, NULL); /* * Build display label including the index if there are mutiple tracks of * the same name */ - if (index > 0) - xfce_mixer_label = g_strdup_printf ("%s (%d)", label, index); + if (track_index > 0) + xfce_mixer_label = g_strdup_printf ("%s (%d)", label, track_index); else xfce_mixer_label = g_strdup (label); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits