[gtk-mac-bundler] Bring the Gtk3Demo bundle up to date.

[John Ralls <jralls src gnome org>]

commit 99f96d02301c2058387024b86a727887d6a5f7ea
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jun 18 15:32:27 2015 -0700

    Bring the Gtk3Demo bundle up to date.

 examples/gtk3-demo.bundle |   31 +++++--------------------------
 examples/gtk3-launcher.sh |   10 ++++++----
 2 files changed, 11 insertions(+), 30 deletions(-)
---
diff --git a/examples/gtk3-demo.bundle b/examples/gtk3-demo.bundle
index ba15cd3..13e372a 100644
--- a/examples/gtk3-demo.bundle
+++ b/examples/gtk3-demo.bundle
@@ -73,10 +73,6 @@
     ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
   </binary>
 
-  <data>
-    ${prefix}/etc/pango/
-  </data>
-
   <!-- Translation filenames, one for each program or library that you
        want to copy in to the bundle. The "dest" attribute is
        optional, as usual. Bundler will find all translations of that
@@ -102,6 +98,10 @@
     ${prefix}/share/themes
   </data>
 
+  <data>
+    ${prefix}/share/icons
+  </data>
+
   <!-- Copy icons. Note that the .icns file is an Apple format which
        contains up to 4 sizes of icon. You can use
        /Developer/Applications/Utilities/Icon Composer.app to import
@@ -110,25 +110,4 @@
     ${project}/Giggle.icns
   </data -->
 
-  <!-- This is where theme commands go. You can copy them in from your
-       theme of choice if they provide and example, or you can just
-       change the source path. -->
-
-  <data dest="${bundle}/Contents/Resources/etc/${gtk}/gtkrc">
-    ${project}/gtkrc
-  </data>
-
-  <!-- Icon themes to copy. The "icons" property can be either of
-       "auto", "all", or "none". All or none should be
-       self-explanatory, while auto means that the script will try to
-       figure out which icons are needed. This is done by getting all
-       the strings from all copied binaries, and matching them against
-       icon names. To be safe, you should use "all". "none" is useful
-       if you want just the index.theme file but no icons, mostly
-       needed for the "hicolor" base theme.
-  >
-  <icon-theme icons="auto">
-    Tango
-  </icon-theme -->
-
-</app-bundle>
+  </app-bundle>
diff --git a/examples/gtk3-launcher.sh b/examples/gtk3-launcher.sh
index 4aed833..de9bb10 100755
--- a/examples/gtk3-launcher.sh
+++ b/examples/gtk3-launcher.sh
@@ -29,11 +29,13 @@ export GTK_DATA_PREFIX="$bundle_res"
 export GTK_EXE_PREFIX="$bundle_res"
 export GTK_PATH="$bundle_res"
 
-export GTK2_RC_FILES="$bundle_etc/gtk-3.0/gtkrc"
-export GTK_IM_MODULE_FILE="$bundle_etc/gtk-3.0/gtk.immodules"
-export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-3.0/gdk-pixbuf.loaders"
-export PANGO_LIBDIR="$bundle_lib"
+export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
 export PANGO_SYSCONFDIR="$bundle_etc"
+export PANGO_LIBDIR="$bundle_lib"
+export GDK_PIXBUF_MODULE_FILE="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+if [ `uname -r | cut -d . -f 1` -ge 10 ]; then
+    export GTK_IM_MODULE_FILE="$bundle_etc/gtk-3.0/gtk.immodules"
+fi
 
 
 APP=name