← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xfce4-mixer/lucid

« back to all changes in this revision

Viewing changes to xfce4-mixer/xfce-mixer-option.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2009-03-01 20:57:17 UTC
  • mfrom: (3.1.3 experimental)
  • Revision ID: james.westby@ubuntu.com-20090301205717-p407q28ohju2cam0
Tags: 1:4.6.0-1ubuntu1
* Merge Xfce 4.6.0 final with Debian experimental, remaining Ubuntu changes:
  - reintroduce epoch
  - debian/control: use our Vcs-* fields.

Show diffs side-by-side

added added

removed removed

Lines of Context:
xfce4-mixer/xfce-mixer-option.c
164
164
  GtkWidget       *label;
165
165
  const GList     *iter;
166
166
  const gchar     *active_option;
 
167
  gchar           *track_label;
167
168
  gchar           *title;
168
169
  gint             i;
169
170
 
170
171
  gtk_box_set_homogeneous (GTK_BOX (option), FALSE);
171
172
  gtk_box_set_spacing (GTK_BOX (option), 12);
172
173
 
173
 
  title = g_strdup_printf ("%s:", option->track->label);
 
174
  g_object_get (option->track, "label", &track_label, NULL);
 
175
  title = g_strdup_printf ("%s:", track_label);
 
176
  g_free (track_label);
174
177
 
175
178
  label = gtk_label_new (title);
176
179
  gtk_box_pack_start (GTK_BOX (option), label, FALSE, FALSE, 0);