patches: rebase patchset for gnome-control-center

patches/base/gnome-control-center/no-alert-chooser.patch

@@ -1,9 +1,9 @@
 diff --git a/panels/sound/cc-alert-chooser.c b/panels/sound/cc-alert-chooser.c
 deleted file mode 100644
-index 8e60659..0000000
+index 4d56f58..0000000
 --- a/panels/sound/cc-alert-chooser.c
 +++ /dev/null
-@@ -1,278 +0,0 @@
+@@ -1,275 +0,0 @@
 -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 - *
 - * Copyright (C) 2018 Canonical Ltd.
@@ -27,7 +27,6 @@ index 8e60659..0000000
 -
 -#include "config.h"
 -#include "cc-alert-chooser.h"
--#include "cc-sound-button.h"
 -#include "cc-sound-resources.h"
 -
 -#define KEY_SOUNDS_SCHEMA "org.gnome.desktop.sound"
@@ -36,17 +35,17 @@ index 8e60659..0000000
 -{
 -  GtkBox         parent_instance;
 -
--  CcSoundButton *bark_button;
+-  GtkToggleButton *bark_button;
--  CcSoundButton *drip_button;
+-  GtkToggleButton *drip_button;
--  CcSoundButton *glass_button;
+-  GtkToggleButton *glass_button;
--  CcSoundButton *sonar_button;
+-  GtkToggleButton *sonar_button;
 -
 -  GSoundContext *context;
 -  GSettings     *sound_settings;
 -};
 -
 -static void clicked_cb (CcAlertChooser *self,
--                        CcSoundButton  *button);
+-                        GtkToggleButton  *button);
 -
 -G_DEFINE_TYPE (CcAlertChooser, cc_alert_chooser, GTK_TYPE_BOX)
 -
@@ -191,7 +190,7 @@ index 8e60659..0000000
 -
 -static void
 -set_button (CcAlertChooser *self,
--            CcSoundButton  *button,
+-            GtkToggleButton  *button,
 -            gboolean        active)
 -{
 -  g_signal_handlers_block_by_func (button, clicked_cb, self);
@@ -201,7 +200,7 @@ index 8e60659..0000000
 -
 -static void
 -clicked_cb (CcAlertChooser *self,
--            CcSoundButton  *button)
+-            GtkToggleButton  *button)
 -{
 -  if (button == self->bark_button)
 -    select_sound (self, "bark");
@@ -250,8 +249,6 @@ index 8e60659..0000000
 -  gtk_widget_class_bind_template_child (widget_class, CcAlertChooser, sonar_button);
 -
 -  gtk_widget_class_bind_template_callback (widget_class, clicked_cb);
--
--  g_type_ensure (CC_TYPE_SOUND_BUTTON);
 -}
 -
 -void
@@ -318,10 +315,10 @@ index c6f4b87..0000000
 -G_END_DECLS
 diff --git a/panels/sound/cc-alert-chooser.ui b/panels/sound/cc-alert-chooser.ui
 deleted file mode 100644
-index c673711..0000000
+index d6933f9..0000000
 --- a/panels/sound/cc-alert-chooser.ui
 +++ /dev/null
-@@ -1,38 +0,0 @@
+@@ -1,41 +0,0 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<interface>
 -  <!-- interface-requires gtk+ 3.0 -->
@@ -331,29 +328,32 @@ index c673711..0000000
 -      <class name="linked"/>
 -    </style>
 -    <child>
--      <object class="CcSoundButton" id="bark_button">
+-      <object class="GtkToggleButton" id="bark_button">
 -        <property name="visible">True</property>
 -        <property name="label" translatable="yes">Bark</property>
 -        <signal name="clicked" handler="clicked_cb" object="CcAlertChooser" swapped="yes"/>
 -      </object>
 -    </child>
 -    <child>
--      <object class="CcSoundButton" id="drip_button">
+-      <object class="GtkToggleButton" id="drip_button">
 -        <property name="visible">True</property>
+-        <property name="group">bark_button</property>
 -        <property name="label" translatable="yes">Drip</property>
 -        <signal name="clicked" handler="clicked_cb" object="CcAlertChooser" swapped="yes"/>
 -      </object>
 -    </child>
 -    <child>
--      <object class="CcSoundButton" id="glass_button">
+-      <object class="GtkToggleButton" id="glass_button">
 -        <property name="visible">True</property>
