r15647 - in /desktop/unstable/gnome-media/debian: changelog patches/02_restore-mixer-track-type.patch patches/03_enable-disable-correct-track.patch patches/04_sort-tracks-by-type.patch
samm-guest at users.alioth.debian.org
samm-guest at users.alioth.debian.org
Tue Apr 15 17:33:41 UTC 2008
Author: samm-guest
Date: Tue Apr 15 17:33:41 2008
New Revision: 15647
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15647
Log:
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>.
* Add 04_sort-tracks-by-type.patch. Taken from
<http://bugzilla.gnome.org/528064>.
Added:
desktop/unstable/gnome-media/debian/patches/03_enable-disable-correct-track.patch
desktop/unstable/gnome-media/debian/patches/04_sort-tracks-by-type.patch
Modified:
desktop/unstable/gnome-media/debian/changelog
desktop/unstable/gnome-media/debian/patches/02_restore-mixer-track-type.patch
Modified: desktop/unstable/gnome-media/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/changelog?rev=15647&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/changelog (original)
+++ desktop/unstable/gnome-media/debian/changelog Tue Apr 15 17:33:41 2008
@@ -1,7 +1,13 @@
gnome-media (2.22.0-2) UNRELEASED; urgency=low
* Add 02_restore-mixer-track-type.patch to restore the display of the type
- of each track in the volume control preferences.
+ 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>.
+ * Add 04_sort-tracks-by-type.patch. Taken from
+ <http://bugzilla.gnome.org/528064>.
-- Sam Morris <sam at robots.org.uk> Tue, 15 Apr 2008 01:23:28 +0100
Modified: desktop/unstable/gnome-media/debian/patches/02_restore-mixer-track-type.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/patches/02_restore-mixer-track-type.patch?rev=15647&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/patches/02_restore-mixer-track-type.patch (original)
+++ desktop/unstable/gnome-media/debian/patches/02_restore-mixer-track-type.patch Tue Apr 15 17:33:41 2008
@@ -1,7 +1,16 @@
-Taken from http://bugzilla.gnome.org/show_bug.cgi?id=528064
---- a/gst-mixer/src/preferences.c (revision 3834)
-+++ b/gst-mixer/src/preferences.c (working copy)
-@@ -313,6 +313,7 @@
+Index: gst-mixer/src/preferences.c
+===================================================================
+--- gst-mixer/src/preferences.c (revision 3834)
++++ gst-mixer/src/preferences.c (working copy)
+@@ -288,7 +307,6 @@
+ /* remove old */
+ while (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)) {
+ gtk_list_store_remove (store, &iter);
+- /* does this free COL_TYPE? */
+ }
+
+ /* take/put reference */
+@@ -313,6 +331,7 @@
COL_ACTIVE, active,
COL_LABEL, track->label,
COL_TRACK, track,
@@ -9,3 +18,22 @@
-1);
}
}
+Index: gst-mixer/src/misc.c
+===================================================================
+--- gst-mixer/src/misc.c (revision 3834)
++++ gst-mixer/src/misc.c (working copy)
+@@ -36,11 +36,11 @@
+ case 0:
+ return _("Playback");
+ case 1:
+- return _("Capture");
++ return _("Recording");
+ case 2:
+- return _("Switch");
++ return _("Switches");
+ case 3:
+- return _("Option");
++ return _("Options");
+ }
+
+ g_assert_not_reached ();
Added: 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=15647&op=file
==============================================================================
--- desktop/unstable/gnome-media/debian/patches/03_enable-disable-correct-track.patch (added)
+++ desktop/unstable/gnome-media/debian/patches/03_enable-disable-correct-track.patch Tue Apr 15 17:33:41 2008
@@ -1,0 +1,13 @@
+Index: gst-mixer/src/preferences.c
+===================================================================
+--- gst-mixer/src/preferences.c (revision 3834)
++++ gst-mixer/src/preferences.c (working copy)
+@@ -363,7 +379,7 @@
+ 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) {
+ gtk_list_store_set( GTK_LIST_STORE(model), &iter, COL_ACTIVE, active, -1);
+ break ;
+ }
Added: desktop/unstable/gnome-media/debian/patches/04_sort-tracks-by-type.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/patches/04_sort-tracks-by-type.patch?rev=15647&op=file
==============================================================================
--- desktop/unstable/gnome-media/debian/patches/04_sort-tracks-by-type.patch (added)
+++ desktop/unstable/gnome-media/debian/patches/04_sort-tracks-by-type.patch Tue Apr 15 17:33:41 2008
@@ -1,0 +1,34 @@
+Index: gst-mixer/src/preferences.c
+===================================================================
+--- gst-mixer/src/preferences.c (revision 3834)
++++ gst-mixer/src/preferences.c (working copy)
+@@ -75,6 +75,20 @@
+ gtkdialog_class->response = gnome_volume_control_preferences_response;
+ }
+
++/*
++ * Mixer tracks are sorted by their types.
++ */
++static gint
++sort_by_page_num (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data)
++{
++ GstMixerTrack *a_track, *b_track;
++
++ gtk_tree_model_get (model, a, COL_TRACK, &a_track, -1);
++ gtk_tree_model_get (model, b, COL_TRACK, &b_track, -1);
++
++ return get_page_num (a_track) - get_page_num (b_track);
++}
++
+ static void
+ gnome_volume_control_preferences_init (GnomeVolumeControlPreferences *prefs)
+ {
+@@ -109,6 +123,8 @@
+
+ store = gtk_list_store_new (NUM_COLS, G_TYPE_BOOLEAN,
+ G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING);
++ gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store), sort_by_page_num, NULL, NULL);
++ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
+ prefs->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (prefs->treeview), FALSE);
+ gtk_label_set_mnemonic_widget (GTK_LABEL(label), GTK_WIDGET (prefs->treeview));
More information about the pkg-gnome-commits
mailing list