Merge lp:~diwic/gnome-control-center/fixes-2012-12-07 into lp:~ubuntu-desktop/gnome-control-center/ubuntu

[David Henningsson]

Two fixes:

The first one is a preparation for PulseAudio 3.

The second one is another attempt to upstream an old bug.

[Sebastien Bacher (seb128)]

@David: thanks for the work, I was sort of waiting on an upstream review before commiting, any chance you could ping Bastien to get the patch reviewed?

Otherwise, are you confident that the fix is right? Your upstream comment "In short; is the attached patch helping?" is a bit confusing in that regard, do you need testing/confirmation that it works before having it commited?

[David Henningsson (diwic)]

So; I know the patch was helping bug 1060143, but the question was if the upstream bug was the same bug (and helped by the same fix), or if the upstream bug and bug 1060143 are different ones. Is that clarifying things?

[Sebastien Bacher (seb128)]

Thanks David, that looks good

review: Approve

=== added file 'debian/patches/git-sound-fix-port-handling.patch'
--- debian/patches/git-sound-fix-port-handling.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git-sound-fix-port-handling.patch	2012-12-07 14:54:24 +0000
@@ -0,0 +1,24 @@
+commit 10a0c18b8e3058144586880019b68ab4ea40ce78
+Author: David Henningsson <[e-mail]>
+Date:   Fri Dec 7 16:22:09 2012 +0530
+
+    sound: Fix port handling for the unknown availability case
+    
+    The current code assumes that port availability transitions will be
+    between YES and NO, and doesn't account for the fact that it may also be
+    UNKNOWN. This causes spurious entries if the port availability
+    transitions between YES and UNKNOWN.
+
+diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c
+index 34ddc0c..2f6cf34 100644
+--- a/panels/sound/gvc-mixer-control.c
++++ b/panels/sound/gvc-mixer-control.c
+@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl      *control,
+                 else {
+                         for (i = 0; i < info->n_ports; i++) {
+                                 if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) {
+-                                        if (card_port->available != info->ports[i]->available) {
++                                        if ((card_port->available == PA_PORT_AVAILABLE_NO) !=  (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) {
+                                                 card_port->available = info->ports[i]->available;
+                                                 g_debug ("sync port availability on card %i, card port name '%s', new available value %i",
+                                                           gvc_mixer_card_get_index (card),

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-24 19:01:24 +0000
+++ debian/patches/series	2012-12-07 14:54:24 +0000
@@ -30,3 +30,4 @@
 accounts_fix_unsetting_icon.patch
 sound_nua_panel.patch
 git_set_a11y_wm_theme.patch
+git-sound-fix-port-handling.patch

=== modified file 'debian/patches/sound_nua_panel.patch'
--- debian/patches/sound_nua_panel.patch	2012-11-13 15:53:30 +0000
+++ debian/patches/sound_nua_panel.patch	2012-12-07 14:54:24 +0000
@@ -2,11 +2,11 @@
 # Most of the code has now been upstreamed to Gnome, but they wanted
 # to keep their old design, so about 25% of the original patch remains.
 === modified file 'configure.ac'
-Index: gnome-control-center-3.6.2/configure.ac
+Index: gnome-control-center-3.6.3/configure.ac
 ===================================================================
---- gnome-control-center-3.6.2.orig/configure.ac	2012-11-13 16:25:40.665717988 +0100
-+++ gnome-control-center-3.6.2/configure.ac	2012-11-13 16:25:40.773717987 +0100
-@@ -435,6 +435,9 @@
+--- gnome-control-center-3.6.3.orig/configure.ac	2012-12-07 14:27:22.997580116 +0100
++++ gnome-control-center-3.6.3/configure.ac	2012-12-07 14:27:28.297580038 +0100
+@@ -416,6 +416,9 @@
  panels/online-accounts/icons/32x32/Makefile
  panels/online-accounts/icons/48x48/Makefile
  panels/online-accounts/icons/256x256/Makefile
@@ -16,10 +16,10 @@
  panels/sound/Makefile
  panels/sound/data/Makefile
  panels/sound/data/gnome-sound-panel.desktop.in
-Index: gnome-control-center-3.6.2/panels/Makefile.am
+Index: gnome-control-center-3.6.3/panels/Makefile.am
 ===================================================================
---- gnome-control-center-3.6.2.orig/panels/Makefile.am	2012-10-01 11:38:59.000000000 +0200
-+++ gnome-control-center-3.6.2/panels/Makefile.am	2012-11-13 16:25:40.777717988 +0100
+--- gnome-control-center-3.6.3.orig/panels/Makefile.am	2012-12-07 14:27:22.997580116 +0100
++++ gnome-control-center-3.6.3/panels/Makefile.am	2012-12-07 14:27:28.297580038 +0100
 @@ -10,6 +10,7 @@
  	region \
  	info \
@@ -28,10 +28,10 @@
  	keyboard \
  	universal-access \
  	user-accounts \
-Index: gnome-control-center-3.6.2/panels/sound-nua/Makefile.am
+Index: gnome-control-center-3.6.3/panels/sound-nua/Makefile.am
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.6.2/panels/sound-nua/Makefile.am	2012-11-13 16:25:40.777717988 +0100
++++ gnome-control-center-3.6.3/panels/sound-nua/Makefile.am	2012-12-07 14:27:28.297580038 +0100
 @@ -0,0 +1,63 @@
 +SUBDIRS = data
 +
@@ -96,10 +96,10 @@
 +        Makefile.in
 +
 +-include $(top_srcdir)/git.mk
-Index: gnome-control-center-3.6.2/panels/sound-nua/cc-sound-panel.c
+Index: gnome-control-center-3.6.3/panels/sound-nua/cc-sound-panel.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.6.2/panels/sound-nua/cc-sound-panel.c	2012-11-13 16:25:40.777717988 +0100
++++ gnome-control-center-3.6.3/panels/sound-nua/cc-sound-panel.c	2012-12-07 14:27:28.297580038 +0100
 @@ -0,0 +1,141 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -242,10 +242,10 @@
 +{
 +}
 +
-Index: gnome-control-center-3.6.2/panels/sound-nua/cc-sound-panel.h
+Index: gnome-control-center-3.6.3/panels/sound-nua/cc-sound-panel.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.6.2/panels/sound-nua/cc-sound-panel.h	2012-11-13 16:25:40.777717988 +0100
++++ gnome-control-center-3.6.3/panels/sound-nua/cc-sound-panel.h	2012-12-07 14:27:28.301580038 +0100
 @@ -0,0 +1,60 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -307,10 +307,10 @@
 +
 +#endif /* _CC_SOUND_PANEL_H */
 +
-Index: gnome-control-center-3.6.2/panels/sound-nua/data/Makefile.am
+Index: gnome-control-center-3.6.3/panels/sound-nua/data/Makefile.am
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.6.2/panels/sound-nua/data/Makefile.am	2012-11-13 16:25:40.777717988 +0100
++++ gnome-control-center-3.6.3/panels/sound-nua/data/Makefile.am	2012-12-07 14:27:28.301580038 +0100
 @@ -0,0 +1,17 @@
 +NULL =
 +
@@ -329,10 +329,10 @@
 +	$(NULL)
 +
 +-include $(top_srcdir)/git.mk
-Index: gnome-control-center-3.6.2/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in
+Index: gnome-control-center-3.6.3/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.6.2/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in	2012-11-13 16:25:40.781717988 +0100
++++ gnome-control-center-3.6.3/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in	2012-12-07 14:27:28.301580038 +0100
 @@ -0,0 +1,17 @@
 +[Desktop Entry]
 +_Name=Sound
@@ -351,10 +351,10 @@
 +X-GNOME-Settings-Panel=sound-nua
 +# Translators: those are keywords for the sound control-center panel
 +_Keywords=Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;
-Index: gnome-control-center-3.6.2/panels/sound-nua/gvc-balance-bar.c
+Index: gnome-control-center-3.6.3/panels/sound-nua/gvc-balance-bar.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.6.2/panels/sound-nua/gvc-balance-bar.c	2012-11-13 16:25:40.797717987 +0100
++++ gnome-control-center-3.6.3/panels/sound-nua/gvc-balance-bar.c	2012-12-07 14:27:28.301580038 +0100
 @@ -0,0 +1,575 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -931,10 +931,10 @@
 +
 +        return GTK_WIDGET (bar);
 +}
-Index: gnome-control-center-3.6.2/panels/sound-nua/gvc-balance-bar.h
+Index: gnome-control-center-3.6.3/panels/sound-nua/gvc-balance-bar.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.6.2/panels/sound-nua/gvc-balance-bar.h	2012-11-13 16:25:40.873717987 +0100
++++ gnome-control-center-3.6.3/panels/sound-nua/gvc-balance-bar.h	2012-12-07 14:27:28.305580037 +0100
 @@ -0,0 +1,70 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -1006,11 +1006,11 @@
 +G_END_DECLS
 +
 +#endif /* __GVC_BALANCE_BAR_H */
-Index: gnome-control-center-3.6.2/panels/sound-nua/gvc-mixer-dialog.c
+Index: gnome-control-center-3.6.3/panels/sound-nua/gvc-mixer-dialog.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.6.2/panels/sound-nua/gvc-mixer-dialog.c	2012-11-13 16:26:26.245717312 +0100
-@@ -0,0 +1,2187 @@
++++ gnome-control-center-3.6.3/panels/sound-nua/gvc-mixer-dialog.c	2012-12-07 14:33:29.305574678 +0100
+@@ -0,0 +1,2207 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
 + * Copyright (C) 2008 William Jon McCann
@@ -2325,7 +2325,11 @@
 +                         guint            id,
 +                         GvcMixerDialog  *dialog)
 +{
-+	GvcMixerUIDevice* out = NULL;
++        gboolean          is_first_device;
++        GtkTreeModel     *model;
++        GtkTreeIter       iter;
++        GvcMixerUIDevice *out = NULL;
++
 +	out = gvc_mixer_control_lookup_output_id (control, id);
 +
 +	if (out == NULL) {
@@ -2333,7 +2337,13 @@
 +		return;
 +	}
 +
++        model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->priv->output_treeview));
++        is_first_device = !gtk_tree_model_get_iter_first (model, &iter);
++
 +	add_output_ui_entry (dialog, out);
++        if (is_first_device)
++                active_output_update (dialog, out);
++
 +}
 +
 +static void
@@ -2371,14 +2381,24 @@
 +                        guint            id,
 +                        GvcMixerDialog  *dialog)
 +{
-+	GvcMixerUIDevice* in = NULL;
++        gboolean          is_first_device;
++        GtkTreeModel     *model;
++        GtkTreeIter       iter;
++        GvcMixerUIDevice *in = NULL;
++
 +	in = gvc_mixer_control_lookup_input_id (control, id);
 +
 +	if (in == NULL) {
 +		g_warning ("on_control_input_added - tried to fetch an input of id %u but got nothing", id);
 +		return;
 +	}
++
++        model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->priv->input_treeview));
++        is_first_device = !gtk_tree_model_get_iter_first (model, &iter);
++
 +	add_input_ui_entry (dialog, in);
