Hello community,

here is the log from the commit of package gnome-control-center for 
openSUSE:Factory checked in at 2016-09-21 18:43:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old)
 and      /work/SRC/openSUSE:Factory/.gnome-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-control-center"

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes    
    2016-09-05 21:18:06.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center.changes
   2016-09-21 18:43:37.000000000 +0200
@@ -1,0 +2,93 @@
+Tue Sep 20 16:06:53 UTC 2016 - dims...@opensuse.org
+
+- Update to version 3.22.0:
+  + Network:
+    - Only show a gateway entry for the first IPv4 address,
+      NetworkManager ignored every subsequent ones, but we still
+      had a UI for those.
+    - Fix application of the default gateway.
+    - Fix possible crashes when editing IPv4 gateways or routes.
+  + Power:
+    - Fix "automatic suspend" label not taking batteries into
+      account.
+    - Fix initial state of the Wi-Fi switch.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sun Sep 18 05:47:23 UTC 2016 - fezh...@suse.com
+
+- Rebase gnome-control-center-890979-change-remote-passwd.patch on
+  3.21.92.
+
+-------------------------------------------------------------------
+Fri Sep 16 16:52:17 UTC 2016 - fezh...@suse.com
+
+- Add gnome-control-center-info-never-use-gnome-software.patch:
+  On SLE12-SP2 and Leap42.2, never search for gnome-software as an
+  option when checking for updates in info panel, because we use
+  gpk-update-viewer (bsc#999336).
+
+-------------------------------------------------------------------
+Tue Sep 13 20:23:53 UTC 2016 - zai...@opensuse.org
+
+- Update to version 3.21.92:
+  + Privacy: Fix quoting of distro name and privacy URL.
+  + Network:
+    - Fix warning when enabling hotspot.
+    - Fix saving of IPv6 gateway.
+    - Fix warning if IPv6 gateway is empty.
+    - Fix IPv6 settings not being applicable when method changes.
+    - Return better error when 8021x security is invalid.
+    - Avoid warning when ad-hoc mode is invalid.
+    - Re-set the SSID when enabling the Hotspot.
+    - Fix crash when changing IPv4 DNS.
+  + Keyboard:
+    - Many UI changes following up from the panel redesign.
+    - Don't grab the mouse pointer when capturing shortcuts.
+    - Don't regrab the keyboard after an event if already grabbed.
+    - Fix grabs not working when initially showing the dialog.
+    - Don't apply "Backspace" straight away.
+    - Allow Tab and Super in accels.
+    - Normalise Shift and Tab in shortcuts.
+    - Fix shortcut label in RTL languages.
+  + Region: Avoid a crash on panel destruction.
+
+-------------------------------------------------------------------
+Thu Sep  8 12:51:17 UTC 2016 - dims...@opensuse.org
+
+- Rebase and re-enable
+  gnome-control-center-allow-extra-tools-in-shell.patch.
+
+-------------------------------------------------------------------
+Wed Sep  7 16:19:11 UTC 2016 - zai...@opensuse.org
+
+- Disable gnome-control-center-allow-extra-tools-in-shell.patch:
+  Needs rebase.
+- Conditionally apply translations-update-upstream BuildRequires
+  and macro for non-openSUSE only.
+
+-------------------------------------------------------------------
+Tue Sep  6 11:13:28 UTC 2016 - dims...@opensuse.org
+
+- Drop gnome-control-center-hide-firewall-zone-entry.patch: no
+  longer needed, since upstream code now checks if firewalld is
+  running and hides the widgets dynamically.
+
+-------------------------------------------------------------------
+Sat Sep  3 16:10:21 UTC 2016 - fezh...@suse.com
+
+- Update gnome-control-center-add-alacarte-for-sle.patch:
+  Rebase on top of rebased
+  gnome-control-center-allow-extra-tools-in-shell.patch.
+
+-------------------------------------------------------------------
+Fri Sep  2 13:03:45 UTC 2016 - fezh...@suse.com
+
+- Update gnome-control-center-allow-extra-tools-in-shell.patch:
+  + Fix leak of strings.
+  + Add tools with category X-GNOME-DesktopSettings into the
+    personal g-c-c category to enable itweb-settings.
+  + Disable logspam in absence of optional components (bnc#866235
+    bsc#952008).
+
+-------------------------------------------------------------------
@@ -5,0 +99,83 @@
+------------------------------------------------------------------
+Wed Aug 31 19:06:25 UTC 2016 - zai...@opensuse.org
+
+- Drop long disabled and no longer needed patches:
+  + gnome-control-center-system-proxy-configuration.patch.
+  + gcc-private-connection.patch.
+
+-------------------------------------------------------------------
+Fri Aug 26 13:24:49 UTC 2016 - badshah...@gmail.com
+
+- Update to version 3.21.90:
+  + Fix truncated panel names for larger fonts.
+  + Port to libnm 1.2.
+  + Display:
+    - Add option to enable and disable overscan compensation when
+      supported by the driver.
+    - Ensure only one output is set as primary.
+    - Separate interlaced from normal modes.
+  + Info:
+    - Fetch renderer information from gnome-session.
+    - Show OS build-id.
+  + Keyboard: Update to a new design.
+  + Mouse:
+    - Show only relevant widgets for the hardware we're able to
+      detect.
+    - Detect and warn if we're running on the synaptics driver.
+    - Make all listbox rows unactivatable.
+    - Remove superfluous GtkListBoxRow.
+    - Allow keyboard navigation/focus to the Touchpad section
+      switches.
+    - Offer a separate option for edge scrolling.
+    - Don't allow two-finger and edge scrolling at the same time.
+  + Network:
+    - Use VPN plugin paths as specified in the .name files.
+    - Ensure the Wifi list is updated as networks appear/disapper.
+    - Hide firewall zone combo when firewalld is not running.
+    - Remove bridge, bond, team, VLAN and virtual devices support
+      these are most useful on non-desktop systems for which a UI
+      like Cockpit is better suited.
+    - Remove the first page of the "Add Connection" wizard.
+    - Update wireless-security UI from network-manager-applet.
+    - Remember "Ignore CA certificate".
+    - Fix removed connections not disappearing.
+    - Fix hotspot silently failing with long hostname.
+    - Fix several crashes.
+  + Online Accounts:
+    - Don't use deprecated GoaProviderGroup API.
+    - Add a Calendar group.
+    - Let goa_provider_show_account create the full UI.
+  + Power:
+    - Translate the "When the Power Button is pressed" drop-down.
+    - Show "Suspend & Power Off" section only when relevant.
+  + Printers:
+    - Add compatibility code for older cups.
+    - Use a panel wide page for empty state.
+    - Present spinner while populating the panel.
+    - Rename printers asynchronously.
+    - Added new async API to check availability of maintenance
+      commands.
+    - Check all supported CUPS commands, not just the first one.
+  + Privacy:
+    - React to changes in permissions store.
+    - Various layout and cosmetic cleanups.
+  + Region:
+    - Reset the input chooser on escape.
+    - Improve widget spacing.
+  + Search:
+    - Work around applications not shipping icons at all sizes.
+    - Introduce the new Search Locations dialog.
+  + Sharing: Update to a new design.
+  + Universal Access:
+    - Specify a window when testing visual bell.
+    - Correct label for "Sound Keys".
+    - Allow keyboard navigation/focus to the settings switches.
+  + User Accounts:
+    - Update to a new design.
+    - Fix missing records in the history dialog.
+  + Updated translations.
+- Drop gnome-control-center-touchpad-wayland-cap.patch;
+  incorporated upstream.
+- Set define with_cacert_patch to 0,
+  gnome-control-center-probe-radius-server-cert.patch needs rebase.
+
@@ -29,5 +204,0 @@
-Thu May 26 08:47:25 UTC 2016 - fezh...@suse.com
-
-- Update to GNOME 3.20.2  Fate#318572
-
--------------------------------------------------------------------
@@ -69 +240 @@
-Tue Apr 12 10:00:06 UTC 2016 - fezh...@suse.com
+Tue Apr 12 12:00:06 UTC 2016 - fezh...@suse.com
@@ -72,4 +242,0 @@
-- Add 0001-network-Fix-empty-Wifi-list.patch (bsc#870322)
-- Add gnome-control-center-add-alacarte-for-sle.patch
-- Add gnome-control-center-follow-polkit-permissions-for-tz.patch (boo#956879)
-- Add gnome-control-center-hide-firewall-zone-entry.patch (bnc#894394)
@@ -83,26 +250,28 @@
-- Drop gnome-control-center-bnc862415-timezone.patch (bnc#862415):
-  fixed upstream
-- Drop gnome-control-center-bnc865632-disable-popup-for-NM.patch (bnc#865632):
-  fixed upstream
-- Drop gnome-control-center-bnc894394-hide-firewall-zone-entry.patch 
(bnc#894394):
++++ 142 more lines (skipped)
++++ between 
/work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes
++++ and 
/work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center.changes

Old:
----
  gcc-private-connection.patch
  gnome-control-center-3.20.1.tar.xz
  gnome-control-center-hide-firewall-zone-entry.patch
  gnome-control-center-system-proxy-configuration.patch
  gnome-control-center-touchpad-wayland-cap.patch

New:
----
  gnome-control-center-3.22.0.tar.xz
  gnome-control-center-info-never-use-gnome-software.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-control-center.spec ++++++
--- /var/tmp/diff_new_pack.A2rLSr/_old  2016-09-21 18:43:39.000000000 +0200
+++ /var/tmp/diff_new_pack.A2rLSr/_new  2016-09-21 18:43:39.000000000 +0200
@@ -26,43 +26,39 @@
 %define with_wacom 1
 %endif
 
-%define with_cacert_patch 1
+%define with_cacert_patch 0
 
 Name:           gnome-control-center
-Version:        3.20.1
+Version:        3.22.0
 Release:        0
 Summary:        The GNOME Control Center
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://www.gnome.org
-Source:         
http://download.gnome.org/sources/gnome-control-center/3.20/%{name}-%{version}.tar.xz
-# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-extra-tools-in-shell.patch 
fezh...@suse.com -- Add dconf-editor, pkg-prefs, gnome-tweak-tool and 
tracker-preferences to gnome-control-center-allow-yast-in-shell.patch so that 
they can launch from g-c-c shell like YaST does. Also change the patch with a 
more generic name.
+Source:         
http://download.gnome.org/sources/gnome-control-center/3.22/%{name}-%{version}.tar.xz
+# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-extra-tools-in-shell.patch 
fezh...@suse.com -- Add dconf-editor, gnome-tweak-tool, pkg-prefs, 
itweb-settings, tracker-preferences and Yast to g-c-c.
 Patch0:         gnome-control-center-allow-extra-tools-in-shell.patch
 # PATCH-FEATURE-SLE gnome-control-center-add-alacarte-for-sle.patch 
badshah...@gmail.com -- Add back alacarte for SLE since they require it for 
their classic mode, on the other hand for TW and other openSUSE versions it 
should be enough that alacarte is still available from shell overview, just not 
in the g-c-c shell. This patch must be applied only if required and then 
immediately after gnome-control-center-allow-extra-tools-in-shell.patch
 Patch100:       gnome-control-center-add-alacarte-for-sle.patch
-# PATCH-FEATURE-OPENSUSE gnome-control-center-hide-firewall-zone-entry.patch 
bnc#894394 fezh...@suse.com -- network: hide the firewall zone entry for 
firewalld, which is not used in opensuse
-Patch1:         gnome-control-center-hide-firewall-zone-entry.patch
-# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-yast-in-shell.patch 
vu...@opensuse.org -- Allow the launch of the yast shell from the g-c-c shell; 
it's quite ugly, but on the other hand, we don't want to change the behavior of 
the shell except for yast...
-Patch14:        gnome-control-center-system-proxy-configuration.patch
-# PATCH-NEEDS-REBASE gcc-private-connection.patch bnc#751211 bgo#646187 
dims...@opensuse.org -- network: create private connections if the user if not 
authorized (WAS: PATCH-FIX-UPSTREAM)
-Patch15:        gcc-private-connection.patch
 # PATCH-FIX-UPSTREAM gnome-control-center-probe-radius-server-cert.patch 
bnc#574266 g...@suse.com -- network: Probe the RADIUS server certificate
 Patch16:        gnome-control-center-probe-radius-server-cert.patch
 # PATCH-FEATURE-OPENSUSE 
gnome-control-center-follow-polkit-permissions-for-tz.patch boo#904058 
badshah...@gmail.com -- Follow polkit permissions for allowing/locking timezone 
setting changes
 Patch17:        gnome-control-center-follow-polkit-permissions-for-tz.patch
 # PATCH-FIX-SLE gnome-control-center-890979-change-remote-passwd.patch 
bnc#890979 dli...@suse.com -- user: Enable remote user to change password in 
user panel
 Patch18:        gnome-control-center-890979-change-remote-passwd.patch
-# PATCH-FIX-UPSTREAM gnome-control-center-touchpad-wayland-cap.patch 
bgo#765879 zai...@opensuse.org -- mouse: Make touchpad capability checking on 
wayland work as intended
-Patch19:        gnome-control-center-touchpad-wayland-cap.patch
 # PATCH-FIX-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch 
bsc#989801 sck...@suse.com -- network: Improve the check for whether NM or 
wicked is running
 Patch20:        gnome-control-center-disable-error-message-for-NM.patch
+# PATCH-FIX-OPENSUSE gnome-control-center-info-never-use-gnome-software.patch 
bsc#999336 fezh...@suse.com -- info: Never search for gnome-software as an 
option when checking for updates on SLE and Leap 42.2, because we use 
gpk-update-viewer.
+Patch21:        gnome-control-center-info-never-use-gnome-software.patch
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gnome-common
 BuildRequires:  intltool
 BuildRequires:  krb5-devel
+%if !0%{?is_opensuse}
 BuildRequires:  translation-update-upstream
+%endif
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(accountsservice) >= 0.6.39
 BuildRequires:  pkgconfig(cairo-gobject)
@@ -85,17 +81,18 @@
 BuildRequires:  pkgconfig(goa-backend-1.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(grilo-0.3)
-BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.19.3
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.20.3
+BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.21.4
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.21.4
 BuildRequires:  pkgconfig(gudev-1.0)
 %if %{with_ibus}
 BuildRequires:  pkgconfig(ibus-1.0) >= 1.5.2
 %endif
 BuildRequires:  pkgconfig(libcanberra-gtk3)
 BuildRequires:  pkgconfig(libgtop-2.0)
-BuildRequires:  pkgconfig(libnm-glib) >= 0.9.8
-BuildRequires:  pkgconfig(libnm-glib-vpn) >= 0.9.8
-BuildRequires:  pkgconfig(libnm-gtk) >= 0.9.8
+BuildRequires:  pkgconfig(libnm) >= 1.2
+BuildRequires:  pkgconfig(libnm-glib-vpn) >= 1.2
+BuildRequires:  pkgconfig(libnm-gtk) >= 1.2
+BuildRequires:  pkgconfig(libnma) >= 1.2
 BuildRequires:  pkgconfig(libpulse) >= 2.0
 BuildRequires:  pkgconfig(libpulse-mainloop-glib) >= 2.0
 BuildRequires:  pkgconfig(libsoup-2.4)
@@ -199,15 +196,14 @@
 %lang_package
 %prep
 %setup -q
+%if !0%{?is_opensuse}
 translation-update-upstream
+%endif
 %patch0 -p1
 # PATCH100 ONLY NEEDED FOR SLES AND TO BE APPLIED IMMEDIATELY AFTER PATCH0
 %if 0%{?suse_version} == 1315 && 0%{?sle_version}
 %patch100 -p1
 %endif
-%patch1 -p1
-# PATCH-NEEDS-REBASE - and g-c-c code seems to be moving in "our" direction 
see bgo#751378
-#patch15 -p1
 %if %{with_cacert_patch}
 %patch16 -p1
 %endif
@@ -215,10 +211,10 @@
 %if ! 0%{?is_opensuse}
 %patch18 -p1
 %endif
-#NEEDS-REBASE
-#patch14 -p1
-%patch19 -p1
 %patch20 -p1
+%if 0%{?suse_version} == 1315
+%patch21 -p1
+%endif
 
 %build
 ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh
@@ -332,5 +328,7 @@
 %files devel
 %defattr (-, root, root)
 %{_datadir}/pkgconfig/gnome-keybindings.pc
+%{_datadir}/gettext/its/gnome-keybindings.its
+%{_datadir}/gettext/its/gnome-keybindings.loc
 
 %changelog

++++++ gnome-control-center-3.20.1.tar.xz -> gnome-control-center-3.22.0.tar.xz 
++++++
/work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center-3.20.1.tar.xz
 
/work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center-3.22.0.tar.xz
 differ: char 26, line 1

++++++ gnome-control-center-890979-change-remote-passwd.patch ++++++
--- /var/tmp/diff_new_pack.A2rLSr/_old  2016-09-21 18:43:39.000000000 +0200
+++ /var/tmp/diff_new_pack.A2rLSr/_new  2016-09-21 18:43:39.000000000 +0200
@@ -1,10 +1,11 @@
-diff -Nur gnome-control-center-3.10.3.bak/panels/user-accounts/um-user-panel.c 
gnome-control-center-3.10.3/panels/user-accounts/um-user-panel.c
---- gnome-control-center-3.10.3.bak/panels/user-accounts/um-user-panel.c       
2014-09-24 06:25:22.293935423 +0800
-+++ gnome-control-center-3.10.3/panels/user-accounts/um-user-panel.c   
2014-09-24 06:27:53.801939024 +0800
-@@ -687,7 +687,10 @@
+diff --git a/panels/user-accounts/um-user-panel.c 
b/panels/user-accounts/um-user-panel.c
+index 4f11a0a..1bb7738 100644
+--- a/panels/user-accounts/um-user-panel.c
++++ b/panels/user-accounts/um-user-panel.c
+@@ -900,7 +900,10 @@ show_user (ActUser *user, CcUserPanelPrivate *d)
  
-         widget = get_widget (d, "account-password-button");
-         um_editable_button_set_text (UM_EDITABLE_BUTTON (widget), 
get_password_mode_text (user));
+         widget = get_widget (d, "account-password-button-label");
+         gtk_label_set_label (GTK_LABEL (widget), get_password_mode_text 
(user));
 +/*      Enable the remote account also.
          enable = act_user_is_local_account (user);
 +*/

++++++ gnome-control-center-add-alacarte-for-sle.patch ++++++
--- /var/tmp/diff_new_pack.A2rLSr/_old  2016-09-21 18:43:39.000000000 +0200
+++ /var/tmp/diff_new_pack.A2rLSr/_new  2016-09-21 18:43:39.000000000 +0200
@@ -1,12 +1,24 @@
-Index: gnome-control-center-3.18.2/shell/cc-panel-loader.c
-===================================================================
---- gnome-control-center-3.18.2.orig/shell/cc-panel-loader.c
-+++ gnome-control-center-3.18.2/shell/cc-panel-loader.c
-@@ -103,6 +103,7 @@ static struct {
-   PANEL_TYPE("wacom",               cc_wacom_panel_get_type        ),
+From df1f2a24bc6d8ff3be90e4c7d810fe13bdce8780 Mon Sep 17 00:00:00 2001
+From: Felix Zhang <fezh...@suse.com>
+Date: Sun, 4 Sep 2016 00:08:10 +0800
+Subject: [PATCH] add alacarte for sle
+
+---
+ shell/cc-panel-loader.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index e24fc6e..011da0e 100644
+--- a/shell/cc-panel-loader.c
++++ b/shell/cc-panel-loader.c
+@@ -102,6 +102,7 @@ static struct {
+ #ifdef BUILD_WACOM
+   PANEL_TYPE("wacom",            cc_wacom_panel_get_type        ),
  #endif
-   PANEL_TYPE("ca.desrt.dconf-editor",        NULL                           ),
-+  PANEL_TYPE("alacarte",            NULL                           ),
-   PANEL_TYPE("gpk-prefs",           NULL                           ),
-   PANEL_TYPE("tracker-preferences", NULL                           ),
-   PANEL_TYPE("itweb-settings",      NULL                           ),
++  PANEL_TYPE("alacarte",                    NULL                ),
+   PANEL_TYPE("ca.desrt.dconf-editor",       NULL                ),
+   PANEL_TYPE("gnome-tweak-tool",            NULL                ),
+   PANEL_TYPE("gpk-prefs",                   NULL                ),
+-- 
+2.6.6
+

++++++ gnome-control-center-allow-extra-tools-in-shell.patch ++++++
--- /var/tmp/diff_new_pack.A2rLSr/_old  2016-09-21 18:43:39.000000000 +0200
+++ /var/tmp/diff_new_pack.A2rLSr/_new  2016-09-21 18:43:39.000000000 +0200
@@ -1,81 +1,41 @@
-From fbdfce5abb17cae9a1b9b8df8f3c5f87af345789 Mon Sep 17 00:00:00 2001
+From 8469e4ac57f3b5d3efbf533ba23512612997ffff Mon Sep 17 00:00:00 2001
 From: Felix Zhang <fezh...@suse.com>
-Date: Thu, 12 Jun 2014 20:17:05 +0800
+Date: Fri, 2 Sep 2016 14:55:12 +0800
 Subject: [PATCH] allow extra tools in shell
 
 ---
- shell/cc-panel-loader.c | 61 ++++++++++++++++++++++++++++++-------------------
- shell/cc-window.c       | 43 ++++++++++++++++++++++++++++++++++
- 2 files changed, 81 insertions(+), 23 deletions(-)
+ shell/cc-panel-loader.c | 28 ++++++++++++++++++++++++++--
+ shell/cc-window.c       | 41 +++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 67 insertions(+), 2 deletions(-)
 
-Index: gnome-control-center-3.17.90/shell/cc-panel-loader.c
+Index: gnome-control-center-3.21.90/shell/cc-panel-loader.c
 ===================================================================
---- gnome-control-center-3.17.90.orig/shell/cc-panel-loader.c
-+++ gnome-control-center-3.17.90/shell/cc-panel-loader.c
-@@ -73,35 +73,41 @@ static struct {
-   GType (*get_type)(void);
- #endif
- } all_panels[] = {
--  PANEL_TYPE("background",       cc_background_panel_get_type   ),
-+  PANEL_TYPE("background",          cc_background_panel_get_type   ),
- #ifdef BUILD_BLUETOOTH
--  PANEL_TYPE("bluetooth",        cc_bluetooth_panel_get_type    ),
-+  PANEL_TYPE("bluetooth",           cc_bluetooth_panel_get_type    ),
- #endif
--  PANEL_TYPE("color",            cc_color_panel_get_type        ),
--  PANEL_TYPE("datetime",         cc_date_time_panel_get_type    ),
--  PANEL_TYPE("display",          cc_display_panel_get_type      ),
--  PANEL_TYPE("info",             cc_info_panel_get_type         ),
--  PANEL_TYPE("keyboard",         cc_keyboard_panel_get_type     ),
--  PANEL_TYPE("mouse",            cc_mouse_panel_get_type        ),
-+  PANEL_TYPE("color",               cc_color_panel_get_type        ),
-+  PANEL_TYPE("datetime",            cc_date_time_panel_get_type    ),
-+  PANEL_TYPE("display",             cc_display_panel_get_type      ),
-+  PANEL_TYPE("info",                cc_info_panel_get_type         ),
-+  PANEL_TYPE("keyboard",            cc_keyboard_panel_get_type     ),
-+  PANEL_TYPE("mouse",               cc_mouse_panel_get_type        ),
- #ifdef BUILD_NETWORK
--  PANEL_TYPE("network",          cc_network_panel_get_type      ),
-+  PANEL_TYPE("network",             cc_network_panel_get_type      ),
- #endif
--  PANEL_TYPE("notifications",    cc_notifications_panel_get_type),
--  PANEL_TYPE("online-accounts",  cc_goa_panel_get_type          ),
--  PANEL_TYPE("power",            cc_power_panel_get_type        ),
-+  PANEL_TYPE("notifications",       cc_notifications_panel_get_type),
-+  PANEL_TYPE("online-accounts",     cc_goa_panel_get_type          ),
-+  PANEL_TYPE("power",               cc_power_panel_get_type        ),
- #ifdef BUILD_PRINTERS
--  PANEL_TYPE("printers",         cc_printers_panel_get_type     ),
-+  PANEL_TYPE("printers",            cc_printers_panel_get_type     ),
- #endif
--  PANEL_TYPE("privacy",          cc_privacy_panel_get_type      ),
--  PANEL_TYPE("region",           cc_region_panel_get_type       ),
--  PANEL_TYPE("search",           cc_search_panel_get_type       ),
--  PANEL_TYPE("sharing",          cc_sharing_panel_get_type      ),
--  PANEL_TYPE("sound",            cc_sound_panel_get_type        ),
--  PANEL_TYPE("universal-access", cc_ua_panel_get_type           ),
--  PANEL_TYPE("user-accounts",    cc_user_panel_get_type         ),
-+  PANEL_TYPE("privacy",             cc_privacy_panel_get_type      ),
-+  PANEL_TYPE("region",              cc_region_panel_get_type       ),
-+  PANEL_TYPE("search",              cc_search_panel_get_type       ),
-+  PANEL_TYPE("sharing",             cc_sharing_panel_get_type      ),
-+  PANEL_TYPE("sound",               cc_sound_panel_get_type        ),
-+  PANEL_TYPE("universal-access",    cc_ua_panel_get_type           ),
-+  PANEL_TYPE("user-accounts",       cc_user_panel_get_type         ),
+--- gnome-control-center-3.21.90.orig/shell/cc-panel-loader.c
++++ gnome-control-center-3.21.90/shell/cc-panel-loader.c
+@@ -102,6 +102,12 @@ static struct {
  #ifdef BUILD_WACOM
--  PANEL_TYPE("wacom",            cc_wacom_panel_get_type        ),
-+  PANEL_TYPE("wacom",               cc_wacom_panel_get_type        ),
+   PANEL_TYPE("wacom",            cc_wacom_panel_get_type        ),
  #endif
-+  PANEL_TYPE("ca.desrt.dconf-editor",        NULL                           ),
-+  PANEL_TYPE("gpk-prefs",           NULL                           ),
-+  PANEL_TYPE("tracker-preferences", NULL                           ),
-+  PANEL_TYPE("itweb-settings",      NULL                           ),
-+  PANEL_TYPE("gnome-tweak-tool",    NULL                           ),
-+  PANEL_TYPE("YaST",                NULL                           ),
++  PANEL_TYPE("ca.desrt.dconf-editor",       NULL                ),
++  PANEL_TYPE("gnome-tweak-tool",            NULL                ),
++  PANEL_TYPE("gpk-prefs",                   NULL                ),
++  PANEL_TYPE("itweb-settings",              NULL                ),
++  PANEL_TYPE("tracker-preferences",         NULL                ),
++  PANEL_TYPE("YaST",                        NULL                ),
  };
  
  GList *
-@@ -158,10 +165,22 @@ cc_panel_loader_fill_model (CcShellModel
+@@ -146,7 +152,8 @@ parse_categories (GDesktopAppInfo *app)
+ #else
+   if (g_strv_contains (const_strv (split), "HardwareSettings"))
+     retval = CC_CATEGORY_HARDWARE;
+-  else if (g_strv_contains (const_strv (split), "X-GNOME-PersonalSettings"))
++  else if (g_strv_contains (const_strv (split), "X-GNOME-PersonalSettings")
++        || g_strv_contains (const_strv (split), "X-GNOME-DesktopSettings"))
+     retval = CC_CATEGORY_PERSONAL;
+   else if (g_strv_contains (const_strv (split), "X-GNOME-SystemSettings"))
+     retval = CC_CATEGORY_SYSTEM;
+@@ -173,17 +180,33 @@ cc_panel_loader_fill_model (CcShellModel
      {
        GDesktopAppInfo *app;
        char *desktop_name;
@@ -83,10 +43,11 @@
        int category;
  
 +#ifndef CC_PANEL_LOADER_NO_GTYPES
-+      if (all_panels[i].get_type == NULL) {
-+        desktop_name = g_strconcat (all_panels[i].name,
-+                                    ".desktop", NULL);
-+        name = g_strconcat ("suse-",all_panels[i].name, NULL);
++      if (all_panels[i].get_type == NULL)
++      {
++      desktop_name = g_strconcat (all_panels[i].name,
++                                  ".desktop", NULL);
++      name = g_strconcat ("suse-",all_panels[i].name, NULL);
 +      }
 +      else
 +#endif
@@ -98,20 +59,31 @@
        app = g_desktop_app_info_new (desktop_name);
        g_free (desktop_name);
  
-@@ -176,7 +195,7 @@ cc_panel_loader_fill_model (CcShellModel
+       if (app == NULL)
+         {
++          if (!g_str_has_prefix(name, "suse-"))
++          {
+           g_warning ("Ignoring broken panel %s (missing desktop file)",
+                      all_panels[i].name);
++          }
+           continue;
+         }
+ 
+@@ -191,7 +214,8 @@ cc_panel_loader_fill_model (CcShellModel
        if (G_UNLIKELY (category < 0))
          continue;
  
 -      cc_shell_model_add_item (model, category, G_APP_INFO (app), 
all_panels[i].name);
 +      cc_shell_model_add_item (model, category, G_APP_INFO (app), name);
++      g_free (name);
        g_object_unref (app);
      }
  }
-Index: gnome-control-center-3.17.90/shell/cc-window.c
+Index: gnome-control-center-3.21.90/shell/cc-window.c
 ===================================================================
---- gnome-control-center-3.17.90.orig/shell/cc-window.c
-+++ gnome-control-center-3.17.90/shell/cc-window.c
-@@ -140,6 +140,41 @@ get_icon_name_from_g_icon (GIcon *gicon)
+--- gnome-control-center-3.21.90.orig/shell/cc-window.c
++++ gnome-control-center-3.21.90/shell/cc-window.c
+@@ -139,6 +139,41 @@ get_icon_name_from_g_icon (GIcon *gicon)
    return NULL;
  }
  
@@ -153,7 +125,7 @@
  static gboolean
  activate_panel (CcWindow           *self,
                  const gchar        *id,
-@@ -153,6 +188,12 @@ activate_panel (CcWindow           *self
+@@ -151,6 +186,12 @@ activate_panel (CcWindow           *self
  
    if (!id)
      return FALSE;
@@ -164,14 +136,5 @@
 +      return FALSE;
 +    }
  
-   priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL 
(self), id, parameters));
-   cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (priv->current_panel));
-@@ -1502,7 +1543,7 @@ create_header (CcWindow *self)
-   gtk_button_set_image (GTK_BUTTON (priv->search_button), image);
-   gtk_widget_set_valign (priv->search_button, GTK_ALIGN_CENTER);
-   gtk_style_context_add_class (gtk_widget_get_style_context 
(priv->search_button),
--                               "image-button");  
-+                               "image-button");
-   gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->header), 
priv->search_button);
- 
-   priv->top_right_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+   self->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL 
(self), id, parameters));
+   cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (self->current_panel));

++++++ gnome-control-center-info-never-use-gnome-software.patch ++++++
>From 0884359b9fe093f4023ee404274ed3cdf76b857e Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezh...@suse.com>
Date: Sat, 17 Sep 2016 00:33:20 +0800
Subject: [PATCH] info: never use gnome-software

---
 panels/info/cc-info-panel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
index ad89d54..d904f6c 100644
--- a/panels/info/cc-info-panel.c
+++ b/panels/info/cc-info-panel.c
@@ -1512,7 +1512,7 @@ info_panel_setup_overview (CcInfoPanel  *self)
 static gboolean
 does_gnome_software_exist (void)
 {
-  return g_file_test (BINDIR "/gnome-software", G_FILE_TEST_EXISTS);
+  return FALSE;
 }
 
 static gboolean
-- 
2.6.6


Reply via email to