Hello community,

here is the log from the commit of package nautilus for openSUSE:Factory 
checked in at 2016-06-07 23:45:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05-05 
12:10:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.nautilus.new/nautilus.changes   2016-06-07 
23:45:06.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Jun  3 18:02:41 UTC 2016 - [email protected]
+
+- Add nautilus-adjust-style-priority.patch: Fix white desktop after
+  changing themes: 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 (bsc#982633, bgo#765687).
+
+-------------------------------------------------------------------

New:
----
  nautilus-adjust-style-priority.patch

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

Other differences:
------------------
++++++ nautilus.spec ++++++
--- /var/tmp/diff_new_pack.t1znlr/_old  2016-06-07 23:45:07.000000000 +0200
+++ /var/tmp/diff_new_pack.t1znlr/_new  2016-06-07 23:45:07.000000000 +0200
@@ -26,6 +26,8 @@
 # fate#308344 bgo#602147
 Source1:        mount-archive.desktop
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM nautilus-adjust-style-priority.patch bsc#982633 
bgo#765687 [email protected] -- Fix white desktop after changing themes
+Patch0:         nautilus-adjust-style-priority.patch
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # needed for directory ownership
@@ -108,6 +110,7 @@
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 translation-update-upstream
 
 %build

++++++ nautilus-adjust-style-priority.patch ++++++
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),
-                                                          
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
        }
        else if (provider != NULL)
        {

Reply via email to