commit nautilus for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package nautilus for openSUSE:Factory checked in at 2016-06-29 15:03:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nautilus (Old)
and /work/SRC/openSUSE:Factory/.nautilus.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nautilus"
Changes:
--------
--- /work/SRC/openSUSE:Factory/nautilus/nautilus.changes 2016-06-07 23:45:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.nautilus.new/nautilus.changes 2016-06-29 15:03:39.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Jun 20 20:18:18 UTC 2016 - mgorse@suse.com
+
+- Add nautilus-bsc979947.patch: only write zoom level to user
+ config if the user has adjusted it (bsc#979947).
+
+-------------------------------------------------------------------
+Tue Jun 14 20:27:01 UTC 2016 - zaitor@opensuse.org
+
+- Rebase nautilus-adjust-style-priority.patch to what upstream
+ committed (boo#982134).
+
+-------------------------------------------------------------------
New:
----
nautilus-bsc979947.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nautilus.spec ++++++
--- /var/tmp/diff_new_pack.tOpSug/_old 2016-06-29 15:03:40.000000000 +0200
+++ /var/tmp/diff_new_pack.tOpSug/_new 2016-06-29 15:03:40.000000000 +0200
@@ -28,6 +28,8 @@
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM nautilus-adjust-style-priority.patch bsc#982633 bgo#765687 qzhao@suse.com -- Fix white desktop after changing themes
Patch0: nautilus-adjust-style-priority.patch
+# PATCH-FIX-UPSTREAM nautilus-bsc979947.patch bsc#979947 bgo#767878 mgorse@suse.com -- only write zoom level to user configuration if the user has adjusted it.
+Patch1: nautilus-bsc979947.patch
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# needed for directory ownership
@@ -111,6 +113,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
translation-update-upstream
%build
++++++ nautilus-adjust-style-priority.patch ++++++
--- /var/tmp/diff_new_pack.tOpSug/_old 2016-06-29 15:03:40.000000000 +0200
+++ /var/tmp/diff_new_pack.tOpSug/_new 2016-06-29 15:03:40.000000000 +0200
@@ -1,25 +1,38 @@
-diff -Nura nautilus-3.20.1/src/nautilus-application.c nautilus-3.20.1_new/src/nautilus-application.c
---- nautilus-3.20.1/src/nautilus-application.c 2016-04-28 09:40:26.000000000 +0000
-+++ nautilus-3.20.1_new/src/nautilus-application.c 2016-06-03 09:19:52.152258384 +0000
-@@ -1097,12 +1097,18 @@
- provider = gtk_css_provider_new ();
- file = g_file_new_for_uri ("resource:///org/gnome/nautilus/css/Adwaita.css");
- gtk_css_provider_load_from_file (provider, file, NULL);
-+
-+ /* The behavior of two style providers with the same priority is
-+ * undefined and gtk happens to prefer the provider that got added last.
-+ * Use a higher priority here to avoid this problem.
-+ */
-+ gtk_style_context_add_provider_for_screen (screen,
-+ GTK_STYLE_PROVIDER (provider),
-+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION + 1);
-+
- g_object_unref (file);
- }
-
-- gtk_style_context_add_provider_for_screen (screen,
-- GTK_STYLE_PROVIDER (provider),
+From 8c0f5970e71a9b6c786e3e14785f2691c731cd38 Mon Sep 17 00:00:00 2001
+From: Sebastian Keller
From 58661010db2237c69ad98ee446f20a16ba24888f Mon Sep 17 00:00:00 2001 From: Mike Gorse
Date: Mon, 20 Jun 2016 11:31:26 -0500 Subject: [PATCH] Only save zoom level if the user has updated it
Don't write the zoom level to gsettings if the user has not made a change from the system default. This allows an update to be installed and then rolled back without a system default from the update having been written to the user's configuration. https://bugzilla.gnome.org/show_bug.cgi?id=767878 --- src/nautilus-canvas-view.c | 9 ++++++--- src/nautilus-list-view.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c index 2c99ce7..b42a545 100644 --- a/src/nautilus-canvas-view.c +++ b/src/nautilus-canvas-view.c @@ -962,9 +962,12 @@ action_zoom_to_level (GSimpleAction *action, nautilus_canvas_view_zoom_to_level (view, zoom_level); g_simple_action_set_state (G_SIMPLE_ACTION (action), state); - g_settings_set_enum (nautilus_icon_view_preferences, - NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, - zoom_level); + if (g_settings_get_enum (nautilus_icon_view_preferences, + NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL) != zoom_level) { + g_settings_set_enum (nautilus_icon_view_preferences, + NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, + zoom_level); + } } static void diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c index 1c2f996..6237b21 100644 --- a/src/nautilus-list-view.c +++ b/src/nautilus-list-view.c @@ -2507,9 +2507,12 @@ action_zoom_to_level (GSimpleAction *action, nautilus_list_view_zoom_to_level (view, zoom_level); g_simple_action_set_state (G_SIMPLE_ACTION (action), state); - g_settings_set_enum (nautilus_list_view_preferences, - NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL, - zoom_level); + if (g_settings_get_enum (nautilus_list_view_preferences, + NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL) != zoom_level) { + g_settings_set_enum (nautilus_list_view_preferences, + NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL, + zoom_level); + } } static void -- 2.6.2
participants (1)
-
root@hilbert.suse.de