++        if (is_first_device)
++                active_input_update (dialog, in);
 +}
 +
 +static void
@@ -3198,10 +3218,10 @@
 +
 +        return TRUE;
 +}
-Index: gnome-control-center-3.6.2/panels/sound-nua/gvc-mixer-dialog.h
+Index: gnome-control-center-3.6.3/panels/sound-nua/gvc-mixer-dialog.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-control-center-3.6.2/panels/sound-nua/gvc-mixer-dialog.h	2012-11-13 16:25:40.893717986 +0100
++++ gnome-control-center-3.6.3/panels/sound-nua/gvc-mixer-dialog.h	2012-12-07 14:27:28.313580037 +0100
 @@ -0,0 +1,56 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -3259,10 +3279,10 @@
 +G_END_DECLS
 +
 +#endif /* __GVC_MIXER_DIALOG_H */
-Index: gnome-control-center-3.6.2/panels/sound/data/gnome-sound-panel.desktop.in.in
+Index: gnome-control-center-3.6.3/panels/sound/data/gnome-sound-panel.desktop.in.in
 ===================================================================
---- gnome-control-center-3.6.2.orig/panels/sound/data/gnome-sound-panel.desktop.in.in	2012-10-01 11:39:00.000000000 +0200
-+++ gnome-control-center-3.6.2/panels/sound/data/gnome-sound-panel.desktop.in.in	2012-11-13 16:25:40.897717987 +0100
+--- gnome-control-center-3.6.3.orig/panels/sound/data/gnome-sound-panel.desktop.in.in	2012-12-07 14:27:22.997580116 +0100
++++ gnome-control-center-3.6.3/panels/sound/data/gnome-sound-panel.desktop.in.in	2012-12-07 14:27:28.313580037 +0100
 @@ -7,7 +7,7 @@
  Type=Application
  StartupNotify=true
