[arch-commits] Commit in nemo/repos (12 files)

Balló György bgyorgy at archlinux.org
Sat Nov 22 21:03:01 UTC 2014


    Date: Saturday, November 22, 2014 @ 22:03:01
  Author: bgyorgy
Revision: 122957

archrelease: copy trunk to community-i686, community-x86_64

Added:
  nemo/repos/community-i686/PKGBUILD
    (from rev 122956, nemo/trunk/PKGBUILD)
  nemo/repos/community-i686/desktop-theme.patch
    (from rev 122956, nemo/trunk/desktop-theme.patch)
  nemo/repos/community-i686/nemo.install
    (from rev 122956, nemo/trunk/nemo.install)
  nemo/repos/community-x86_64/PKGBUILD
    (from rev 122956, nemo/trunk/PKGBUILD)
  nemo/repos/community-x86_64/desktop-theme.patch
    (from rev 122956, nemo/trunk/desktop-theme.patch)
  nemo/repos/community-x86_64/nemo.install
    (from rev 122956, nemo/trunk/nemo.install)
Deleted:
  nemo/repos/community-i686/PKGBUILD
  nemo/repos/community-i686/desktop-theme.patch
  nemo/repos/community-i686/nemo.install
  nemo/repos/community-x86_64/PKGBUILD
  nemo/repos/community-x86_64/desktop-theme.patch
  nemo/repos/community-x86_64/nemo.install

--------------------------------------+
 /PKGBUILD                            |  110 +++++++++++++
 /desktop-theme.patch                 |  262 +++++++++++++++++++++++++++++++++
 /nemo.install                        |   28 +++
 community-i686/PKGBUILD              |   56 -------
 community-i686/desktop-theme.patch   |   36 ----
 community-i686/nemo.install          |   14 -
 community-x86_64/PKGBUILD            |   56 -------
 community-x86_64/desktop-theme.patch |   36 ----
 community-x86_64/nemo.install        |   14 -
 9 files changed, 400 insertions(+), 212 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-11-22 21:02:47 UTC (rev 122956)
+++ community-i686/PKGBUILD	2014-11-22 21:03:01 UTC (rev 122957)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Contributor: Ner0
-
-pkgname=nemo
-pkgver=2.4.2
-pkgrel=1
-pkgdesc="Cinnamon file manager (Nautilus fork)"
-arch=('i686' 'x86_64')
-url="https://github.com/linuxmint/nemo"
-license=('GPL')
-depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
-         'cinnamon-desktop' 'libnotify' 'libxml2' 'cinnamon-translations')
-makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common' 'python2-gobject' 'python2-polib')
-options=('!emptydirs')
-install=nemo.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
-        "desktop-theme.patch")
-sha256sums=('144767d79c4c268db13e1e51c09238ee468c2ffc53397c0e271e88b3264d9b63'
-            'cb5a1e6f27d1e5901faf90a21c0ff199080c0c0d7912dbaa461b01dd6b521f51')
-
-prepare() {
-  cd linuxmint-nemo-*
-  
-
-  # Python2 fix
-  find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
-  # Add better style for the desktop with GNOME 3.14
-  #patch -Np1 -i ../desktop-theme.patch
-
-  # Fix build
-  sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
-
-  # Rename 'Files' app name to avoid having the same as nautilus
-  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
-}
-
-build() {
-  cd linuxmint-nemo-*
-
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/nemo \
-      --disable-update-mimedb \
-      --disable-tracker \
-      --disable-gtk-doc-html \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd linuxmint-nemo-*
-
-  make DESTDIR="$pkgdir/" install
-}

