From: Joshua Pettus <jshpettus@gmail.com>
Date: Fri, 24 Oct 2014 07:04:22 +0000 (-0700)
Subject: removed gtk theme from OSX app
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=102e3f59c30311771d3fa54988a86ba0baccb315;p=xboard.git

removed gtk theme from OSX app
---

diff --git a/Makefile.am b/Makefile.am
index 29ccf9a..61bf260 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -248,7 +248,6 @@ osxapp: all-recursive install install-recursive
 	$(MKDIR_P) $(datarootdir)/lib
 	$(MKDIR_P) $(sysconfdir)/gtk-2.0
 	$(MKDIR_P) $(sysconfdir)/pango
-	$(MKDIR_P) $(datadir)/gtk-engines
 	$(MKDIR_P) $(datadir)/themes
 	$(MKDIR_P) $(gamedatadir)/themes
 	$(INSTALL) ./osxapp/Info.plist $(prefix)
@@ -301,8 +300,6 @@ osxapp: all-recursive install install-recursive
 	$(INSTALL) ./osxapp/pango.modules $(sysconfdir)/pango/pangorc
 	cp -R /opt/local/lib/gtk-2.0 $(datarootdir)/lib
 	cp -R /opt/local/lib/gdk-pixbuf-2.0 $(datarootdir)/lib
-	$(INSTALL) /opt/local/share/gtk-engines/murrine.xml $(datadir)/gtk-engines
-	cp -R ./osxapp/OSX-theme $(datadir)/themes
 	cp -R /opt/local/share/themes/Mac $(datadir)/themes
 	cp -R ./osxapp/default/. $(gamedatadir)/themes/default
 	$(INSTALL) ./png/marble_d.png $(gamedatadir)/themes/textures
@@ -315,7 +312,6 @@ osxapp: all-recursive install install-recursive
 	dylibbundler -of -b -x $(datarootdir)/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
 	dylibbundler -of -b -x $(datarootdir)/lib/gtk-2.0/2.10.0/immodules/im-quartz.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
 	dylibbundler -of -b -x $(datarootdir)/lib/gtk-2.0/2.10.0/engines/libpixmap.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
-	dylibbundler -of -b -x $(datarootdir)/lib/gtk-2.0/2.10.0/engines/libmurrine.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
 	find ./XBoard.app -name '*.a' -print0 | xargs -0 rm
 	rm -r $(datarootdir)/lib/gtk-2.0/include
 	rm -r $(datarootdir)/share/applications
diff --git a/osxapp/gtkrc b/osxapp/gtkrc
index 72d8a1f..16ab71e 100644
--- a/osxapp/gtkrc
+++ b/osxapp/gtkrc
@@ -1,8 +1,3 @@
-# Include OSX-theme path to fix plugins not applying theme'
-include "../../share/themes/OSX-theme/gtk-2.0/gtkrc"
-# Set default theme to OSX-theme
-gtk-theme-name = "OSX-theme"
-
 # Include Mac path to fix plugins not applying key-bindings
 include "../../share/themes/Mac/gtk-2.0-key/gtkrc"
 # Set default key-bindings to Mac