Hello community,

here is the log from the commit of package gnome-control-center for 
openSUSE:Factory checked in at 2016-08-16 13:01:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-07-18 21:18:28.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center.changes
   2016-08-16 13:01:56.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Jul 26 06:53:23 UTC 2016 - sck...@suse.com
+
+- Add gnome-control-center-disable-error-message-for-NM.patch:
+  Improve the check whether NM or wicked is running, so it won't
+  show an error about NM on systems where wicked instead of NM is
+  being used (bsc#989801).
+
+-------------------------------------------------------------------
@@ -13 +21,6 @@
-  gnome-online-accounts is installed.
+  gnome-online-accounts is installed. (FATE#318572)
+
+-------------------------------------------------------------------
+Thu May 26 08:47:25 UTC 2016 - fezh...@suse.com
+
+- Update to GNOME 3.20.2  Fate#318572
@@ -22,0 +36,5 @@
+Mon Apr 18 19:59:13 UTC 2016 - mgo...@suse.com
+
+- Don't require NetworkManager for SLE. It isn't used on SLES.
+
+-------------------------------------------------------------------
@@ -45,0 +64,42 @@
+Tue Apr 12 10:00:06 UTC 2016 - fezh...@suse.com
+
+- Update to GNOME 3.20  Fate#318572
+- 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)
+- Drop commit-0f5e433: fixed upstream
+- Drop commit-23c4ea2: fixed upstream
+- Drop commit-a53065d: fixed upstream
+- Drop commit-b242a00: fixed upstream
+- Drop commit-ccebd62: fixed upstream
+- Drop commit-d2074fa: fixed upstream
+- Drop commit-eed8f71: fixed upstream
+- 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):
+  fixed upstream
+- Drop gnome-control-center-bnc947761-fix-color-dialog-translations.patch 
(bnc#947761):
+  fixed upstream
+- Drop gnome-control-center-change-password-i18n.patch (bnc#880303):
+  fixed upstream
+- Drop gnome-control-center-datetime-i18n.patch (bnc#884425, bgo#732585): 
+  fixed upstream
+- Drop gnome-control-center-display-login-region.patch (bsc#955322):
+  fixed upstream
+- Drop gnome-control-center-fix-wifi-list.patch (bsc#870322):
+  replaced by upstream fix 0001-network-Fix-empty-Wifi-list.patch
+- Drop gnome-control-center-Pyongyang-Time.patch (bsc#951590, boo#941290, 
bgo#753643):
+  fixed upstream
+- Drop gnome-control-center-upower-changed-signal.patch: fixed upstream
+- Drop gnome-control-center-upower-DeviceChanged-signal.patch: fixed upstream
+- Drop gnome-control-center-upower-display.patch: fixed upstream
+- Drop gnome-control-center-upower-fix-build.patch: fixed upstream
+- Drop gnome-control-center-upower-icons.patch: fixed upstream
+- Rebase gcc-private-connection.patch (bnc#751211)
+- Rebase gnome-control-center-allow-extra-tools-in-shell.patch (bnc#866235)
+- Rebase gnome-control-center-probe-radius-server-cert.patch (bnc#574266)
+
+-------------------------------------------------------------------
@@ -51,0 +112,6 @@
+Thu Mar 24 07:12:23 UTC 2016 - sck...@suse.com
+
+- Fix Wifi list not showing APs correctly (bsc#870322)
+  + Add gnome-control-center-fix-wifi-list.patch
+
+-------------------------------------------------------------------
@@ -127,0 +194,7 @@
+Mon Dec 28 15:23:15 UTC 2015 - qz...@suse.com
+
+- Add gnome-control-center-display-login-region.patch:
+  Fix bug login language button in region list disappear.
+  (bsc#955322)
+
+-------------------------------------------------------------------
@@ -155,0 +229,7 @@
+Mon Nov 30 13:52:06 UTC 2015 - fezh...@suse.com
+
+- Fix the unlocalised heading on the Add Profile dialog on Color 
+  panel (bnc#947761)
+  - Add gnome-control-center-bnc947761-fix-color-dialog-translations.patch
+
+-------------------------------------------------------------------
@@ -165,0 +246,6 @@
+Tue Oct 20 12:28:20 UTC 2015 - qz...@suse.com
+
+- Fix bug The keyboard display window missed (bnc#951122)
+  Add require libgnomekbd in spec file.
+
+-------------------------------------------------------------------
@@ -666,0 +753,9 @@
+Tue Oct  7 16:38:35 CEST 2014 - sbra...@suse.cz
+
+- Fix untranslatability of "Change Password" (bnc#880303,
+  gnome-control-center-change-password-l10n.patch)
+- Add support for 8.5 time zone to fix compilation failure
+  (gnome-control-center-Pyongyang-Time.patch,
+  gnome-control-center-Pyongyang-Time.tar.bz2, bgo#753643).
+
+-------------------------------------------------------------------
@@ -680,0 +776,6 @@
+Tue Sep 23 22:32:24 UTC 2014 - dli...@suse.com
+
+- Add gnome-control-center-890979-change-remote-passwd.patch
+  (bnc#890979)
+
+-------------------------------------------------------------------
@@ -723,0 +825,6 @@
+Tue Sep  9 11:41:54 UTC 2014 - fezh...@suse.com
+
+- Hide Firewall zone entry in Network panel (bnc#894394)
+  + added patch: gnome-control-center-bnc894394-hide-firewall-zone-entry.patch 
+
+-------------------------------------------------------------------
@@ -734,0 +842,13 @@
+Fri Sep  5 22:52:01 UTC 2014 - sree...@suse.com
+
+- Add gnome-control-center-bnc862415-timezone.patch
+    Allow changing timezone without root privs.
+
+-------------------------------------------------------------------
+Thu Aug 28 14:00:18 UTC 2014 - fcro...@suse.com
+
+- Move online accounts panel to a separate subpackage and ensure
+  gnome-online-accounts is required by this subpackage (icons are
+  provided by it).
+
+-------------------------------------------------------------------
@@ -768,0 +889,14 @@
+Fri Aug  8 17:07:11 CEST 2014 - sbra...@suse.cz
+
+- Make punctuation translatable in datetime preferences
+  (bnc#884425, bgo#732585,
+  gnome-control-center-datetime-i18n.patch)
+
+-------------------------------------------------------------------
+Thu Aug  7 12:53:39 UTC 2014 - fcro...@suse.com
+
+- Update gnome-control-center-allow-extra-tools-in-shell.patch:
+  Improve patch (no longer need to change 3 files to add one icon)
+  and add alacarte and icedtea settings to available icons.
+
+-------------------------------------------------------------------
@@ -854 +988 @@
-Mon Jun 23 07:58:24 UTC 2014 - fcro...@suse.com
+Mon Jul 21 06:30:52 UTC 2014 - fezh...@suse.com
@@ -856,2 +990,16 @@
-- Update gnome-control-center-allow-yast-in-shell.patch: properly
-  display online-account panel.
+- Remove the device add / remove button in Network panel when NM is
+  not running (bnc#865632)
+  + updated patch: gnome-control-center-bnc865632-disable-popup-for-NM.patch
+
+-------------------------------------------------------------------
+Fri Jun 27 21:26:57 UTC 2014 - sree...@suse.com
+
+- Add commit-*. Upstream bugfixes from the 3_10_X branch
+    Fix bnc#884827 - color crashes
+    Fix bnc#884525 - wrong virtualization detection
+
+-------------------------------------------------------------------
+Mon Jun 23 08:02:01 UTC 2014 - fcro...@suse.com
+
+- Update gnome-control-center-allow-extra-tools-in-shell.patch:
+  restore online-accounts panel.
@@ -862,7 +1010,6 @@
-- Update gnome-control-center-allow-yast-in-shell.patch, add
-  dconf-editor, pkg-prefs, gnome-tweak-tool and tracker-preferences
-  to the patch so that they can show in g-c-c shell like YaST does
-  (bnc#866235).
-  + Renamed the patch to
-    gnome-control-center-allow-extra-tools-in-shell.patch.
-  + %suse_update_desktop_file must be added to specfiles of the
+- Rename gnome-control-center-allow-yast-in-shell.patch to
+  gnome-control-center-allow-extra-tools-in-shell.patch
+  (bnc#866235). Add dconf-editor, gnome-tweak-tool, pkg-prefs and 
+  tracker-preferences, alongside yast, to the patch so that g-c-c
+  shell show them all.
+  %suse_update_desktop_file are meanwhile added to specfiles of the
@@ -870,2 +1017,12 @@
-    X-GNOME-SystemSettings before g-c-c can show them in the
-    correct category view.
+  X-GNOME-SystemSettings to make this patch properly taking effect.
+
+-------------------------------------------------------------------
+Thu May 15 07:34:19 UTC 2014 - fezh...@suse.com
+
+- Remove the popup error message in Network (bnc#865632)
+  + added patch: gnome-control-center-bnc865632-disable-popup-for-NM.patch
+
+-------------------------------------------------------------------
+Wed May  7 23:35:53 UTC 2014 - dli...@suse.com
++++ 14 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

New:
----
  gnome-control-center-disable-error-message-for-NM.patch

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

Other differences:
------------------
++++++ gnome-control-center.spec ++++++
--- /var/tmp/diff_new_pack.wFgI8j/_old  2016-08-16 13:01:57.000000000 +0200
+++ /var/tmp/diff_new_pack.wFgI8j/_new  2016-08-16 13:01:57.000000000 +0200
@@ -54,6 +54,8 @@
 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
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
@@ -128,9 +130,11 @@
 Recommends:     dbus(com.intel.dleyna-server)
 # the printers panel can use the dbus service
 Recommends:     system-config-printer-dbus-service
+%if 0%{?is_opensuse}
 %if %{with_cacert_patch}
 Requires:       NetworkManager(cacert-patch)
 %endif
+%endif
 Provides:       acme
 Provides:       fontilus
 Provides:       themus
@@ -216,6 +220,7 @@
 #NEEDS-REBASE
 #patch14 -p1
 %patch19 -p1
+%patch20 -p1
 
 %build
 ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh

++++++ gnome-control-center-disable-error-message-for-NM.patch ++++++
Index: gnome-control-center-3.20.1/panels/network/cc-network-panel.c
===================================================================
--- gnome-control-center-3.20.1.orig/panels/network/cc-network-panel.c
+++ gnome-control-center-3.20.1/panels/network/cc-network-panel.c
@@ -1286,10 +1286,23 @@ panel_check_network_manager_version (CcN
         GtkWidget *label;
         gchar *markup;
         const gchar *version;
+        const gchar *state;
+        GDBusConnection *connection;
+        GDBusProxy *proxy;
+        GVariant *variant;
+
+        connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+        proxy = g_dbus_proxy_new_sync (connection, G_DBUS_PROXY_FLAGS_NONE, 
NULL,
+                                       "org.freedesktop.systemd1",
+                                       
"/org/freedesktop/systemd1/unit/wickedd_2ddhcp6_2eservice",
+                                       "org.freedesktop.systemd1.Unit",
+                                       NULL, NULL);
+        variant = g_dbus_proxy_get_cached_property (proxy, "ActiveState");
+        state = g_variant_get_string (variant, NULL);
 
         /* parse running version */
         version = nm_client_get_version (panel->priv->client);
-        if (version == NULL) {
+        if (version == NULL && g_strcmp0 (state, "inactive") == 0) {
                 gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child 
(GTK_BIN (panel)));
 
                 box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
@@ -1312,9 +1325,22 @@ panel_check_network_manager_version (CcN
 
                 gtk_widget_show_all (box);
                 g_free (markup);
+        } else if (g_strcmp0 (state, "active") == 0) {
+                GtkWidget *w;
+
+                w = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
+                                                        "devices_toolbar"));
+                gtk_widget_hide (w);
+                w = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
+                                                        "label_NM_warning"));
+                gtk_widget_show (w);
         } else {
                 manager_running (panel->priv->client, NULL, panel);
         }
+
+        g_object_unref (connection);
+        g_object_unref (proxy);
+        g_variant_unref (variant);
 }
 
 static void
Index: gnome-control-center-3.20.1/panels/network/network.ui
===================================================================
--- gnome-control-center-3.20.1.orig/panels/network/network.ui
+++ gnome-control-center-3.20.1/panels/network/network.ui
@@ -127,6 +127,19 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="label_NM_warning">
+                        <property name="visible">False</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Please use 
YaST2 to configure your network.</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>

Reply via email to