Merge lp:~binli/ubuntu/precise/gnome-control-center/lp1291862 into lp:ubuntu/precise-updates/gnome-control-center

[Bin Li]

    First enable input bar when an new input device is added, backport from
    unity-control-center.
    Second, disable input bar when there are not input devices.

[lp:~binli/ubuntu/precise/gnome-control-center/lp1291862]

265. By Bin Li on 2014-03-17

just provide the patch, and restore panels/sound-nua/gvc-mixer-dialog.c

[Sebastien Bacher (seb128)]

Thanks for the work, could you update the change to match what was uploaded to trusty in https://code.launchpad.net/~binli/unity-control-center/1291862/+merge/211258 ?

review: Needs Fixing

[lp:~binli/ubuntu/precise/gnome-control-center/lp1291862]

266. By Bin Li on 2014-04-01

sync with trusty's change

267. By Bin Li on 2014-04-01

update the changelog

268. By Bin Li on 2014-04-01

tiny change for format

[Bin Li (binli)]

> Thanks for the work, could you update the change to match what was uploaded to
> trusty in https://code.launchpad.net/~binli/unity-control-
> center/1291862/+merge/211258 ?

Done, please review it again, thanks!

review: Needs Resubmitting

[Sebastien Bacher (seb128)]

Thanks, I merged that to the packaging vcs lp:~ubuntu-desktop/gnome-control-center/precise and uploaded the version, it's waiting in the SRU review queue next

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-30 11:33:55 +0000
+++ debian/changelog	2014-04-01 10:32:10 +0000
@@ -1,3 +1,9 @@
+gnome-control-center (1:3.4.2-0ubuntu0.13.2) precise; urgency=medium
+
+  * Disable the input/output bar when no input/output devices (LP: #1291862)
+
+ -- Bin Li <[e-mail]>  Thu, 13 Mar 2014 18:55:05 +0800
+
 gnome-control-center (1:3.4.2-0ubuntu0.13.1) precise; urgency=low
 
   * Add 20 minutes and 2 hours options for the suspend time in system

=== added file 'debian/patches/fix-input-device-bar-status.patch'
--- debian/patches/fix-input-device-bar-status.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-input-device-bar-status.patch	2014-04-01 10:32:10 +0000
@@ -0,0 +1,123 @@
+Index: gnome-control-center/panels/sound-nua/gvc-mixer-dialog.c
+===================================================================
+--- gnome-control-center.orig/panels/sound-nua/gvc-mixer-dialog.c	2014-04-01 18:27:58.040627755 +0800
++++ gnome-control-center/panels/sound-nua/gvc-mixer-dialog.c	2014-04-01 18:29:29.240036086 +0800
+@@ -721,7 +721,11 @@
+         model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->priv->input_treeview));
+ 
+         if (gtk_tree_model_get_iter_first (model, &iter) == FALSE){
+-                g_warning ("The tree is empty => we have no devices so cannot set the active input");
++                /* When there are no device we need disable the input bar and set the original name */
++                gtk_label_set_label (GTK_LABEL(dialog->priv->selected_input_label),
++                                     _("Settings for the selected device"));
++                gtk_widget_set_sensitive (dialog->priv->input_bar, FALSE);
++                g_debug ("The tree is empty => we have no devices so cannot set the active input");
+                 return;        
+         }
+         
+@@ -850,7 +854,11 @@
+         model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->priv->output_treeview));
+ 
+         if (gtk_tree_model_get_iter_first (model, &iter) == FALSE){
+-                g_warning ("The tree is empty => we have no devices in the tree => cannot set the active output");
++                /* When there are no device we need disable the output bar and set the original name */
++                gtk_label_set_label (GTK_LABEL(dialog->priv->selected_output_label),
++                                     _("Settings for the selected device"));
++                gtk_widget_set_sensitive (dialog->priv->output_bar, FALSE);
++                g_debug ("The tree is empty => we have no devices in the tree => cannot set the active output");
+                 return;        
+         }
+         
+@@ -1328,7 +1336,11 @@
+                          guint            id,
+                          GvcMixerDialog  *dialog)
+ {
++        gboolean          is_first_device;
++        GtkTreeModel     *model;
++        GtkTreeIter       iter;
+ 	GvcMixerUIDevice* out = NULL;
++
+ 	out = gvc_mixer_control_lookup_output_id (control, id);
+ 
+ 	if (out == NULL) {
+@@ -1336,7 +1348,12 @@
+ 		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
+@@ -1374,14 +1391,25 @@
+                         guint            id,
+                         GvcMixerDialog  *dialog)
+ {
++        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);
++	/* update input bar when new input device added */
++        if (is_first_device)
++                active_input_update (dialog, in);
+ }
+ 
+ static void
+@@ -1390,6 +1418,7 @@
+                            GvcMixerDialog  *dialog)
+ {
+         GtkWidget    *bar;
++        gboolean      is_last_device;
+         gboolean      found;
+         GtkTreeIter   iter;
+         GtkTreeModel *model;
+@@ -1413,7 +1442,12 @@
+         if (found) {
+                 gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+         }
+-}     
++
++        /* Disable output bar when all output devices removed */
++        is_last_device = !gtk_tree_model_get_iter_first (model, &iter);
++        if (is_last_device)
++               active_output_update (dialog, out);
++}
+ 
+ 
+                  
+@@ -1424,6 +1458,7 @@
+ {
+         GtkWidget    *bar;
+         gboolean      found;
++        gboolean      is_last_device;
+         GtkTreeIter   iter;
+         GtkTreeModel *model;
+ 
+@@ -1446,6 +1481,11 @@
+         if (found) {
+                 gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+         }        
++
++        /* Disable input bar when all input devices removed */
++        is_last_device = !gtk_tree_model_get_iter_first (model, &iter);
++        if (is_last_device)
++                active_input_update (dialog, in);
+ }
+ 
+ static void

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-10-30 11:33:55 +0000
+++ debian/patches/series	2014-04-01 10:32:10 +0000
@@ -43,3 +43,4 @@
 remove-manual-proxy-in-auto.patch
 use_rfkill_airplane_mode.patch
 more-power-suspend-options.patch
+fix-input-device-bar-status.patch