Skip to content
Commits on Source (25)
Hide whitespace changes
Inline Side-by-side
NEWS
View file @ cb27e558
================
Version 3.36.4
================
- Updated translations.
Sound:
- sound: Stop non-interactive profile changes from triggering changed events.
Users:
- Don't limit the number of maximum fingerprint enroll stages.
- Don't use sync calls for deleting fingerprints.
- Only load the fingerprint state once.
- Make the fingerprint operations cancellable.
- Don't wait for fprintd on initialization.
================
Version 3.36.3
================
......
debian/changelog
View file @ cb27e558
gnome-control-center (1:3.36.3-1ubuntu2) groovy; urgency=medium
gnome-control-center (1:3.36.4-0ubuntu1) focal; urgency=medium
* debian/patches/git-sound-profile.patch:
- sound: Stop non-interactive profile changes from triggering
changed events, fix selection issues (lp: #1885673)
[ Hui Wang ]
* debian/patches/gitlab_ucm_mixer_control_select.patch:
- consolidate port finding and setting with/without ucm (lp: #1885673)
-- Sebastien Bacher <seb128@ubuntu.com> Thu, 02 Jul 2020 11:01:31 +0200
[ Marco Trevisan (Treviño) ]
* New stable version (lp: #1886495)
* Refresh patches:
- d/p/0028-user-panel-Add-reference-to-selected-user-and-clear-.patch,
d/p/0029-user-panel-Don-t-wait-for-fprintd-on-initialization.patch,
d/p/0030-fingerprint-dialog-Don-t-use-sync-calls-for-deleting.patch,
d/p/0031-fingerprint-dialog-Don-t-limit-the-number-of-maximum.patch,
d/p/git-sound-profile.patch:
+ Removed, applied upstream
- d/p/Revert-build-Bump-build-dependency-on-polkit.patch:
+ Removed, was a duplicated file for patch 0021.
* user-accounts: Use newly designed fingerprint enroll dialog (LP: #1873298)
-- Sebastien Bacher <seb128@ubuntu.com> Wed, 08 Jul 2020 17:03:08 +0200
gnome-control-center (1:3.36.3-0ubuntu1) focal; urgency=medium
......
debian/patches/0001-Expose-touchpad-settings-if-synaptics-is-in-use.patch
View file @ cb27e558
From 8359ec5704e0ea8eb5fbab3ac8a4518a710576cc Mon Sep 17 00:00:00 2001
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Fri, 16 Mar 2018 13:53:10 -0400
Subject: [PATCH 01/26] Expose touchpad settings if synaptics is in use
......@@ -21,7 +20,7 @@ https://gitlab.gnome.org/GNOME/mutter/merge_requests/37
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/panels/mouse/cc-mouse-caps-helper.c b/panels/mouse/cc-mouse-caps-helper.c
index 69546b2b6..39534b912 100644
index 69546b2..39534b9 100644
--- a/panels/mouse/cc-mouse-caps-helper.c
+++ b/panels/mouse/cc-mouse-caps-helper.c
@@ -38,6 +38,13 @@ touchpad_check_capabilities_x11 (gboolean *have_two_finger_scrolling,
......@@ -39,7 +38,7 @@ index 69546b2b6..39534b912 100644
display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
prop_scroll_methods = XInternAtom (display, "libinput Scroll Methods Available", False);
diff --git a/panels/mouse/cc-mouse-panel.c b/panels/mouse/cc-mouse-panel.c
index df2cd4b7a..a90062f72 100644
index df2cd4b..a90062f 100644
--- a/panels/mouse/cc-mouse-panel.c
+++ b/panels/mouse/cc-mouse-panel.c
@@ -72,7 +72,6 @@ struct _CcMousePanel
......@@ -87,6 +86,3 @@ index df2cd4b7a..a90062f72 100644
setup_dialog (self);
}
--
2.25.1
debian/patches/0002-Debian-s-adduser-doesn-t-allow-uppercase-letters-by-.patch
View file @ cb27e558
From 2bdaa34a42f9f9a4c77f6c97e527464f71ac4712 Mon Sep 17 00:00:00 2001
From: Andrea Azzarone <andrea.azzarone@canonical.com>
Date: Tue, 31 Jul 2018 04:44:11 +0100
Subject: [PATCH 02/26] Debian's adduser doesn't allow uppercase letters by
......@@ -11,7 +10,7 @@ Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910141
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/panels/user-accounts/cc-add-user-dialog.c b/panels/user-accounts/cc-add-user-dialog.c
index 0b955c17e..70f560259 100644
index 0b955c1..70f5602 100644
--- a/panels/user-accounts/cc-add-user-dialog.c
+++ b/panels/user-accounts/cc-add-user-dialog.c
@@ -234,7 +234,7 @@ local_create_user (CcAddUserDialog *self)
......@@ -23,6 +22,3 @@ index 0b955c17e..70f560259 100644
name,
account_type,
self->cancellable,
--
2.25.1
debian/patches/0003-info-overview-Use-the-Ubuntu-logo-prominently.patch
View file @ cb27e558
From ca02a2d2c5ef4e9daa7feb722358d63eb3b68644 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 3 Feb 2020 14:46:15 +0100
Subject: [PATCH 03/26] info-overview: Use the Ubuntu logo prominently
......@@ -15,7 +14,7 @@ See https://bugzilla.gnome.org/show_bug.cgi?id=695691
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui
index de377bb69..5333246e0 100644
index de377bb..5333246 100644
--- a/panels/info-overview/cc-info-overview-panel.ui
+++ b/panels/info-overview/cc-info-overview-panel.ui
@@ -30,7 +30,8 @@
......@@ -28,6 +27,3 @@ index de377bb69..5333246e0 100644
</object>
<packing>
<property name="expand">False</property>
--
2.25.1
debian/patches/0004-Display-locale-modifiers-properly.patch
View file @ cb27e558
From e422109ccd4b0869a857e340a8bd5239dd787699 Mon Sep 17 00:00:00 2001
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Mon, 19 Aug 2019 16:17:20 +0100
Subject: [PATCH 04/26] Display locale @modifiers properly
......@@ -16,7 +15,7 @@ Forwarded: https://gitlab.gnome.org/GNOME/gnome-desktop/issues/50
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/panels/common/cc-language-chooser.c b/panels/common/cc-language-chooser.c
index c1c11b601..0dde398eb 100644
index c1c11b6..0dde398 100644
--- a/panels/common/cc-language-chooser.c
+++ b/panels/common/cc-language-chooser.c
@@ -52,6 +52,23 @@ struct _CcLanguageChooser {
......@@ -64,6 +63,3 @@ index c1c11b601..0dde398eb 100644
country_local = gnome_get_country_from_code (country_code, NULL);
row = gtk_list_box_row_new ();
--
2.25.1
debian/patches/0005-Adapts-the-region-capplet-and-the-language-chooser-i.patch
View file @ cb27e558
From 9f21053a1b691f746446d58931bef7a4f9adbdff Mon Sep 17 00:00:00 2001
From: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
Date: Mon, 22 Jul 2019 22:24:00 +0200
Subject: [PATCH 05/26] Adapts the region capplet and the language chooser in
......@@ -38,15 +37,15 @@ Subject: [PATCH 05/26] Adapts the region capplet and the language chooser in
* All the formats related locale categories set, not just a subset.
---
panels/common/cc-common-language.c | 137 ++++++++++++++++++++++-----
panels/common/cc-common-language.c | 137 +++++++++++++++++++++++++++++------
panels/common/cc-common-language.h | 4 +
panels/common/cc-language-chooser.c | 4 +-
panels/region/cc-region-panel.c | 120 +++++++++++++++++------
panels/region/cc-region-panel.c | 120 ++++++++++++++++++++++--------
panels/user-accounts/cc-user-panel.c | 12 ++-
5 files changed, 218 insertions(+), 59 deletions(-)
diff --git a/panels/common/cc-common-language.c b/panels/common/cc-common-language.c
index 9357c3e73..c923d825d 100644
index 9357c3e..c923d82 100644
--- a/panels/common/cc-common-language.c
+++ b/panels/common/cc-common-language.c
@@ -161,6 +161,55 @@ cc_common_language_get_current_language (void)
......@@ -251,7 +250,7 @@ index 9357c3e73..c923d825d 100644
g_hash_table_destroy (user_langs);
}
diff --git a/panels/common/cc-common-language.h b/panels/common/cc-common-language.h
index 1f578b7d2..2e5a446fe 100644
index 1f578b7..2e5a446 100644
--- a/panels/common/cc-common-language.h
+++ b/panels/common/cc-common-language.h
@@ -43,6 +43,8 @@ guint cc_common_language_add_available_languages (GtkListStore *store,
......@@ -271,7 +270,7 @@ index 1f578b7d2..2e5a446fe 100644
+
G_END_DECLS
diff --git a/panels/common/cc-language-chooser.c b/panels/common/cc-language-chooser.c
index 0dde398eb..6fde97207 100644
index 0dde398..6fde972 100644
--- a/panels/common/cc-language-chooser.c
+++ b/panels/common/cc-language-chooser.c
@@ -186,7 +186,7 @@ add_languages (CcLanguageChooser *chooser,
......@@ -293,7 +292,7 @@ index 0dde398eb..6fde97207 100644
chooser->no_results = g_object_ref_sink (no_results_widget_new ());
gtk_widget_show (chooser->no_results);
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
index 9b59b23c4..060b48e9e 100644
index 9b59b23..060b48e 100644
--- a/panels/region/cc-region-panel.c
+++ b/panels/region/cc-region-panel.c
@@ -365,6 +365,7 @@ static void
......@@ -495,10 +494,10 @@ index 9b59b23c4..060b48e9e 100644
g_dbus_proxy_call (self->localed,
"SetLocale",
diff --git a/panels/user-accounts/cc-user-panel.c b/panels/user-accounts/cc-user-panel.c
index c2af402a1..92d7988c2 100644
index d5ddb75..0600c7c 100644
--- a/panels/user-accounts/cc-user-panel.c
+++ b/panels/user-accounts/cc-user-panel.c
@@ -836,6 +836,7 @@ show_user (ActUser *user, CcUserPanel *self)
@@ -857,6 +857,7 @@ show_user (ActUser *user, CcUserPanel *self)
name = NULL;
lang = g_strdup (act_user_get_language (user));
......@@ -506,7 +505,7 @@ index c2af402a1..92d7988c2 100644
if (lang && *lang != '\0') {
name = gnome_get_language_from_locale (lang, NULL);
@@ -1002,7 +1003,8 @@ language_response (GtkDialog *dialog,
@@ -1036,7 +1037,8 @@ language_response (GtkDialog *dialog,
CcUserPanel *self)
{
ActUser *user;
......@@ -516,7 +515,7 @@ index c2af402a1..92d7988c2 100644
if (response_id != GTK_RESPONSE_OK) {
gtk_widget_hide (GTK_WIDGET (dialog));
@@ -1010,12 +1012,13 @@ language_response (GtkDialog *dialog,
@@ -1044,12 +1046,13 @@ language_response (GtkDialog *dialog,
}
user = get_selected_user (self);
......@@ -532,7 +531,7 @@ index c2af402a1..92d7988c2 100644
act_user_set_language (user, lang);
}
@@ -1030,10 +1033,13 @@ static void
@@ -1064,10 +1067,13 @@ static void
change_language (CcUserPanel *self)
{
const gchar *current_language;
......@@ -546,6 +545,3 @@ index c2af402a1..92d7988c2 100644
if (self->language_chooser) {
cc_language_chooser_clear_filter (self->language_chooser);
--
2.25.1
debian/patches/0006-keyboard-Add-launch-terminal-shortcut.patch
View file @ cb27e558
From f62c4de6aa5ad504763c14b606c0f85544bb17dd Mon Sep 17 00:00:00 2001
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 31 Jul 2018 04:44:12 +0100
Subject: [PATCH 06/26] keyboard: Add launch terminal shortcut
......@@ -8,7 +7,7 @@ Subject: [PATCH 06/26] keyboard: Add launch terminal shortcut
1 file changed, 2 insertions(+)
diff --git a/panels/keyboard/01-launchers.xml.in b/panels/keyboard/01-launchers.xml.in
index 67c83254b..dd0292dfb 100644
index 67c8325..dd0292d 100644
--- a/panels/keyboard/01-launchers.xml.in
+++ b/panels/keyboard/01-launchers.xml.in
@@ -9,6 +9,8 @@
......@@ -20,6 +19,3 @@ index 67c83254b..dd0292dfb 100644
<KeyListEntry name="www" description="Launch web browser"/>
<KeyListEntry name="home" description="Home folder"/>
--
2.25.1
debian/patches/0007-sound-Allow-volume-to-be-set-above-100.patch
View file @ cb27e558
From 947238ef6cecb4cf5830c95252c84cad9a2cf7d0 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbicha@debian.org>
Date: Sat, 9 Feb 2019 16:32:03 -0500
Subject: [PATCH 07/26] sound: Allow volume to be set above 100%.
......@@ -19,12 +18,12 @@ Origin: ubuntu
Bug-Ubuntu: https://launchpad.net/bugs/1706524
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=710424
---
panels/sound/cc-sound-panel.c | 20 ++++++++
panels/sound/cc-sound-panel.ui | 92 ++++++++++++++++++++++++++++++++++
panels/sound/cc-sound-panel.c | 20 +++++++++
panels/sound/cc-sound-panel.ui | 92 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 112 insertions(+)
diff --git a/panels/sound/cc-sound-panel.c b/panels/sound/cc-sound-panel.c
index 7a7e20b7d..30f12e180 100644
index 7a7e20b..30f12e1 100644
--- a/panels/sound/cc-sound-panel.c
+++ b/panels/sound/cc-sound-panel.c
@@ -65,6 +65,9 @@ struct _CcSoundPanel
......@@ -89,7 +88,7 @@ index 7a7e20b7d..30f12e180 100644
cc_device_combo_box_set_mixer_control (self->input_device_combo_box, self->mixer_control, FALSE);
cc_device_combo_box_set_mixer_control (self->output_device_combo_box, self->mixer_control, TRUE);
diff --git a/panels/sound/cc-sound-panel.ui b/panels/sound/cc-sound-panel.ui
index 588c578d8..18a29951d 100644
index 588c578..18a2995 100644
--- a/panels/sound/cc-sound-panel.ui
+++ b/panels/sound/cc-sound-panel.ui
@@ -37,6 +37,98 @@
......@@ -191,6 +190,3 @@ index 588c578d8..18a29951d 100644
<child>
<object class="GtkLabel">
<property name="visible">True</property>
--
2.25.1
debian/patches/0008-Allow-tweaking-some-settings-for-Ubuntu-Dock.patch
View file @ cb27e558
......@@ -1817,7 +1817,7 @@ index 0000000..7117d12
+ </gresource>
+</gresources>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e58a1be..1dec117 100644
index 33b121b..2440ec9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -209,6 +209,9 @@ panels/thunderbolt/cc-bolt-device-entry.c
......
debian/patches/0009-lock-Add-Lock-Screen-on-Suspend-option.patch
View file @ cb27e558
From 2ac9945f26164f1cb1257be5580d8e3f1644732a Mon Sep 17 00:00:00 2001
From: Tim Lunn <tim@feathertop.org>
Date: Mon, 3 Jun 2013 17:27:45 +1000
Subject: [PATCH 09/26] lock: Add "Lock Screen on Suspend" option
......@@ -9,7 +8,7 @@ Subject: [PATCH 09/26] lock: Add "Lock Screen on Suspend" option
2 files changed, 25 insertions(+)
diff --git a/panels/lock/cc-lock-panel.c b/panels/lock/cc-lock-panel.c
index cab917dd4..3706a940b 100644
index cab917d..3706a94 100644
--- a/panels/lock/cc-lock-panel.c
+++ b/panels/lock/cc-lock-panel.c
@@ -39,6 +39,7 @@ struct _CcLockPanel
......@@ -42,7 +41,7 @@ index cab917dd4..3706a940b 100644
set_blank_screen_delay_value (self, value);
}
diff --git a/panels/lock/cc-lock-panel.ui b/panels/lock/cc-lock-panel.ui
index ae8491572..09ee9b9da 100644
index ae84915..09ee9b9 100644
--- a/panels/lock/cc-lock-panel.ui
+++ b/panels/lock/cc-lock-panel.ui
@@ -98,6 +98,23 @@
......@@ -69,6 +68,3 @@ index ae8491572..09ee9b9da 100644
<!-- Show Notifications row -->
<child>
<object class="HdyActionRow">
--
2.25.1
debian/patches/0010-Provide-an-api-for-the-installation-of-language-pack.patch
View file @ cb27e558
From 4c6060c17ffd3926813208077edb6f823e3fa51d Mon Sep 17 00:00:00 2001
From: Tim Lunn <tim@feathertop.org>
Date: Fri, 11 Sep 2015 13:43:40 +1000
Subject: [PATCH 10/26] Provide an api for the installation of language packs
......@@ -7,12 +6,12 @@ This adds cc_common_language_maybe_install() which uses
PackageKit WhatProvides locale() to locate and install
language packs for the selected language
---
panels/common/cc-common-language.c | 198 +++++++++++++++++++++++++++++
panels/common/cc-common-language.c | 198 +++++++++++++++++++++++++++++++++++++
panels/common/cc-common-language.h | 2 +
2 files changed, 200 insertions(+)
diff --git a/panels/common/cc-common-language.c b/panels/common/cc-common-language.c
index c923d825d..d025bf2a9 100644
index c923d82..d025bf2 100644
--- a/panels/common/cc-common-language.c
+++ b/panels/common/cc-common-language.c
@@ -393,3 +393,201 @@ cc_common_language_add_user_languages (GtkTreeModel *model)
......@@ -218,7 +217,7 @@ index c923d825d..d025bf2a9 100644
+ return FALSE;
+}
diff --git a/panels/common/cc-common-language.h b/panels/common/cc-common-language.h
index 2e5a446fe..4f46cc3fa 100644
index 2e5a446..4f46cc3 100644
--- a/panels/common/cc-common-language.h
+++ b/panels/common/cc-common-language.h
@@ -50,6 +50,8 @@ GHashTable *cc_common_language_get_initial_languages (void);
......@@ -230,6 +229,3 @@ index 2e5a446fe..4f46cc3fa 100644
void cc_common_language_setup_list (GtkWidget *treeview,
GHashTable *users,
GHashTable *initial);
--
2.25.1
debian/patches/0011-region-Add-Language-Selector-button.patch
View file @ cb27e558
From 135f55c2ab1d7d6e783d6e931202ae755bc1015b Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbicha@ubuntu.com>
Date: Thu, 14 Sep 2017 09:23:42 -0400
Subject: [PATCH 11/26] region: Add Language Selector button
......@@ -10,7 +9,7 @@ Workaround for https://launchpad.net/bugs/1631750
2 files changed, 49 insertions(+)
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
index 060b48e9e..a8f7293fd 100644
index 060b48e..a8f7293 100644
--- a/panels/region/cc-region-panel.c
+++ b/panels/region/cc-region-panel.c
@@ -73,6 +73,7 @@ struct _CcRegionPanel {
......@@ -65,7 +64,7 @@ index 060b48e9e..a8f7293fd 100644
static void
diff --git a/panels/region/cc-region-panel.ui b/panels/region/cc-region-panel.ui
index 20456aa5b..77da64187 100644
index 20456aa..77da641 100644
--- a/panels/region/cc-region-panel.ui
+++ b/panels/region/cc-region-panel.ui
@@ -304,6 +304,32 @@
......@@ -101,6 +100,3 @@ index 20456aa5b..77da64187 100644
</object>
</child>
</object>
--
2.25.1
debian/patches/0012-printers-Temporarily-add-an-additional-advanced-prin.patch
View file @ cb27e558
From 96bec77ba3ffe23f8fad2cdbc80b3a889a2fe7f1 Mon Sep 17 00:00:00 2001
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 31 Jul 2018 04:44:12 +0100
Subject: [PATCH 12/26] printers: Temporarily add an additional advanced
......@@ -12,14 +11,14 @@ Origin: ubuntu
Bug-Ubuntu: https://launchpad.net/bugs/1706524a
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=692532
---
panels/printers/cc-printers-panel.c | 28 +++++++++++++++++++
panels/printers/printers.ui | 43 +++++++++++++++++++++++++++++
panels/printers/cc-printers-panel.c | 28 ++++++++++++++++++++++++
panels/printers/printers.ui | 43 +++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+)
Index: gnome-control-center-3.36.2/panels/printers/cc-printers-panel.c
===================================================================
--- gnome-control-center-3.36.2.orig/panels/printers/cc-printers-panel.c
+++ gnome-control-center-3.36.2/panels/printers/cc-printers-panel.c
diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
index 01bb678..01be98b 100644
--- a/panels/printers/cc-printers-panel.c
+++ b/panels/printers/cc-printers-panel.c
@@ -25,6 +25,7 @@
#include "pp-printer.h"
......@@ -28,10 +27,11 @@ Index: gnome-control-center-3.36.2/panels/printers/cc-printers-panel.c
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
#include <polkit/polkit.h>
@@ -966,6 +967,25 @@ printer_add_cb (GtkToolButton *toolbutto
@@ -965,6 +966,25 @@ printer_add_cb (GtkToolButton *toolbutton,
self);
}
static void
+static void
+show_system_config_printer (void)
+{
+ g_autoptr(GAppInfo) app_info = NULL;
......@@ -50,11 +50,10 @@ Index: gnome-control-center-3.36.2/panels/printers/cc-printers-panel.c
+ g_warning ("Failed to launch system-config-printer: %s", error->message);
+}
+
+static void
static void
update_sensitivity (gpointer user_data)
{
CcPrintersPanel *self = (CcPrintersPanel*) user_data;
@@ -1240,6 +1260,14 @@ cc_printers_panel_init (CcPrintersPanel
@@ -1240,6 +1260,14 @@ cc_printers_panel_init (CcPrintersPanel *self)
gtk_builder_get_object (self->builder, "printer-add-button2");
g_signal_connect (widget, "clicked", G_CALLBACK (printer_add_cb), self);
......@@ -69,10 +68,10 @@ Index: gnome-control-center-3.36.2/panels/printers/cc-printers-panel.c
widget = (GtkWidget*)
gtk_builder_get_object (self->builder, "content");
gtk_list_box_set_filter_func (GTK_LIST_BOX (widget),
Index: gnome-control-center-3.36.2/panels/printers/printers.ui
===================================================================
--- gnome-control-center-3.36.2.orig/panels/printers/printers.ui
+++ gnome-control-center-3.36.2/panels/printers/printers.ui
diff --git a/panels/printers/printers.ui b/panels/printers/printers.ui
index d8f8af2..f4c0d98 100644
--- a/panels/printers/printers.ui
+++ b/panels/printers/printers.ui
@@ -134,6 +134,7 @@
<child>
<object class="GtkBox">
......
debian/patches/0013-notifications-Handle-.desktop-files-that-got-renamed.patch
View file @ cb27e558
From 025a36eebd30311b37a26a9bd908e6c6591c23a3 Mon Sep 17 00:00:00 2001
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Tue, 31 Jul 2018 04:44:12 +0100
Subject: [PATCH 13/26] notifications: Handle .desktop files that got renamed
......@@ -13,7 +12,7 @@ Forwarded: not-needed
1 file changed, 8 insertions(+)
diff --git a/panels/notifications/cc-notifications-panel.c b/panels/notifications/cc-notifications-panel.c
index 79c1f0d1e..d7d520421 100644
index 79c1f0d..d7d5204 100644
--- a/panels/notifications/cc-notifications-panel.c
+++ b/panels/notifications/cc-notifications-panel.c
@@ -446,6 +446,14 @@ process_app_info (CcNotificationsPanel *panel,
......@@ -31,6 +30,3 @@ index 79c1f0d1e..d7d520421 100644
g_strcanon (app_id,
"0123456789"
"abcdefghijklmnopqrstuvwxyz"
--
2.25.1
debian/patches/0014-shell-Change-the-default-height-so-all-category-are-.patch
View file @ cb27e558
From f304c010ec8fd056e41634999428e5777cbfc5e7 Mon Sep 17 00:00:00 2001
From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Date: Mon, 19 Aug 2019 16:17:20 +0100
Subject: [PATCH 14/26] shell: Change the default height so all category are on
screen
Subject: [PATCH 14/26] shell: Change the default height so all category are
on screen
Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1728450
Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=789372
......@@ -11,7 +10,7 @@ Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=789372
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shell/cc-window.ui b/shell/cc-window.ui
index fb4c174e8..dfaf65ab8 100644
index fb4c174..dfaf65a 100644
--- a/shell/cc-window.ui
+++ b/shell/cc-window.ui
@@ -5,7 +5,7 @@
......@@ -23,6 +22,3 @@ index fb4c174e8..dfaf65ab8 100644
<signal name="notify::window" handler="gdk_window_set_cb" object="CcWindow" swapped="yes" />
<signal name="map-event" handler="window_map_event_cb" object="CcWindow" swapped="yes" />
<signal name="key-press-event" handler="window_key_press_event_cb" object="CcWindow" swapped="yes" after="yes" />
--
2.25.1
debian/patches/0015-connectivity-add-network-connectivity-checking-toggl.patch
View file @ cb27e558
From 5805387e9daf5d8ee99dff568775e0066ecbb8da Mon Sep 17 00:00:00 2001
From: James Henstridge <james@jamesh.id.au>
Date: Wed, 9 Aug 2017 22:30:21 +0800
Subject: [PATCH 15/26] connectivity: add network connectivity checking toggle
......@@ -12,15 +11,15 @@ panel.
https://bugzilla.gnome.org/show_bug.cgi?id=737362
---
panels/connectivity/cc-connectivity-panel.c | 131 ++++++++++++++++++
panels/connectivity/cc-connectivity-panel.h | 28 ++++
panels/connectivity/cc-connectivity-panel.ui | 67 +++++++++
.../connectivity/connectivity.gresource.xml | 6 +
.../gnome-connectivity-panel.desktop.in.in | 19 +++
panels/connectivity/meson.build | 45 ++++++
panels/meson.build | 1 +
po/POTFILES.in | 2 +
shell/cc-panel-loader.c | 2 +
panels/connectivity/cc-connectivity-panel.c | 131 +++++++++++++++++++++
panels/connectivity/cc-connectivity-panel.h | 28 +++++
panels/connectivity/cc-connectivity-panel.ui | 67 +++++++++++
panels/connectivity/connectivity.gresource.xml | 6 +
.../gnome-connectivity-panel.desktop.in.in | 19 +++
panels/connectivity/meson.build | 45 +++++++
panels/meson.build | 1 +
po/POTFILES.in | 2 +
shell/cc-panel-loader.c | 2 +
9 files changed, 301 insertions(+)
create mode 100644 panels/connectivity/cc-connectivity-panel.c
create mode 100644 panels/connectivity/cc-connectivity-panel.h
......@@ -31,7 +30,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=737362
diff --git a/panels/connectivity/cc-connectivity-panel.c b/panels/connectivity/cc-connectivity-panel.c
new file mode 100644
index 000000000..6db7e7433
index 0000000..6db7e74
--- /dev/null
+++ b/panels/connectivity/cc-connectivity-panel.c
@@ -0,0 +1,131 @@
......@@ -168,7 +167,7 @@ index 000000000..6db7e7433
+}
diff --git a/panels/connectivity/cc-connectivity-panel.h b/panels/connectivity/cc-connectivity-panel.h
new file mode 100644
index 000000000..1a21b5bc9
index 0000000..1a21b5b
--- /dev/null
+++ b/panels/connectivity/cc-connectivity-panel.h
@@ -0,0 +1,28 @@
......@@ -202,7 +201,7 @@ index 000000000..1a21b5bc9
+G_END_DECLS
diff --git a/panels/connectivity/cc-connectivity-panel.ui b/panels/connectivity/cc-connectivity-panel.ui
new file mode 100644
index 000000000..dc7745e89
index 0000000..dc7745e
--- /dev/null
+++ b/panels/connectivity/cc-connectivity-panel.ui
@@ -0,0 +1,67 @@
......@@ -275,7 +274,7 @@ index 000000000..dc7745e89
+</interface>
diff --git a/panels/connectivity/connectivity.gresource.xml b/panels/connectivity/connectivity.gresource.xml
new file mode 100644
index 000000000..e102045e5
index 0000000..e102045
--- /dev/null
+++ b/panels/connectivity/connectivity.gresource.xml
@@ -0,0 +1,6 @@
......@@ -287,7 +286,7 @@ index 000000000..e102045e5
+</gresources>
diff --git a/panels/connectivity/gnome-connectivity-panel.desktop.in.in b/panels/connectivity/gnome-connectivity-panel.desktop.in.in
new file mode 100644
index 000000000..17d130fef
index 0000000..4e97c28
--- /dev/null
+++ b/panels/connectivity/gnome-connectivity-panel.desktop.in.in
@@ -0,0 +1,19 @@
......@@ -312,7 +311,7 @@ index 000000000..17d130fef
+Keywords=network;
diff --git a/panels/connectivity/meson.build b/panels/connectivity/meson.build
new file mode 100644
index 000000000..e9c30d8b9
index 0000000..e9c30d8
--- /dev/null
+++ b/panels/connectivity/meson.build
@@ -0,0 +1,45 @@
......@@ -362,7 +361,7 @@ index 000000000..e9c30d8b9
+ c_args: cflags
+)
diff --git a/panels/meson.build b/panels/meson.build
index 81ae0b1a7..7330e6460 100644
index 81ae0b1..7330e64 100644
--- a/panels/meson.build
+++ b/panels/meson.build
@@ -5,6 +5,7 @@ panels = [
......@@ -374,7 +373,7 @@ index 81ae0b1a7..7330e6460 100644
'default-apps',
'diagnostics',
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1dec117a9..375c06b5a 100644
index 2440ec9..915b235 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -30,6 +30,8 @@ panels/common/cc-language-chooser.ui
......@@ -387,7 +386,7 @@ index 1dec117a9..375c06b5a 100644
panels/datetime/cc-datetime-panel.c
panels/datetime/cc-datetime-panel.ui
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
index bcf87674e..e870308a0 100644
index bcf8767..e870308 100644
--- a/shell/cc-panel-loader.c
+++ b/shell/cc-panel-loader.c
@@ -37,6 +37,7 @@ extern GType cc_background_panel_get_type (void);
......@@ -406,6 +405,3 @@ index bcf87674e..e870308a0 100644
PANEL_TYPE("datetime", cc_date_time_panel_get_type, NULL),
PANEL_TYPE("default-apps", cc_default_apps_panel_get_type, NULL),
PANEL_TYPE("diagnostics", cc_diagnostics_panel_get_type, cc_diagnostics_panel_static_init_func),
--
2.25.1
debian/patches/0016-diagnostics-Add-Whoopsie-support.patch
View file @ cb27e558
From b3574702e8126c292a678e0786fd92ae927fc041 Mon Sep 17 00:00:00 2001
From: James Henstridge <james@jamesh.id.au>
Date: Thu, 14 Sep 2017 10:58:16 +0800
Subject: [PATCH 16/26] diagnostics: Add Whoopsie support
---
meson.build | 9 ++
meson.build | 9 +++
meson_options.txt | 1 +
panels/diagnostics/cc-diagnostics-panel.c | 117 +++++++++++++++++++++
panels/diagnostics/cc-diagnostics-panel.ui | 43 +++++++-
panels/diagnostics/cc-diagnostics-panel.c | 117 +++++++++++++++++++++++++++++
panels/diagnostics/cc-diagnostics-panel.ui | 43 ++++++++++-
panels/diagnostics/meson.build | 7 +-
5 files changed, 175 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index eb3d8459f..86b1c71c6 100644
index 5f3bcf5..d129832 100644
--- a/meson.build
+++ b/meson.build
@@ -207,6 +207,14 @@ endif
......@@ -38,7 +37,7 @@ index eb3d8459f..86b1c71c6 100644
message(output)
diff --git a/meson_options.txt b/meson_options.txt
index e76308e8a..554c213a1 100644
index e76308e..554c213 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,3 +7,4 @@ option('tests', type: 'boolean', value: true, description: 'build tests')
......@@ -47,7 +46,7 @@ index e76308e8a..554c213a1 100644
option('profile', type: 'combo', choices: ['default','development'], value: 'default')
+option('whoopsie', type: 'boolean', value: false, description: 'build with Whoopsie support')
diff --git a/panels/diagnostics/cc-diagnostics-panel.c b/panels/diagnostics/cc-diagnostics-panel.c
index 7f1b5e2f0..b4171d0e2 100644
index 7f1b5e2..b4171d0 100644
--- a/panels/diagnostics/cc-diagnostics-panel.c
+++ b/panels/diagnostics/cc-diagnostics-panel.c
@@ -18,6 +18,8 @@
......@@ -231,7 +230,7 @@ index 7f1b5e2f0..b4171d0e2 100644
url = cc_os_release_get_value ("PRIVACY_POLICY_URL");
if (!url)
diff --git a/panels/diagnostics/cc-diagnostics-panel.ui b/panels/diagnostics/cc-diagnostics-panel.ui
index 1930e9133..0b6128159 100644
index 1930e91..0b61281 100644
--- a/panels/diagnostics/cc-diagnostics-panel.ui
+++ b/panels/diagnostics/cc-diagnostics-panel.ui
@@ -52,7 +52,7 @@
......@@ -292,7 +291,7 @@ index 1930e9133..0b6128159 100644
<class name="view"/>
<class name="frame"/>
diff --git a/panels/diagnostics/meson.build b/panels/diagnostics/meson.build
index fac9b4cd8..61388e2a3 100644
index fac9b4c..61388e2 100644
--- a/panels/diagnostics/meson.build
+++ b/panels/diagnostics/meson.build
@@ -29,12 +29,17 @@ sources += gnome.compile_resources(
......@@ -314,6 +313,3 @@ index fac9b4cd8..61388e2a3 100644
+ dependencies: deps,
c_args: cflags
)
--
2.25.1
debian/patches/0017-online-accounts-Hide-window-after-adding-an-online-a.patch
View file @ cb27e558
From 08827ca26fefd4b99cfff9036c74b541faeea69d Mon Sep 17 00:00:00 2001
From: Andrea Azzarone <andrea.azzarone@canonical.com>
Date: Tue, 31 Jul 2018 04:44:12 +0100
Subject: [PATCH 17/26] online-accounts: Hide window after adding an online
......@@ -17,7 +16,7 @@ https://gitlab.gnome.org/GNOME/gnome-control-center/issues/16
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/panels/online-accounts/cc-online-accounts-panel.c b/panels/online-accounts/cc-online-accounts-panel.c
index 0da41a7e6..b9607b8a3 100644
index 0da41a7..b9607b8 100644
--- a/panels/online-accounts/cc-online-accounts-panel.c
+++ b/panels/online-accounts/cc-online-accounts-panel.c
@@ -382,9 +382,14 @@ cc_goa_panel_set_property (GObject *object,
......@@ -37,6 +36,3 @@ index 0da41a7e6..b9607b8a3 100644
return;
}
--
2.25.1
debian/patches/0018-applications-Add-hack-detect-snaps-before-X-SnapInst.patch
View file @ cb27e558
From 9c65962cd73b145e66628d5c81bada440516616a Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Tue, 12 Mar 2019 15:31:38 +1300
Subject: [PATCH 18/26] applications: Add hack detect snaps before
......@@ -9,7 +8,7 @@ Subject: [PATCH 18/26] applications: Add hack detect snaps before
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/panels/applications/cc-applications-panel.c b/panels/applications/cc-applications-panel.c
index 450c2c9d9..1bbf12a95 100644
index 59964b1..7352ba5 100644
--- a/panels/applications/cc-applications-panel.c
+++ b/panels/applications/cc-applications-panel.c
@@ -225,8 +225,9 @@ get_portal_app_id (GAppInfo *info)
......@@ -40,6 +39,3 @@ index 450c2c9d9..1bbf12a95 100644
}
return NULL;
--
2.25.1