[gtk-osx] Fix the patch that introduced the enchant xdg bug.

[John Ralls <jralls src gnome org>]

commit 56d976689078c9b6e903fde25744957f55fa65b6
Author: John Ralls <jralls ceridwen us>
Date:   Sun May 31 11:07:13 2015 -0700

    Fix the patch that introduced the enchant xdg bug.
    
    Instead of using a second patch.

 modulesets-stable/gtk-osx-unsupported.modules |    1 -
 patches/enchant-env.patch                     |    4 ++--
 patches/enchant-xdg-path.patch                |   17 -----------------
 3 files changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index f6b3496..2ab7671 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -174,7 +174,6 @@
            repo="abisource/enchant">
  <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-gsize.patch"; strip="1"/>
  <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-env.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-xdg-path.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>
diff --git a/patches/enchant-env.patch b/patches/enchant-env.patch
index 71e4625..9ee6bbe 100644
--- a/patches/enchant-env.patch
+++ b/patches/enchant-env.patch
@@ -30,9 +30,9 @@ index 79fb21c..6f57fff 100644
 +      if (xdg_data_dir)
 +              {
 +                      char **xdg_ddirs = g_strsplit (xdg_data_dir, ":", 0);
-+                      char *xdg_iter;
++                      char **xdg_iter;
 +
-+                      for (xdg_iter = xdg_ddirs; xdg_iter != NULL; xdg_iter++)
++                      for (xdg_iter = xdg_ddirs; *xdg_iter != NULL; xdg_iter++)
 +                              {
 +                                      conf_dirs = enchant_slist_append_unique_path (conf_dirs, 
g_strdup(*xdg_iter));
 +                              }