@@ -3272,10 +3292,10 @@
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-control-center
  X-GNOME-Bugzilla-Component=sound
-Index: gnome-control-center-3.6.2/panels/universal-access/cc-ua-panel.c
+Index: gnome-control-center-3.6.3/panels/universal-access/cc-ua-panel.c
 ===================================================================
---- gnome-control-center-3.6.2.orig/panels/universal-access/cc-ua-panel.c	2012-11-13 16:25:40.341717994 +0100
-+++ gnome-control-center-3.6.2/panels/universal-access/cc-ua-panel.c	2012-11-13 16:25:40.897717987 +0100
+--- gnome-control-center-3.6.3.orig/panels/universal-access/cc-ua-panel.c	2012-12-07 14:27:22.997580116 +0100
++++ gnome-control-center-3.6.3/panels/universal-access/cc-ua-panel.c	2012-12-07 14:27:28.313580037 +0100
 @@ -492,7 +492,10 @@
    CcShell *shell;
  
@@ -3288,11 +3308,11 @@
  
    return TRUE;
  }
-Index: gnome-control-center-3.6.2/shell/gnome-control-center.c
+Index: gnome-control-center-3.6.3/shell/gnome-control-center.c
 ===================================================================
---- gnome-control-center-3.6.2.orig/shell/gnome-control-center.c	2012-11-13 16:25:40.669717988 +0100
-+++ gnome-control-center-3.6.2/shell/gnome-control-center.c	2012-11-13 16:25:40.897717987 +0100
-@@ -984,6 +984,10 @@
+--- gnome-control-center-3.6.3.orig/shell/gnome-control-center.c	2012-12-07 14:27:22.997580116 +0100
++++ gnome-control-center-3.6.3/shell/gnome-control-center.c	2012-12-07 14:27:28.313580037 +0100
+@@ -1000,6 +1000,10 @@
  
    g_clear_pointer (&priv->current_panel_id, g_free);