diff -Nru --exclude control gnome-control-center-3.28.0/debian/changelog gnome-control-center-3.28.0/debian/changelog --- gnome-control-center-3.28.0/debian/changelog 2018-03-19 10:34:01.000000000 -0500 +++ gnome-control-center-3.28.0/debian/changelog 2018-03-19 20:31:51.000000000 -0500 @@ -1,3 +1,10 @@ +gnome-control-center (1:3.28.0-0ubuntu3) UNRELEASED; urgency=medium + + * debian/patches/ubuntu-white-lists.patch: + - remove patch, this is done in the theme now + + -- Marco Trevisan (TreviƱo) Mon, 19 Mar 2018 20:31:51 -0500 + gnome-control-center (1:3.28.0-0ubuntu2) bionic; urgency=medium [ Gunnar Hjalmarsson ] diff -Nru --exclude control gnome-control-center-3.28.0/debian/patches/series gnome-control-center-3.28.0/debian/patches/series --- gnome-control-center-3.28.0/debian/patches/series 2018-03-19 10:34:01.000000000 -0500 +++ gnome-control-center-3.28.0/debian/patches/series 2018-03-19 20:31:42.000000000 -0500 @@ -18,6 +18,5 @@ ubuntu-legacy-notifications.patch connectivity-switch.patch privacy-panel-whoopsie.patch -ubuntu-white-lists.patch 0004-Expose-touchpad-settings-if-synaptics-is-in-use.patch auto_quit_after_goa_add.patch diff -Nru --exclude control gnome-control-center-3.28.0/debian/patches/ubuntu-white-lists.patch gnome-control-center-3.28.0/debian/patches/ubuntu-white-lists.patch --- gnome-control-center-3.28.0/debian/patches/ubuntu-white-lists.patch 2018-03-19 10:34:01.000000000 -0500 +++ gnome-control-center-3.28.0/debian/patches/ubuntu-white-lists.patch 1969-12-31 18:00:00.000000000 -0600 @@ -1,86 +0,0 @@ -Description: Set a white bg for the lists when using the ubuntu theme - - That's a workaround for artful to not modify the theme which could - impact other software. -Origin: ubuntu -Bug-Ubuntu: https://launchpad.net/bugs/1719668 ---- - shell/cc-application.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 53 insertions(+) - ---- a/shell/cc-application.c -+++ b/shell/cc-application.c -@@ -212,6 +212,54 @@ cc_application_activate (GApplication *a - } - - static void -+theme_changed (GtkSettings *settings) -+{ -+ static GtkCssProvider *provider = NULL; -+ static GtkCssProvider *permanent_provider = NULL; -+ gchar *theme; -+ GdkScreen *screen; -+ -+ g_object_get (settings, "gtk-theme-name", &theme, NULL); -+ screen = gdk_screen_get_default (); -+ -+ if (g_getenv ("GTK_THEME")) { -+ g_free (theme); -+ *theme = g_strdup (g_getenv ("GTK_THEME")); -+ if (theme && *theme) { -+ char *p; -+ p = strrchr (theme, ':'); -+ if (p) { -+ *p = '\0'; -+ p++; -+ *theme = g_strdup (p); -+ } -+ } -+ } -+ -+ /* CSS that themes can override */ -+ if (g_str_equal (theme, "Ambiance") || g_str_equal (theme, "Radiance")) -+ { -+ if (provider == NULL) -+ { -+ provider = gtk_css_provider_new (); -+ gtk_css_provider_load_from_data (provider, "frame list row:not(:selected), viewport > list row:not(:selected) { background: white }", -1, NULL); -+ } -+ -+ gtk_style_context_add_provider_for_screen (screen, -+ GTK_STYLE_PROVIDER (provider), -+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); -+ } -+ else if (provider != NULL) -+ { -+ gtk_style_context_remove_provider_for_screen (screen, -+ GTK_STYLE_PROVIDER (provider)); -+ g_clear_object (&provider); -+ } -+ -+ g_free (theme); -+} -+ -+static void - cc_application_startup (GApplication *application) - { - CcApplication *self = CC_APPLICATION (application); -@@ -219,6 +267,7 @@ cc_application_startup (GApplication *ap - GMenu *section; - GSimpleAction *action; - const gchar *help_accels[] = { "F1", NULL }; -+ GtkSettings *settings; - - G_APPLICATION_CLASS (cc_application_parent_class)->startup (application); - -@@ -265,6 +314,10 @@ cc_application_startup (GApplication *ap - "app.help", help_accels); - - self->window = cc_window_new (GTK_APPLICATION (application)); -+ -+ settings = gtk_settings_get_default (); -+ g_signal_connect (settings, "notify::gtk-theme-name", G_CALLBACK (theme_changed), NULL); -+ theme_changed (settings); - } - - static GObject *