pool/nautilus
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 399960 from home:qzhao:branches:GNOME:Factory

Browse Source 
Adjust nautilus css style priority.(bgo#765687)

OBS-URL: https://build.opensuse.org/request/show/399960
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=244
This commit is contained in:
Dominique Leuenberger 2016-06-03 10:52:08 +00:00 committed by Git OBS Bridge
parent 02077d8268
commit dc3629c0e2
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nautilus-adjust-style-priority.patch Normal file
View File

@ -0,0 +1,25 @@
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)
{

8
nautilus.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jun 3 18:02:41 UTC 2016 - qzhao@suse.com
- Porting upstream code in nautilus-adjust-style-priority.patch to
fix (bsc#982633) and (bgo#765687).
+ 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.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 28 13:16:42 UTC 2016 - zaitor@opensuse.org Thu Apr 28 13:16:42 UTC 2016 - zaitor@opensuse.org

7
nautilus.spec
View File

@ -26,6 +26,12 @@ Source: http://download.gnome.org/sources/nautilus/3.20/%{name}-%{versio
# fate#308344 bgo#602147 # fate#308344 bgo#602147
Source1: mount-archive.desktop Source1: mount-archive.desktop
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-OPENSUSE nautilus-adjust-style-priority.patch qzhao@suse.com
# Porting upstream code in (bgo#765687) to fix (bsc#982633).
# 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.
Patch0: nautilus-adjust-style-priority.patch
Url: http://www.gnome.org Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# needed for directory ownership # needed for directory ownership
@ -108,6 +114,7 @@ This package contains development files for nautilus.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%patch0 -p1
translation-update-upstream translation-update-upstream
%build %build