Merge ~azzar1/ubuntu/+source/gnome-control-center:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master

[Andrea Azzarone]

[Sebastien Bacher (seb128)]

The change looks good to me, thx

review: Approve

diff --git a/debian/patches/52_region_language.patch b/debian/patches/52_region_language.patch
index 56df791..92cff89 100644
--- a/debian/patches/52_region_language.patch
+++ b/debian/patches/52_region_language.patch
@@ -340,10 +340,11 @@ index b20106d..7f78dbd 100644
          }
  
          gtk_widget_destroy (GTK_WIDGET (chooser));
-@@ -384,6 +388,47 @@ set_system_region (CcRegionPanel *self,
+@@ -383,6 +387,47 @@ set_system_region (CcRegionPanel *self,
+         set_localed_locale (self);
  }
  
- static void
++static void
 +set_formats_locale (const gchar *formats_locale)
 +{
 +        GDBusProxy  *proxy;
@@ -384,10 +385,9 @@ index b20106d..7f78dbd 100644
 +        g_free (user_path);
 +}
 +
-+static void
+ static void
  update_region (CcRegionPanel *self,
                 const gchar   *region)
- {
 @@ -392,6 +437,7 @@ update_region (CcRegionPanel *self,
          } else {
                  if (g_strcmp0 (region, self->region) == 0)
diff --git a/debian/patches/privacy-panel-whoopsie.patch b/debian/patches/privacy-panel-whoopsie.patch
index 407351e..c3114f5 100644
--- a/debian/patches/privacy-panel-whoopsie.patch
+++ b/debian/patches/privacy-panel-whoopsie.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] panels/privacy: add Whoopsie support to privacy panel
 ---
  meson.build                       |  11 ++-
  meson_options.txt                 |   3 +-
- panels/privacy/cc-privacy-panel.c | 200 +++++++++++++++++++++++++++++++++++---
+ panels/privacy/cc-privacy-panel.c | 201 +++++++++++++++++++++++++++++++++++---
  panels/privacy/meson.build        |   3 +
  panels/privacy/privacy.ui         |  86 +++++++++++++++-
- 5 files changed, 286 insertions(+), 17 deletions(-)
+ 5 files changed, 287 insertions(+), 17 deletions(-)
 
 diff --git a/meson.build b/meson.build
 index 2a8519c..5ef0cd5 100644
@@ -51,7 +51,7 @@ index a347168..ce462a7 100644
 +option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
 +option('whoopsie', type: 'boolean', value: false, description: 'build with Whoopsie support')
 diff --git a/panels/privacy/cc-privacy-panel.c b/panels/privacy/cc-privacy-panel.c
-index 8f1abbd..71d5588 100644
+index 8f1abbd..04291fd 100644
 --- a/panels/privacy/cc-privacy-panel.c
 +++ b/panels/privacy/cc-privacy-panel.c
 @@ -35,6 +35,12 @@ typedef struct _NMClient NMClient;
@@ -295,6 +295,14 @@ index 8f1abbd..71d5588 100644
  }
  
  #if defined(BUILD_NETWORK) && NM_CHECK_VERSION(1,10,0)
+@@ -1348,6 +1520,7 @@ cc_privacy_panel_finalize (GObject *object)
+   g_clear_pointer (&self->location_app_switches, g_hash_table_unref);
+   g_clear_object (&self->nm_client);
+   g_clear_pointer (&self->connectivity_check_dialog, gtk_widget_destroy);
++  g_clear_object (&self->whoopsie);
+ 
+   G_OBJECT_CLASS (cc_privacy_panel_parent_class)->finalize (object);
+ }
 diff --git a/panels/privacy/meson.build b/panels/privacy/meson.build
 index b1eec8a..3215b79 100644
 --- a/panels/privacy/meson.build
diff --git a/debian/patches/ubuntu-printer-support.patch b/debian/patches/ubuntu-printer-support.patch
index 2afc304..bb6f4e6 100644
--- a/debian/patches/ubuntu-printer-support.patch
+++ b/debian/patches/ubuntu-printer-support.patch
@@ -26,10 +26,11 @@ index f05a3ec..4d20ab7 100644
  #include <glib/gi18n-lib.h>
  #include <glib/gstdio.h>
  #include <polkit/polkit.h>
-@@ -1108,6 +1109,32 @@ printer_add_cb (GtkToolButton *toolbutton,
+@@ -1107,6 +1108,32 @@ printer_add_cb (GtkToolButton *toolbutton,
+                     self);
  }
  
- static void
++static void
 +show_system_config_printer (void)
 +{
 +  GAppInfo *app_info;
@@ -55,10 +56,9 @@ index f05a3ec..4d20ab7 100644
 +  g_object_unref (ctx);
 +}
 +
-+static void
+ static void
  update_sensitivity (gpointer user_data)
  {
-   CcPrintersPanelPrivate  *priv;
 @@ -1424,6 +1451,14 @@ cc_printers_panel_init (CcPrintersPanel *self)
      gtk_builder_get_object (priv->builder, "printer-add-button2");
    g_signal_connect (widget, "clicked", G_CALLBACK (printer_add_cb), self);