parse the users gtkrc as found in ~/.gimp-1.1 after the systemwide gtkrc

2000-11-03  Sven Neumann  <sven@gimp.org>

        * app/app_procs.c (app_init): parse the users gtkrc as found in
        ~/.gimp-1.1 after the systemwide gtkrc has been parsed.

        * user_install.bat: reverted Tor's change since we use the file
        again now.

ChangeLog

@@ -1,3 +1,11 @@
+2000-11-03  Sven Neumann  <sven@gimp.org>
+
+	* app/app_procs.c (app_init): parse the users gtkrc as found in
+	~/.gimp-1.1 after the systemwide gtkrc has been parsed.
+
+	* user_install.bat: reverted Tor's change since we use the file
+	again now.
+	
 2000-11-03  David Monniaux  <monniaux@quatramaran.ens.fr>
 
 	* autogen.sh: some regexps used to parse the output of

app/app_procs.c

@@ -483,6 +483,7 @@ app_init (void)
   gchar *filename;
   gchar *path;
 
+  /*  parse the systemwide gtkrc  */
   filename = gimp_gtkrc ();
 
   if (be_verbose)
@@ -490,6 +491,14 @@ app_init (void)
 
   gtk_rc_parse (filename);
 
+  /*  parse the user gtkrc  */
+  filename = gimp_personal_rc_file ("gtkrc");
+
+  if (be_verbose)
+    g_print (_("parsing \"%s\"\n"), filename);
+
+  gtk_rc_parse (filename);
+
   if (parse_buffers_init ())
     {
       parse_unitrc ();   /*  this needs to be done before gimprc loading  */

data/misc/user_install.bat

@@ -3,6 +3,7 @@
 mkdir %2
 copy %3\gimprc_user %2\gimprc
 copy %3\unitrc %2\unitrc
+copy %3\gtkrc_user %2\gtkrc
 mkdir %2\brushes
 mkdir %2\generated_brushes
 mkdir %2\gradients

user_install.bat

@@ -3,6 +3,7 @@
 mkdir %2
 copy %3\gimprc_user %2\gimprc
 copy %3\unitrc %2\unitrc
+copy %3\gtkrc_user %2\gtkrc
 mkdir %2\brushes
 mkdir %2\generated_brushes
 mkdir %2\gradients