1
0

Accepting request 290457 from home:Zaitor:branches:GNOME:Factory

- Update to version 3.14.3 (916784):
  + Background: Fix crash to missing icon.
  + Network:
    - Also work with NetworkManager 1.0.
    - Allocate storage for zone name during D-Bus call.
  + Power: Fix initial state of Bluetooth switch.
  + Printers: Remove border around model name.
  + Sharing:
    - Prevent an endless loop and resulting stack overflow.
    - Don't add the folder if the dialog isn't explicity accepted.
    - Update help URI.
  + Shell: Unset sort terms when search entry is programatically
    cleared.
  + Universal Access: Fix typo.
  + User Accounts:
    - Change default size for avatar cropping to match Cheese.
    - Don't crash when closing fingerprint dialog.
    - Don't crash when network changes.
    - Don't show empty row for remote users.
- Drop
  gnome-control-center-power-fix-initial-state-of-Bluetooth.patch
  and gnome-control-center-NM-1.0.patch: Fixed upstream.

OBS-URL: https://build.opensuse.org/request/show/290457
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=273
This commit is contained in:
Dominique Leuenberger 2015-03-12 16:23:22 +00:00 committed by Git OBS Bridge
parent c9a7ec92ec
commit 4324aaac2e
6 changed files with 30 additions and 98 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a
size 6938572

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21f49787cf708e591f53b6d2a6e1c059037a62726f23b9513b0d116996066e15
size 6984324

View File

@ -1,62 +0,0 @@
From f30e6df1d4665b06a45ad7bbe7a2ed2bfa9387f5 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 18 Dec 2014 08:04:00 +0100
Subject: network: Also work with NM 1.0
Remove the NetworkManager version checking altogether. The code was made
to check for now very old versions of NetworkManager, and anything newer
than ancient should degrade gracefully if we support newer features.
https://bugzilla.gnome.org/show_bug.cgi?id=741661
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index 90b265e..28f6158 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -1321,30 +1321,17 @@ static gboolean
panel_check_network_manager_version (CcNetworkPanel *panel)
{
const gchar *version;
- gchar **split = NULL;
- guint major = 0;
- guint micro = 0;
- guint minor = 0;
gboolean ret = TRUE;
/* parse running version */
version = nm_client_get_version (panel->priv->client);
- if (version != NULL) {
- split = g_strsplit (version, ".", -1);
- major = atoi (split[0]);
- minor = atoi (split[1]);
- micro = atoi (split[2]);
- }
-
- /* is it too new or old */
- if (major > 0 || minor > 9 || (minor <= 8 && micro < 992)) {
+ if (version == NULL) {
ret = FALSE;
/* do modal dialog in idle so we don't block startup */
panel->priv->nm_warning_idle = g_idle_add ((GSourceFunc)display_version_warning_idle, panel);
}
- g_strfreev (split);
return ret;
}
@@ -1391,8 +1378,8 @@ on_toplevel_map (GtkWidget *widget,
{
gboolean ret;
- /* is the user compiling against a new version, but running an
- * old daemon version? */
+ /* is the user compiling against a new version, but not running
+ * the daemon? */
ret = panel_check_network_manager_version (panel);
if (ret) {
manager_running (panel->priv->client, NULL, panel);
--
cgit v0.10.1

View File

@ -1,26 +0,0 @@
From aa594a7f145a88b737b781375c0f5bf681a43c74 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 28 Jan 2015 16:20:23 +0100
Subject: power: Fix initial state of Bluetooth switch
The initial state of the switch was never set, so if it happened to be
on, the switch didn't match reality.
https://bugzilla.gnome.org/show_bug.cgi?id=725654
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index 9b0449e..5df8049 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -1663,6 +1663,8 @@ add_power_saving_section (CcPowerPanel *self)
G_CALLBACK (bt_powered_state_changed), self);
g_signal_connect (G_OBJECT (priv->bt_switch), "notify::active",
G_CALLBACK (bt_switch_changed), self);
+
+ bt_powered_state_changed (self);
}
#endif
--
cgit v0.10.1

View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Mar 12 16:00:23 UTC 2015 - zaitor@opensuse.org
- Update to version 3.14.3 (916784):
+ Background: Fix crash to missing icon.
+ Network:
- Also work with NetworkManager 1.0.
- Allocate storage for zone name during D-Bus call.
+ Power: Fix initial state of Bluetooth switch.
+ Printers: Remove border around model name.
+ Sharing:
- Prevent an endless loop and resulting stack overflow.
- Don't add the folder if the dialog isn't explicity accepted.
- Update help URI.
+ Shell: Unset sort terms when search entry is programatically
cleared.
+ Universal Access: Fix typo.
+ User Accounts:
- Change default size for avatar cropping to match Cheese.
- Don't crash when closing fingerprint dialog.
- Don't crash when network changes.
- Don't show empty row for remote users.
- Drop
gnome-control-center-power-fix-initial-state-of-Bluetooth.patch
and gnome-control-center-NM-1.0.patch: Fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 12 10:26:55 UTC 2015 - dimstar@opensuse.org Thu Mar 12 10:26:55 UTC 2015 - dimstar@opensuse.org

View File

@ -29,7 +29,7 @@
%define with_cacert_patch 1 %define with_cacert_patch 1
Name: gnome-control-center Name: gnome-control-center
Version: 3.14.2 Version: 3.14.3
Release: 0 Release: 0
# FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) # FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833)
Summary: The GNOME Control Center Summary: The GNOME Control Center
@ -49,10 +49,6 @@ Patch15: gcc-private-connection.patch
Patch16: gnome-control-center-probe-radius-server-cert.patch Patch16: gnome-control-center-probe-radius-server-cert.patch
# PATCH-FEATURE-OPENSUSE gnome-control-center-follow-polkit-permissions-for-tz.patch boo#904058 badshah400@gmail.com -- Follow polkit permissions for allowing/locking timezone setting changes # PATCH-FEATURE-OPENSUSE gnome-control-center-follow-polkit-permissions-for-tz.patch boo#904058 badshah400@gmail.com -- Follow polkit permissions for allowing/locking timezone setting changes
Patch17: gnome-control-center-follow-polkit-permissions-for-tz.patch Patch17: gnome-control-center-follow-polkit-permissions-for-tz.patch
# PATCH-FIX-UPSTREAM gnome-control-center-NM-1.0.patch dimstar@opensuse.org -- Allow to operate with NetworkManager 1.0
Patch18: gnome-control-center-NM-1.0.patch
# PATCH-FIX-UPSTREAM gnome-control-center-power-fix-initial-state-of-Bluetooth.patch bgo#725654 zaitor@opensuse.org. -- Fix initial state of Bluetooth switch, taken from upstream git.
Patch19: gnome-control-center-power-fix-initial-state-of-Bluetooth.patch
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: fdupes BuildRequires: fdupes
@ -195,8 +191,6 @@ translation-update-upstream
%patch17 -p1 %patch17 -p1
#NEEDS-REBASE #NEEDS-REBASE
#patch14 -p1 #patch14 -p1
%patch18 -p1
%patch19 -p1
%build %build
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh