From 99b2ab53d0736433d78b8dc2b0240868b28cd886 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 27 2021 07:56:08 +0000
Subject: import control-center-3.28.1-8.el7_9


---

diff --git a/SOURCES/show-printers-panel-everywhere.patch b/SOURCES/show-printers-panel-everywhere.patch
new file mode 100644
index 0000000..75343dd
--- /dev/null
+++ b/SOURCES/show-printers-panel-everywhere.patch
@@ -0,0 +1,52 @@
+--- gnome-control-center-3.28.1/panels/printers/gnome-printers-panel.desktop.in.in
++++ gnome-control-center-3.28.1/panels/printers/gnome-printers-panel.desktop.in.in
+@@ -10,6 +10,5 @@ NoDisplay=true
+ StartupNotify=true
+ # The X-GNOME-Settings-Panel is necessary to show in the main shell UI
+ Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings;
+-OnlyShowIn=GNOME;Unity;
+ # Translators: Search terms to find the Printers panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+ Keywords=Printer;Queue;Print;Paper;Ink;Toner;
+--- gnome-control-center-3.28.1/shell/cc-window.c
++++ gnome-control-center-3.28.1/shell/cc-window.c
+@@ -709,6 +709,31 @@ cc_window_class_init (CcWindowClass *kla
+   g_type_ensure (CC_TYPE_PANEL_LIST);
+ }
+ 
++/* Taken from 3.38.4 for usage in cc_window_init() */
++static gboolean
++_cc_shell_model_has_panel (CcShellModel *model,
++                           const char   *id)
++{
++  GtkTreeIter iter;
++  gboolean valid;
++
++  g_assert (id);
++
++  valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter);
++  while (valid)
++    {
++      g_autofree gchar *panel_id = NULL;
++
++      gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, COL_ID, &panel_id, -1);
++      if (g_str_equal (id, panel_id))
++        return TRUE;
++
++      valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter);
++    }
++
++  return FALSE;
++}
++
+ static void
+ cc_window_init (CcWindow *self)
+ {
+@@ -739,7 +763,7 @@ cc_window_init (CcWindow *self)
+   /* After everything is loaded, select the last used panel, if any,
+    * or the first visible panel */
+   id = g_settings_get_string (self->settings, "last-panel");
+-  if (id != NULL && *id != '\0')
++  if (id != NULL && *id != '\0' && _cc_shell_model_has_panel (CC_SHELL_MODEL (self->store), id))
+     cc_panel_list_set_active_panel (CC_PANEL_LIST (self->panel_list), id);
+   else
+     cc_panel_list_activate (CC_PANEL_LIST (self->panel_list));
diff --git a/SPECS/control-center.spec b/SPECS/control-center.spec
index 2d99c43..cd4ae5d 100644
--- a/SPECS/control-center.spec
+++ b/SPECS/control-center.spec
@@ -11,7 +11,7 @@
 Name:           control-center
 Epoch:          1
 Version:        3.28.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Utilities to configure the GNOME desktop
 
 License:        GPLv2+ and CC-BY-SA
@@ -30,6 +30,7 @@ Patch8:         0001-po-Remove-soft-hyphens-from-japanese-translation.patch
 Patch9:         0001-thunderbolt-fix-double-free-in-bolt-client.patch
 Patch10:        0001-Calculate-better-extents-for-the-configured-displays.patch
 Patch11:        categorize-infiniband.patch
+Patch12:        show-printers-panel-everywhere.patch
 
 BuildRequires:  chrpath
 BuildRequires:  cups-devel
@@ -213,6 +214,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{_datadir}/gnome/wm-properties
 
 %changelog
+* Fri Mar 12 2021 Marek Kasik <mkasik@redhat.com> - 3.28.1-8
+- Enable Printers panel in all environments
+- Resolves: #1559431
+
 * Thu Jun 11 2020 Carlos Garnacho <cgarnach@redhat.com> - 3.28.1-7
 - Categorize Infiniband devices correctly
   Resolves: #1630154