Makefile.am gimp.spec.in user_install new file gtkrc_user which gets

2000-11-08  Michael Natterer  <mitch@gimp.org>

	* Makefile.am
	* gimp.spec.in
	* user_install
	* gtkrc_user: new file gtkrc_user which gets installed as
	~/.gimp-1-1/gtkrc (We used to parse the same file twice if the
	user didn't the change user-specific gtkrc. The new file has
	comments only).

	* app/app_procs.c: g_free() the user gtkrc filename after use.

	* libgimp/gimpui.c: parse the user gtkrc here too.

ChangeLog

@@ -1,6 +1,20 @@
+2000-11-08  Michael Natterer  <mitch@gimp.org>
+
+	* Makefile.am
+	* gimp.spec.in
+	* user_install
+	* gtkrc_user: new file gtkrc_user which gets installed as
+	~/.gimp-1-1/gtkrc (We used to parse the same file twice if the
+	user didn't the change user-specific gtkrc. The new file has
+	comments only).
+
+	* app/app_procs.c: g_free() the user gtkrc filename after use.
+
+	* libgimp/gimpui.c: parse the user gtkrc here too.
+
 2000-11-07  Sven Neumann  <sven@gimp.org>
 
-	* app/text_tool.c (text_get_extents): use gdk_fonset_load() as we
+	* app/text_tool.c (text_get_extents): use gdk_fontset_load() as we
 	do in text_render(). Supposed to fix #31099.
 
 2000-11-07  Sven Neumann  <sven@gimp.org>
@@ -37,6 +51,7 @@
 	for generated brushes.
 
 2000-11-04 Garry R. Osgood <gosgood@idt.net>
+
 	* app/convolve.c
 	* app/convolve.h
 	When the  convolution tool finds itself

Makefile.am

@@ -176,6 +176,7 @@ EXTRA_DIST = \
 	MAINTAINERS				\
 	TODO					\
 	gtkrc					\
+	gtkrc_user				\
 	unitrc					\
 	gimp_logo.ppm				\
 	gimp_splash.ppm				\
@@ -201,6 +202,7 @@ gimpsysconf_DATA = \
 	gimprc			\
 	gimprc_user		\
 	gtkrc			\
+	gtkrc_user		\
 	unitrc			\
 	ps-menurc
 

app/app_procs.c

@@ -499,6 +499,8 @@ app_init (void)
 
   gtk_rc_parse (filename);
 
+  g_free (filename);
+
   if (parse_buffers_init ())
     {
       parse_unitrc ();   /*  this needs to be done before gimprc loading  */

data/misc/user_install

@@ -19,8 +19,8 @@ cp $3/gimprc_user $2/gimprc
 echo "cp $3/unitrc $2/unitrc"
 cp $3/unitrc $2/unitrc
 
-echo "cp $3/gtkrc $2/gtkrc"
-cp $3/gtkrc $2/gtkrc
+echo "cp $3/gtkrc_user $2/gtkrc"
+cp $3/gtkrc_user $2/gtkrc
 
 echo "mkdir $2/brushes"
 mkdir $2/brushes

etc/gtkrc_user

@@ -0,0 +1,9 @@
+# You can add your own GIMP-specific GTK styles here.
+
+# style <name> [= <name>]
+# {
+#   <option>
+# }
+#
+# widget <widget_set> style <style_name>
+# widget_class <widget_class_set> style <style_name>

gimp.spec.in

@@ -182,6 +182,7 @@ cat gimp-perl gimp-perl-plugin-files > gimp-perl-files
 %{sysconfdir}/gimp/%{subver}/gimprc
 %{sysconfdir}/gimp/%{subver}/gimprc_user
 %{sysconfdir}/gimp/%{subver}/gtkrc
+%{sysconfdir}/gimp/%{subver}/gtkrc_user
 %{sysconfdir}/gimp/%{subver}/unitrc
 %{sysconfdir}/gimp/%{subver}/ps-menurc
 

gtkrc_user

@@ -0,0 +1,9 @@
+# You can add your own GIMP-specific GTK styles here.
+
+# style <name> [= <name>]
+# {
+#   <option>
+# }
+#
+# widget <widget_set> style <style_name>
+# widget_class <widget_class_set> style <style_name>

libgimp/gimpui.c

@@ -45,6 +45,7 @@ gimp_ui_init (gchar    *prog_name,
 {
   gint    argc;
   gchar **argv;
+  gchar  *user_gtkrc;
 
   static gboolean initialized = FALSE;
 
@@ -60,6 +61,10 @@ gimp_ui_init (gchar    *prog_name,
   gtk_init (&argc, &argv);
   gtk_rc_parse (gimp_gtkrc ());
 
+  user_gtkrc = gimp_personal_rc_file ("gtkrc");
+  gtk_rc_parse (user_gtkrc);
+  g_free (user_gtkrc);
+
   /*  It's only safe to switch Gdk SHM usage off  */
   if (! gimp_use_xshm ())
     gdk_set_use_xshm (FALSE);

user_install

@@ -19,8 +19,8 @@ cp $3/gimprc_user $2/gimprc
 echo "cp $3/unitrc $2/unitrc"
 cp $3/unitrc $2/unitrc
 
-echo "cp $3/gtkrc $2/gtkrc"
-cp $3/gtkrc $2/gtkrc
+echo "cp $3/gtkrc_user $2/gtkrc"
+cp $3/gtkrc_user $2/gtkrc
 
 echo "mkdir $2/brushes"
 mkdir $2/brushes