Copied: nemo/repos/community-i686/PKGBUILD (from rev 122956, nemo/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-11-22 21:03:01 UTC (rev 122957)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Contributor: Ner0
+
+pkgname=nemo
+pkgver=2.4.3
+pkgrel=1
+pkgdesc="Cinnamon file manager (Nautilus fork)"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxmint/nemo"
+license=('GPL')
+depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
+         'cinnamon-desktop' 'libnotify' 'libxml2' 'cinnamon-translations')
+makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common' 'python2-gobject' 'python2-polib')
+options=('!emptydirs')
+install=nemo.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
+        "desktop-theme.patch")
+sha256sums=('c3a0537d5c45fcf0cb3863caeb92f48cafa9076f3130c43735c7eb4a2e8cded7'
+            'SKIP')
+
+prepare() {
+  cd linuxmint-nemo-*
+
+  # Python2 fix
+  find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
+  # Add application-specific theme for Adwaita
+  patch -Np1 -i ../desktop-theme.patch
+
+  # Fix build
+  sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
+
+  # Rename 'Files' app name to avoid having the same as nautilus
+  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
+}
+
+build() {
+  cd linuxmint-nemo-*
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/nemo \
+      --disable-update-mimedb \
+      --disable-tracker \
+      --disable-gtk-doc-html \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd linuxmint-nemo-*
+
+  make DESTDIR="$pkgdir/" install
+}

Deleted: community-i686/desktop-theme.patch
===================================================================
--- community-i686/desktop-theme.patch	2014-11-22 21:02:47 UTC (rev 122956)
+++ community-i686/desktop-theme.patch	2014-11-22 21:03:01 UTC (rev 122957)
@@ -1,36 +0,0 @@
-diff -Naur linuxmint-nemo-0f4f990.orig/src/nemo-style-application.css linuxmint-nemo-0f4f990/src/nemo-style-application.css
---- linuxmint-nemo-0f4f990.orig/src/nemo-style-application.css	2014-10-01 04:38:14.441980888 +0000
-+++ linuxmint-nemo-0f4f990/src/nemo-style-application.css	2014-10-01 16:24:15.092157366 +0000
-@@ -6,3 +6,32 @@
- .nemo-big-arrow {
-     -GtkArrow-arrow-scaling: 1.0;
- }
-+
-+/* For desktop */
-+
-+.nemo-canvas-item {
-+    border-radius: 5px;
-+}
-+
-+.nemo-desktop.nemo-canvas-item {
-+    color: @theme_selected_fg_color;
-+    text-shadow: 1px 1px black;
-+}
-+
-+.nemo-desktop.nemo-canvas-item:active {
-+    color: @theme_text_color;
-+}
-+
-+.nemo-desktop.nemo-canvas-item:selected {
-+    color: @theme_selected_fg_color;
-+}
-+
-+.nemo-desktop.nemo-canvas-item:active,
-+.nemo-desktop.nemo-canvas-item:prelight,
-+.nemo-desktop.nemo-canvas-item:selected {
-+    text-shadow: none;
-+}
-+
-+.nemo-desktop.nemo-canvas-item:selected:backdrop {
-+    color: @theme_unfocused_selected_fg_color;
-+}

