Merge lp:~charlesk/gnome-control-center/indicator-visibility into lp:~ubuntu-desktop/gnome-control-center/ubuntu

[Charles Kerr]

Adds a visibility toggle for the sound indicator for Bug #829648

This is my first submission of a downstream patch for an upstream package, so cluestick lessons are welcomed.

[Charles Kerr (charlesk)]

Switching to "Work in progress" -- this relies on indicator-sound 0.8.1.0-plus-one to be released first

[lp:~charlesk/gnome-control-center/indicator-visibility]

334. By Charles Kerr on 2012-02-02

Use g_settings_bind() instead of reinventing the wheel with a bunch of GSettings<->checkbox glue code

[Conor Curran (cjcurran)]

review: Approve

[Robert Ancell (robert-ancell)]

Is this still applicable?

Unmerged revisions

334. By Charles Kerr on 2012-02-02

Use g_settings_bind() instead of reinventing the wheel with a bunch of GSettings<->checkbox glue code

333. By Charles Kerr on 2012-01-31

 * 60_add_sound_indicator_visibility.patch
   - New patch to add a visibility toggle for the sound indicator (LP: #829648)

=== added file 'debian/patches/60_add_sound_indicator_visibility.patch'
--- debian/patches/60_add_sound_indicator_visibility.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/60_add_sound_indicator_visibility.patch	2012-02-02 21:39:18 +0000
@@ -0,0 +1,42 @@
+--- a/panels/sound/gvc-mixer-dialog.c
++++ b/panels/sound/gvc-mixer-dialog.c
+@@ -80,6 +80,7 @@
+         GtkWidget       *click_feedback_button;
+         GtkWidget       *audible_bell_button;
+         GtkSizeGroup    *size_group;
++        GSettings       *indicator_settings;
+ 
+         gdouble          last_input_peak;
+         guint            num_apps;
+@@ -1752,6 +1753,7 @@
+ {
+         GObject          *object;
+         GvcMixerDialog   *self;
++        GtkWidget        *w;
+         GtkWidget        *main_vbox;
+         GtkWidget        *label;
+         GtkWidget        *alignment;
+@@ -2012,6 +2014,14 @@
+                           G_CALLBACK (on_control_card_removed),
+                           self);
+ 
++        w = gtk_check_button_new_with_mnemonic(_( "_Show sound volume in the menu bar xyzzy"));
++        alignment = gtk_alignment_new (0, 0, 1, 1);
++        gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 0, 5, 5);
++        gtk_container_add (GTK_CONTAINER (alignment), w);
++        gtk_box_pack_start (GTK_BOX (main_vbox), alignment, FALSE, FALSE, 0);
++        self->priv->indicator_settings = g_settings_new ("com.canonical.indicator.sound");
++        g_settings_bind (self->priv->indicator_settings, "visible", w, "active", G_SETTINGS_BIND_DEFAULT);
++
+         gtk_widget_show_all (main_vbox);
+ 
+         streams = gvc_mixer_control_get_streams (self->priv->mixer_control);
+@@ -2036,6 +2046,8 @@
+ {
+         GvcMixerDialog *dialog = GVC_MIXER_DIALOG (object);
+ 
++        g_clear_object (&dialog->priv->indicator_settings);
++
+         if (dialog->priv->mixer_control != NULL) {
+                 g_signal_handlers_disconnect_by_func (dialog->priv->mixer_control,
+                                                       on_control_stream_added,

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-01-25 16:38:52 +0000
+++ debian/patches/series	2012-02-02 21:39:18 +0000
@@ -17,6 +17,7 @@
 55_user_accounts_hide_controls.patch
 56_use_ubuntu_info_branding.patch
 57_use_nonsymbolic_keyboard_icon.patch
+60_add_sound_indicator_visibility.patch
 90_force_fallback.patch
 91_configure_cheese.patch
 90_git_sound_tab_order.patch