diff options
| author | Benjamin Otte <otte@redhat.com> | 2016-02-04 13:28:21 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2016-02-04 13:35:21 +0100 |
| commit | d0fd7990c3f2c738f86185418ccd76b14da8a776 (patch) | |
| tree | f2843ea365af01078dcb57751a12d1e03b01ea0f /gtk/Makefile.am | |
| parent | 6bc096d7488309abdfa5f574197543135269cf83 (diff) | |
| download | gtk+-d0fd7990c3f2c738f86185418ccd76b14da8a776.tar.gz | |
cssprovider: Change location of builtin themes
Instead of
/org/gtk/libgtk/theme/$THEME-$VARIANT.css
look at
/org/gtk/libgtk/theme/$THEME/gtk-$VARIANT.css
and that way mirror the directory layout of real themes.
Diffstat (limited to 'gtk/Makefile.am')
| -rw-r--r-- | gtk/Makefile.am | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 2f1099182c..6061a75639 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1213,10 +1213,10 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc echo " <gresource prefix='/org/gtk/libgtk'>" >> $@; \ for f in $(srcdir)/theme/Raleigh/*.css; do \ n=`basename $$f`; \ - echo " <file alias='theme/Raleigh.css'>theme/Raleigh/$$n</file>" >> $@; \ + echo " <file alias='theme/Raleigh/gtk.css'>theme/Raleigh/$$n</file>" >> $@; \ done; \ - echo " <file alias='theme/Adwaita.css'>theme/Adwaita/gtk.css</file>" >> $@; \ - echo " <file alias='theme/Adwaita-dark.css'>theme/Adwaita/gtk-dark.css</file>" >> $@; \ + echo " <file>theme/Adwaita/gtk.css</file>" >> $@; \ + echo " <file>theme/Adwaita/gtk-dark.css</file>" >> $@; \ echo " <file>theme/Adwaita/gtk-contained.css</file>" >> $@; \ echo " <file>theme/Adwaita/gtk-contained-dark.css</file>" >> $@; \ for f in $(srcdir)/theme/Adwaita/assets/*.png; do \ @@ -1227,14 +1227,15 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc n=`basename $$f`; \ echo " <file>theme/Adwaita/assets/$$n</file>" >> $@; \ done; \ - echo " <file alias='theme/HighContrast.css'>theme/HighContrast/gtk.css</file>" >> $@; \ - echo " <file alias='theme/HighContrastInverse.css'>theme/HighContrast/gtk-inverse.css</file>" >> $@; \ + echo " <file>theme/HighContrast/gtk.css</file>" >> $@; \ + echo " <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-inverse.css</file>" >> $@; \ echo " <file>theme/HighContrast/gtk-contained.css</file>" >> $@; \ echo " <file>theme/HighContrast/gtk-contained-inverse.css</file>" >> $@; \ if test "$(win32_theme)" = "yes"; then \ for f in $(srcdir)/theme/win32/*.css; do \ n=`basename $$f`; \ - echo " <file alias='theme/$$n'>theme/win32/$$n</file>" >> $@; \ + m=`echo $$n | cut -b 5-` \ + echo " <file alias='theme/$$m/gtk.css'>theme/win32/$$n</file>" >> $@; \ done; \ fi; \ for f in $(srcdir)/cursor/*.png; do \ |