Copied: nemo/repos/community-i686/desktop-theme.patch (from rev 122956, nemo/trunk/desktop-theme.patch)
===================================================================
--- community-i686/desktop-theme.patch	                        (rev 0)
+++ community-i686/desktop-theme.patch	2014-11-22 21:03:01 UTC (rev 122957)
@@ -0,0 +1,131 @@
+From 64ad6c0a96b46a9d86d9a8babac1298c18d5fc1f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Sat, 22 Nov 2014 21:23:25 +0100
+Subject: [PATCH] Add application-specific theme for Adwaita
+
+Based on this patch for Nautilus:
+https://git.gnome.org/browse/nautilus/commit/?id=3fd7e847d531fbbfc4ebba24864bdd0f8b81c750
+---
+ src/Adwaita.css        | 26 +++++++++++++++++++++++++
+ src/nemo-application.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/nemo.gresource.xml |  1 +
+ 3 files changed, 79 insertions(+)
+ create mode 100644 src/Adwaita.css
+
+diff --git a/src/Adwaita.css b/src/Adwaita.css
+new file mode 100644
+index 0000000..d8b1f0c
+--- /dev/null
++++ b/src/Adwaita.css
+@@ -0,0 +1,26 @@
++.nemo-canvas-item {
++    border-radius: 5px;
++}
++
++.nemo-desktop.nemo-canvas-item {
++    color: @theme_selected_fg_color;
++    text-shadow: 1px 1px black;
++}
++
++.nemo-desktop.nemo-canvas-item:active {
++    color: @theme_text_color;
++}
++
++.nemo-desktop.nemo-canvas-item:selected {
++    color: @theme_selected_fg_color;
++}
++
++.nemo-desktop.nemo-canvas-item:active,
++.nemo-desktop.nemo-canvas-item:prelight,
++.nemo-desktop.nemo-canvas-item:selected {
++    text-shadow: none;
++}
++
++.nemo-desktop.nemo-canvas-item:selected:backdrop {
++    color: @theme_unfocused_selected_fg_color;
++}
+diff --git a/src/nemo-application.c b/src/nemo-application.c
+index b3e8945..e5dd014 100644
+--- a/src/nemo-application.c
++++ b/src/nemo-application.c
+@@ -1041,6 +1041,56 @@ out_a:
+ }
+ 
+ static void
++theme_changed (GtkSettings *settings)
++{
++	static GtkCssProvider *adwaita_provider = NULL;
++	gchar *theme;
++	GdkScreen *screen;
++
++	g_object_get (settings, "gtk-theme-name", &theme, NULL);
++	screen = gdk_screen_get_default ();
++
++	if (g_str_equal (theme, "Adwaita"))
++	{
++		if (adwaita_provider == NULL)
++		{
++			GFile *file;
++
++			adwaita_provider = gtk_css_provider_new ();
++			file = g_file_new_for_uri ("resource:///org/nemo/Adwaita.css");
++			gtk_css_provider_load_from_file (adwaita_provider, file, NULL);
++			g_object_unref (file);
++		}
++
++		gtk_style_context_add_provider_for_screen (screen,
++							   GTK_STYLE_PROVIDER (adwaita_provider),
++							   GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
++	}
++	else if (adwaita_provider != NULL)
++	{
++		gtk_style_context_remove_provider_for_screen (screen,
++							      GTK_STYLE_PROVIDER (adwaita_provider));
++		g_clear_object (&adwaita_provider);
++	}
++
++	g_free (theme);
++}
++
++static void
++setup_theme_extensions (void)
++{
++	GtkSettings *settings;
++
++	/* Set up a handler to load our custom css for Adwaita.
++	 * See https://bugzilla.gnome.org/show_bug.cgi?id=732959
++	 * for a more automatic solution that is still under discussion.
++	 */
++	settings = gtk_settings_get_default ();
++	g_signal_connect (settings, "notify::gtk-theme-name", G_CALLBACK (theme_changed), NULL);
++	theme_changed (settings);
++}
++
++static void
+ init_icons_and_styles (void)
+ {
+ 	/* initialize search path for custom icons */
+@@ -1052,6 +1102,8 @@ init_icons_and_styles (void)
+                             NEMO_STATUSBAR_ICON_SIZE);
+ 
+     nemo_application_add_app_css_provider ();
++
++    setup_theme_extensions ();
+ }
+ 
+ static void
+diff --git a/src/nemo.gresource.xml b/src/nemo.gresource.xml
+index 8bb2bd3..6e6029d 100644
+--- a/src/nemo.gresource.xml
++++ b/src/nemo.gresource.xml
+@@ -11,6 +11,7 @@
+     <file>nemo-statusbar-ui.xml</file>
+     <file alias="icons/thumbnail_frame.png">../icons/thumbnail_frame.png</file>
+     <file alias="icons/knob.png">../icons/knob.png</file>
++    <file>Adwaita.css</file>
+     <file>nemo-style-fallback.css</file>
+   </gresource>
+ </gresources>
+-- 
+2.1.3
+

