Don't use GTK_RC_FILES, since it causes problems with what KDE (etc.) does

Wed Jul 24 16:43:49 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkrc.c docs/references/tmpl/gtkrc.sgml: Don't use
        GTK_RC_FILES, since it causes problems with what KDE (etc.)
        does to customize GTK+ themes, use GTK2_RC_FILES instead. (#88987)

diff --git a/ChangeLog b/ChangeLog
index b3ddcd3f4f147a314f44260104bbd2e3d997311b..749513010de10df551c57a9cbbc46c6907f28861 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul 24 16:43:49 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkrc.c docs/references/tmpl/gtkrc.sgml: Don't use
+       GTK_RC_FILES, since it causes problems with what KDE (etc.)
+       does to customize GTK+ themes, use GTK2_RC_FILES instead. (#88987)
+ 
 2002-07-16  Federico Mena Quintero  <federico@ximian.com>
 
        * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b3ddcd3f4f147a314f44260104bbd2e3d997311b..749513010de10df551c57a9cbbc46c6907f28861 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Jul 24 16:43:49 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkrc.c docs/references/tmpl/gtkrc.sgml: Don't use
+       GTK_RC_FILES, since it causes problems with what KDE (etc.)
+       does to customize GTK+ themes, use GTK2_RC_FILES instead. (#88987)
+ 
 2002-07-16  Federico Mena Quintero  <federico@ximian.com>
 
        * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b3ddcd3f4f147a314f44260104bbd2e3d997311b..749513010de10df551c57a9cbbc46c6907f28861 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Jul 24 16:43:49 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkrc.c docs/references/tmpl/gtkrc.sgml: Don't use
+       GTK_RC_FILES, since it causes problems with what KDE (etc.)
+       does to customize GTK+ themes, use GTK2_RC_FILES instead. (#88987)
+ 
 2002-07-16  Federico Mena Quintero  <federico@ximian.com>
 
        * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b3ddcd3f4f147a314f44260104bbd2e3d997311b..749513010de10df551c57a9cbbc46c6907f28861 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Jul 24 16:43:49 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkrc.c docs/references/tmpl/gtkrc.sgml: Don't use
+       GTK_RC_FILES, since it causes problems with what KDE (etc.)
+       does to customize GTK+ themes, use GTK2_RC_FILES instead. (#88987)
+ 
 2002-07-16  Federico Mena Quintero  <federico@ximian.com>
 
        * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b3ddcd3f4f147a314f44260104bbd2e3d997311b..749513010de10df551c57a9cbbc46c6907f28861 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Jul 24 16:43:49 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkrc.c docs/references/tmpl/gtkrc.sgml: Don't use
+       GTK_RC_FILES, since it causes problems with what KDE (etc.)
+       does to customize GTK+ themes, use GTK2_RC_FILES instead. (#88987)
+ 
 2002-07-16  Federico Mena Quintero  <federico@ximian.com>
 
        * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b3ddcd3f4f147a314f44260104bbd2e3d997311b..749513010de10df551c57a9cbbc46c6907f28861 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Jul 24 16:43:49 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkrc.c docs/references/tmpl/gtkrc.sgml: Don't use
+       GTK_RC_FILES, since it causes problems with what KDE (etc.)
+       does to customize GTK+ themes, use GTK2_RC_FILES instead. (#88987)
+ 
 2002-07-16  Federico Mena Quintero  <federico@ximian.com>
 
        * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.

diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 7125ed739fa713ef876f9feb8709af55aa20d5c7..d563bbaf7538ae04715c3cdeb670388816560d97 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -29,7 +29,7 @@ The set of these <firstterm>default</firstterm> files
 can be retrieved with gtk_rc_get_default_files()
 and modified with gtk_rc_add_default_file() and
 gtk_rc_set_default_files().
-Additionally, the <envar>GTK_RC_FILES</envar> environment variable
+Additionally, the <envar>GTK2_RC_FILES</envar> environment variable
 can be set to a #G_SEARCHPATH_SEPARATOR_S-separated list of files
 in order to overwrite the set of default files at runtime.
 </para>

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index bc89470a4b86b0f4bd298fc44ea7b7c71bb01cdb..5fd9fc88faceac8bb67b6b4b3addb45e9c8a2992 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -406,7 +406,7 @@ gtk_rc_add_initial_default_files (void)
   gtk_rc_default_files[0] = NULL;
   init = TRUE;
 
-  var = g_getenv ("GTK_RC_FILES");
+  var = g_getenv ("GTK2_RC_FILES");
   if (var)
     {
       files = g_strsplit (var, G_SEARCHPATH_SEPARATOR_S, 128);