+-        <property name="group">bark_button</property>
 -        <property name="label" translatable="yes">Glass</property>
 -        <signal name="clicked" handler="clicked_cb" object="CcAlertChooser" swapped="yes"/>
 -      </object>
 -    </child>
 -    <child>
--      <object class="CcSoundButton" id="sonar_button">
+-      <object class="GtkToggleButton" id="sonar_button">
 -        <property name="visible">True</property>
+-        <property name="group">bark_button</property>
 -        <property name="label" translatable="yes">Sonar</property>
 -        <signal name="clicked" handler="clicked_cb" object="CcAlertChooser" swapped="yes"/>
 -      </object>
@@ -361,18 +361,18 @@ index c673711..0000000
 -  </template>
 -</interface>
 diff --git a/panels/sound/cc-sound-panel.c b/panels/sound/cc-sound-panel.c
-index 5e6e03d..611d2b9 100644
+index 0de1ca9..9d9b9c7 100644
 --- a/panels/sound/cc-sound-panel.c
 +++ b/panels/sound/cc-sound-panel.c
-@@ -31,7 +31,6 @@
+@@ -30,7 +30,6 @@
+ #include <pulse/pulseaudio.h>
  #include <gvc-mixer-control.h>
  
- #include "list-box-helper.h"
 -#include "cc-alert-chooser.h"
  #include "cc-balance-slider.h"
  #include "cc-device-combo-box.h"
  #include "cc-fade-slider.h"
-@@ -267,7 +266,6 @@ cc_sound_panel_class_init (CcSoundPanelClass *klass)
+@@ -270,7 +269,6 @@ cc_sound_panel_class_init (CcSoundPanelClass *klass)
    gtk_widget_class_bind_template_callback (widget_class, output_device_changed_cb);
    gtk_widget_class_bind_template_callback (widget_class, test_output_configuration_button_clicked_cb);
  
@@ -380,39 +380,11 @@ index 5e6e03d..611d2b9 100644
    g_type_ensure (CC_TYPE_BALANCE_SLIDER);
    g_type_ensure (CC_TYPE_DEVICE_COMBO_BOX);
    g_type_ensure (CC_TYPE_FADE_SLIDER);
-diff --git a/panels/sound/cc-sound-panel.ui b/panels/sound/cc-sound-panel.ui
-index b5706e2..ab4380a 100644
---- a/panels/sound/cc-sound-panel.ui
-+++ b/panels/sound/cc-sound-panel.ui
-@@ -364,23 +364,6 @@
-                     </child>
-                   </object>
-                 </child>
--                <child>
--                  <object class="GtkLabel">
--                    <property name="visible">True</property>
--                    <property name="xalign">0</property>
--                    <property name="margin-top">18</property>
--                    <property name="label" translatable="yes">Alert Sound</property>
--                    <attributes>
--                      <attribute name="weight" value="bold"/>
--                    </attributes>
--                  </object>
--                </child>
--                <child>
--                  <object class="CcAlertChooser">
--                    <property name="visible">True</property>
--                    <property name="hexpand">True</property>
--                  </object>
--                </child>
-               </object>
-             </child>
-           </object>
 diff --git a/panels/sound/meson.build b/panels/sound/meson.build
-index fa0f128..f47e7f6 100644
+index dd8d0b6..6367db2 100644
 --- a/panels/sound/meson.build
 +++ b/panels/sound/meson.build
-@@ -31,7 +31,6 @@ cflags += [
+@@ -30,7 +30,6 @@ cflags += [
  ]
  
  sources = files(
@@ -420,7 +392,7 @@ index fa0f128..f47e7f6 100644
    'cc-balance-slider.c',
    'cc-device-combo-box.c',
    'cc-fade-slider.c',
-@@ -67,7 +66,6 @@ resource_data = files(
+@@ -65,7 +64,6 @@ resource_data = files(
    'icons/audio-speaker-right.svg',
    'icons/audio-speaker-right-testing.svg',
    'icons/audio-speaker-testing.svg',
@@ -429,7 +401,7 @@ index fa0f128..f47e7f6 100644
    'cc-device-combo-box.ui',
    'cc-fade-slider.ui',
 diff --git a/panels/sound/sound.gresource.xml b/panels/sound/sound.gresource.xml
-index a7b662d..0f6b20f 100644
+index cdac713..7073d0a 100644
 --- a/panels/sound/sound.gresource.xml
 +++ b/panels/sound/sound.gresource.xml
 @@ -1,7 +1,6 @@