Deleted: community-i686/nemo.install
===================================================================
--- community-i686/nemo.install	2014-11-22 21:02:47 UTC (rev 122956)
+++ community-i686/nemo.install	2014-11-22 21:03:01 UTC (rev 122957)
@@ -1,14 +0,0 @@
-post_install() {
-  glib-compile-schemas --allow-any-name usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -ftq usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-post_remove() {
-  post_install "$1"
-}

Copied: nemo/repos/community-i686/nemo.install (from rev 122956, nemo/trunk/nemo.install)
===================================================================
--- community-i686/nemo.install	                        (rev 0)
+++ community-i686/nemo.install	2014-11-22 21:03:01 UTC (rev 122957)
@@ -0,0 +1,14 @@
+post_install() {
+  glib-compile-schemas --allow-any-name usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+  update-mime-database usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+post_remove() {
+  post_install "$1"
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-11-22 21:02:47 UTC (rev 122956)
+++ community-x86_64/PKGBUILD	2014-11-22 21:03:01 UTC (rev 122957)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Contributor: Ner0
-
-pkgname=nemo
-pkgver=2.4.2
-pkgrel=1
-pkgdesc="Cinnamon file manager (Nautilus fork)"
-arch=('i686' 'x86_64')
-url="https://github.com/linuxmint/nemo"
-license=('GPL')
-depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
-         'cinnamon-desktop' 'libnotify' 'libxml2' 'cinnamon-translations')
-makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common' 'python2-gobject' 'python2-polib')
-options=('!emptydirs')
-install=nemo.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
-        "desktop-theme.patch")
-sha256sums=('144767d79c4c268db13e1e51c09238ee468c2ffc53397c0e271e88b3264d9b63'
-            'cb5a1e6f27d1e5901faf90a21c0ff199080c0c0d7912dbaa461b01dd6b521f51')
-
-prepare() {
-  cd linuxmint-nemo-*
-  
-
-  # Python2 fix
-  find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
-  # Add better style for the desktop with GNOME 3.14
-  #patch -Np1 -i ../desktop-theme.patch
-
-  # Fix build
-  sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
-
-  # Rename 'Files' app name to avoid having the same as nautilus
-  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
-}
-
-build() {
-  cd linuxmint-nemo-*
-
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/nemo \
-      --disable-update-mimedb \
-      --disable-tracker \
-      --disable-gtk-doc-html \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd linuxmint-nemo-*
-
-  make DESTDIR="$pkgdir/" install
-}

Copied: nemo/repos/community-x86_64/PKGBUILD (from rev 122956, nemo/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-11-22 21:03:01 UTC (rev 122957)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Contributor: Ner0
+
+pkgname=nemo
+pkgver=2.4.3
+pkgrel=1
+pkgdesc="Cinnamon file manager (Nautilus fork)"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxmint/nemo"
+license=('GPL')
+depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
+         'cinnamon-desktop' 'libnotify' 'libxml2' 'cinnamon-translations')
+makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common' 'python2-gobject' 'python2-polib')
+options=('!emptydirs')
+install=nemo.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
+        "desktop-theme.patch")
+sha256sums=('c3a0537d5c45fcf0cb3863caeb92f48cafa9076f3130c43735c7eb4a2e8cded7'
+            'SKIP')
+
+prepare() {
+  cd linuxmint-nemo-*
+
+  # Python2 fix
+  find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
+  # Add application-specific theme for Adwaita
+  patch -Np1 -i ../desktop-theme.patch
+
+  # Fix build
+  sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
+
+  # Rename 'Files' app name to avoid having the same as nautilus
+  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
+}
+
+build() {
+  cd linuxmint-nemo-*
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/nemo \
+      --disable-update-mimedb \
+      --disable-tracker \
+      --disable-gtk-doc-html \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd linuxmint-nemo-*
+
+  make DESTDIR="$pkgdir/" install
+}

