diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2011-10-11 15:49:28 -0400 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2011-10-11 15:49:46 -0400 |
| commit | 7bb00e515f99661b9db8ee3d0e7098c9553854f9 (patch) | |
| tree | c7910f5c0abb72af65a0ea264df18da6061cad10 | |
| parent | 881f163a952891af7ed1ff9128fe596e8d13d4f9 (diff) | |
| download | glade-7bb00e515f99661b9db8ee3d0e7098c9553854f9.tar.gz | |
* gladeui/glade-app.h: Make Glade 3.10 use new environment variables for proper
parallel installability.
* doc/catalogintro.sgml: Update docs about environment vars.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | doc/catalogintro.sgml | 4 | ||||
| -rw-r--r-- | gladeui/glade-app.h | 4 |
3 files changed, 11 insertions, 4 deletions
@@ -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 611de8ea..7cf91973 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 9a936778..8e2f94a2 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; |