[glade] * gladeui/glade-app.h: Make Glade 3.10 use new environment variables for proper parallel installab

[Tristan Van Berkom <tvb src gnome org>]

commit 7bb00e515f99661b9db8ee3d0e7098c9553854f9
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Tue Oct 11 15:49:28 2011 -0400

    	* gladeui/glade-app.h: Make Glade 3.10 use new environment variables for proper
    	parallel installability.
    
    	* doc/catalogintro.sgml: Update docs about environment vars.

 ChangeLog             |    7 +++++++
 doc/catalogintro.sgml |    4 ++--
 gladeui/glade-app.h   |    4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f917fd4..e7bc343 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-09  Tristan Van Berkom <tvb gnome org>
+
+	* gladeui/glade-app.h: Make Glade 3.10 use new environment variables for proper
+	parallel installability.
+
+	* doc/catalogintro.sgml: Update docs about environment vars.
+
 2011-10-11  Benjamin Otte <otte redhat com>
 
 	* gladeui/glade-editor-property.c:
diff --git a/doc/catalogintro.sgml b/doc/catalogintro.sgml
index 611de8e..7cf9197 100644
--- a/doc/catalogintro.sgml
+++ b/doc/catalogintro.sgml
@@ -202,12 +202,12 @@ this is described in the next chapter.
     <para>
 You can also load your catalog from a user directory by specifying
 additional load path(s) in the environment, for instance:
-      <programlisting>GLADE_CATALOG_PATH=~/mycatalogs:~/work/foo/glade</programlisting>
+      <programlisting>GLADE_CATALOG_SEARCH_PATH=~/mycatalogs:~/work/foo/glade</programlisting>
     </para>
 
     <para>
 Same goes for optional plugin libraries, for instance:
-      <programlisting>GLADE_MODULE_PATH=~/work/foo/src</programlisting>
+      <programlisting>GLADE_MODULE_SEARCH_PATH=~/work/foo/src</programlisting>
     </para>
 
     <para>
diff --git a/gladeui/glade-app.h b/gladeui/glade-app.h
index 9a93677..8e2f94a 100644
--- a/gladeui/glade-app.h
+++ b/gladeui/glade-app.h
@@ -36,8 +36,8 @@ G_BEGIN_DECLS
 #define GLADE_IS_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_APP))
 #define GLADE_APP_GET_CLASS(o)    (G_TYPE_INSTANCE_GET_CLASS ((o), GLADE_APP, GladeAppClass))
 
-#define GLADE_ENV_CATALOG_PATH    "GLADE_CATALOG_PATH"
-#define GLADE_ENV_MODULE_PATH     "GLADE_MODULE_PATH"
+#define GLADE_ENV_CATALOG_PATH    "GLADE_CATALOG_SEARCH_PATH"
+#define GLADE_ENV_MODULE_PATH     "GLADE_MODULE_SEARCH_PATH"
 
 typedef struct _GladeApp         GladeApp;
 typedef struct _GladeAppPrivate  GladeAppPrivate;