Deleted: community-x86_64/desktop-theme.patch
===================================================================
--- community-x86_64/desktop-theme.patch	2014-11-22 21:02:47 UTC (rev 122956)
+++ community-x86_64/desktop-theme.patch	2014-11-22 21:03:01 UTC (rev 122957)
@@ -1,36 +0,0 @@
-diff -Naur linuxmint-nemo-0f4f990.orig/src/nemo-style-application.css linuxmint-nemo-0f4f990/src/nemo-style-application.css
---- linuxmint-nemo-0f4f990.orig/src/nemo-style-application.css	2014-10-01 04:38:14.441980888 +0000
-+++ linuxmint-nemo-0f4f990/src/nemo-style-application.css	2014-10-01 16:24:15.092157366 +0000
-@@ -6,3 +6,32 @@
- .nemo-big-arrow {
-     -GtkArrow-arrow-scaling: 1.0;
- }
-+
-+/* For desktop */
-+
-+.nemo-canvas-item {
-+    border-radius: 5px;
-+}
-+
-+.nemo-desktop.nemo-canvas-item {
-+    color: @theme_selected_fg_color;
-+    text-shadow: 1px 1px black;
-+}
-+
-+.nemo-desktop.nemo-canvas-item:active {
-+    color: @theme_text_color;
-+}
-+
-+.nemo-desktop.nemo-canvas-item:selected {
-+    color: @theme_selected_fg_color;
-+}
-+
-+.nemo-desktop.nemo-canvas-item:active,
-+.nemo-desktop.nemo-canvas-item:prelight,
-+.nemo-desktop.nemo-canvas-item:selected {
-+    text-shadow: none;
-+}
-+
-+.nemo-desktop.nemo-canvas-item:selected:backdrop {
-+    color: @theme_unfocused_selected_fg_color;
-+}

