1 diff -urN gnome-applets-2.10.1.orig/mixer/ChangeLog gnome-applets-2.10.1/mixer/ChangeLog
2 --- gnome-applets-2.10.1.orig/mixer/ChangeLog 2005-05-24 10:26:01.000000000 +0200
3 +++ gnome-applets-2.10.1/mixer/ChangeLog 2005-05-24 10:27:48.000000000 +0200
5 +2005-04-15 Kjartan Maraas <kmaraas@gnome.org>
7 + * load.c: (create_mixer_collection): Plug a few leaks.
8 + * preferences.c: (gnome_volume_applet_preferences_change),
9 + (cb_track_select): Same here.
11 2005-04-04 Davyd Madeley <davyd@madeley.id.au>
13 * applet.c: (gnome_volume_applet_toggle_mute),
14 diff -urN gnome-applets-2.10.1.orig/mixer/load.c gnome-applets-2.10.1/mixer/load.c
15 --- gnome-applets-2.10.1.orig/mixer/load.c 2005-05-24 10:26:01.000000000 +0200
16 +++ gnome-applets-2.10.1/mixer/load.c 2005-05-24 10:28:32.000000000 +0200
20 /* and recreate this object, since we give it to the mixer */
22 title = g_strdup_printf (gettext("Unknown Volume Control %d"), num);
23 element = gst_element_factory_create (factory, title);
25 diff -urN gnome-applets-2.10.1.orig/mixer/preferences.c gnome-applets-2.10.1/mixer/preferences.c
26 --- gnome-applets-2.10.1.orig/mixer/preferences.c 2005-05-24 10:26:01.000000000 +0200
27 +++ gnome-applets-2.10.1/mixer/preferences.c 2005-05-24 10:31:52.000000000 +0200
34 gboolean change = (mixer != prefs->mixer), res;
38 gtk_combo_box_set_active_iter (GTK_COMBO_BOX (prefs->optionmenu),
44 /* now over to the tracks */
46 if (!strcmp (label, active_track->label)) {
47 gtk_tree_selection_select_iter (sel, &iter);
55 GnomeVolumeAppletPreferences *prefs = data;
64 value = gconf_value_new (GCONF_VALUE_STRING);
65 gconf_value_set_string (value, label);
67 panel_applet_gconf_set_value (PANEL_APPLET (prefs->applet),
68 GNOME_VOLUME_APPLET_KEY_ACTIVE_TRACK,