We should let people test

osx/Meld

@@ -28,9 +28,7 @@ export GTK_EXE_PREFIX="$bundle_res"
 export GTK_PATH="$bundle_res"
 export GSETTINGS_SCHEMA_DIR="$bundle_res"/share/glib-2.0
 
-export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
-export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
-export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
+export GDK_PIXBUF_MODULEDIR="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders"
 export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
 export PANGO_LIBDIR="$bundle_lib"
 export PANGO_SYSCONFDIR="$bundle_etc"

osx/build_app.sh

@@ -18,14 +18,16 @@ MAIN="$APP/"
 RES="$MAIN/Contents/Resources/"
 
 mkdir -p $RES/share/icons
-cp -R ~/gtk/inst/share/icons/Tango $RES/share/icons
-mv $RES/share/icons/Tango $RES/share/icons/Adwaita
+cp -R ~/gtk/inst/share/icons/Adwaita $RES/share/icons
 cp -R data/icons/* $RES/share/icons
 
 # glib schemas
 cp -R ~/gtk/inst/share/glib-2.0/schemas $RES/share/glib-2.0
 cp -R ~/gtk/inst/share/GConf/gsettings $RES/share/GConf
 
+# gdk-pixbuf
+cp -R ~/gtk/inst/lib/gdk-pixbuf-2.0 $RES/lib
+
 # DIRTY HACK FOR NOW
 pushd .
 cd $MAIN/Contents/MacOS
@@ -40,16 +42,14 @@ cp -R ~/gtk/inst/share/themes/Mac/ $RES/share/themes/Mac
 cp -R ~/gtk/inst/share/gtksourceview-3.0 $RES/share
 
 mkdir -p $RES/etc/gtk-3.0
-#mkdir -p $RES/etc/pango
-#mkdir -p $RES/etc/xdg
 cp -R osx/gtkrc $RES/etc/gtk-3.0
 cp -R ~/gtk/inst/share/gtksourceview-3.0 $RES/share
 
-mkdir -p $RES/etc/gtk-3.0
-mkdir -p $RES/etc/pango
-mkdir -p $RES/etc/xdg
-cp -R osx/gtkrc $RES/etc/gtk-3.0
-cp -R osx/pangorc $RES/etc/pango
+# mkdir -p $RES/etc/gtk-3.0
+# mkdir -p $RES/etc/pango
+# mkdir -p $RES/etc/xdg
+# cp -R osx/gtkrc $RES/etc/gtk-3.0
+# cp -R osx/pangorc $RES/etc/pango
 
 mkdir -p $RES/lib
 #cp -R ~/gtk/inst/lib/girepository-1.0 $RES/lib