Copied: nemo/repos/community-x86_64/desktop-theme.patch (from rev 122956, nemo/trunk/desktop-theme.patch)
===================================================================
--- community-x86_64/desktop-theme.patch	                        (rev 0)
+++ community-x86_64/desktop-theme.patch	2014-11-22 21:03:01 UTC (rev 122957)
@@ -0,0 +1,131 @@
+From 64ad6c0a96b46a9d86d9a8babac1298c18d5fc1f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Sat, 22 Nov 2014 21:23:25 +0100
+Subject: [PATCH] Add application-specific theme for Adwaita
+
+Based on this patch for Nautilus:
+https://git.gnome.org/browse/nautilus/commit/?id=3fd7e847d531fbbfc4ebba24864bdd0f8b81c750
+---
+ src/Adwaita.css        | 26 +++++++++++++++++++++++++
+ src/nemo-application.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/nemo.gresource.xml |  1 +
+ 3 files changed, 79 insertions(+)
+ create mode 100644 src/Adwaita.css
+
+diff --git a/src/Adwaita.css b/src/Adwaita.css
+new file mode 100644
+index 0000000..d8b1f0c
+--- /dev/null
++++ b/src/Adwaita.css
+@@ -0,0 +1,26 @@
++.nemo-canvas-item {
++    border-radius: 5px;
++}
++
++.nemo-desktop.nemo-canvas-item {
++    color: @theme_selected_fg_color;
++    text-shadow: 1px 1px black;
++}
++
++.nemo-desktop.nemo-canvas-item:active {
++    color: @theme_text_color;
++}
++
++.nemo-desktop.nemo-canvas-item:selected {
++    color: @theme_selected_fg_color;
++}
++
++.nemo-desktop.nemo-canvas-item:active,
++.nemo-desktop.nemo-canvas-item:prelight,
++.nemo-desktop.nemo-canvas-item:selected {
++    text-shadow: none;
++}
++
++.nemo-desktop.nemo-canvas-item:selected:backdrop {
++    color: @theme_unfocused_selected_fg_color;
++}
+diff --git a/src/nemo-application.c b/src/nemo-application.c
+index b3e8945..e5dd014 100644
+--- a/src/nemo-application.c
++++ b/src/nemo-application.c
+@@ -1041,6 +1041,56 @@ out_a:
+ }
+ 
+ static void
++theme_changed (GtkSettings *settings)
++{
++	static GtkCssProvider *adwaita_provider = NULL;
++	gchar *theme;
++	GdkScreen *screen;
++
++	g_object_get (settings, "gtk-theme-name", &theme, NULL);
++	screen = gdk_screen_get_default ();
++
++	if (g_str_equal (theme, "Adwaita"))
++	{
++		if (adwaita_provider == NULL)
++		{
++			GFile *file;
++
++			adwaita_provider = gtk_css_provider_new ();
++			file = g_file_new_for_uri ("resource:///org/nemo/Adwaita.css");
++			gtk_css_provider_load_from_file (adwaita_provider, file, NULL);
++			g_object_unref (file);
++		}
++
++		gtk_style_context_add_provider_for_screen (screen,
++							   GTK_STYLE_PROVIDER (adwaita_provider),
++							   GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
++	}
++	else if (adwaita_provider != NULL)
++	{
++		gtk_style_context_remove_provider_for_screen (screen,
++							      GTK_STYLE_PROVIDER (adwaita_provider));
++		g_clear_object (&adwaita_provider);
++	}
++
++	g_free (theme);
++}
++
++static void
++setup_theme_extensions (void)
++{
++	GtkSettings *settings;
++
++	/* Set up a handler to load our custom css for Adwaita.
++	 * See https://bugzilla.gnome.org/show_bug.cgi?id=732959
++	 * for a more automatic solution that is still under discussion.
++	 */
++	settings = gtk_settings_get_default ();
++	g_signal_connect (settings, "notify::gtk-theme-name", G_CALLBACK (theme_changed), NULL);
++	theme_changed (settings);
++}
++
++static void
+ init_icons_and_styles (void)
+ {
+ 	/* initialize search path for custom icons */
+@@ -1052,6 +1102,8 @@ init_icons_and_styles (void)
+                             NEMO_STATUSBAR_ICON_SIZE);
+ 
+     nemo_application_add_app_css_provider ();
++
++    setup_theme_extensions ();
+ }
+ 
+ static void
+diff --git a/src/nemo.gresource.xml b/src/nemo.gresource.xml
+index 8bb2bd3..6e6029d 100644
+--- a/src/nemo.gresource.xml
++++ b/src/nemo.gresource.xml
+@@ -11,6 +11,7 @@
+     <file>nemo-statusbar-ui.xml</file>
+     <file alias="icons/thumbnail_frame.png">../icons/thumbnail_frame.png</file>
+     <file alias="icons/knob.png">../icons/knob.png</file>
++    <file>Adwaita.css</file>
+     <file>nemo-style-fallback.css</file>
+   </gresource>
+ </gresources>
+-- 
+2.1.3
+

Deleted: community-x86_64/nemo.install
===================================================================
--- community-x86_64/nemo.install	2014-11-22 21:02:47 UTC (rev 122956)
+++ community-x86_64/nemo.install	2014-11-22 21:03:01 UTC (rev 122957)
@@ -1,14 +0,0 @@
-post_install() {
-  glib-compile-schemas --allow-any-name usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -ftq usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-post_remove() {
-  post_install "$1"
-}

Copied: nemo/repos/community-x86_64/nemo.install (from rev 122956, nemo/trunk/nemo.install)
===================================================================
--- community-x86_64/nemo.install	                        (rev 0)
+++ community-x86_64/nemo.install	2014-11-22 21:03:01 UTC (rev 122957)
@@ -0,0 +1,14 @@
+post_install() {
+  glib-compile-schemas --allow-any-name usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+  update-mime-database usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+post_remove() {
+  post_install "$1"
+}


More information about the arch-commits mailing list