Re: gtkrc file handling - suggestion and patch

[Daniel Burrows <Daniel_Burrows brown edu>]

On Fri, Jan 01, 1999 at 11:24:28PM -0500, Daniel Burrows scribbled:
> On Sun, Dec 27, 1998 at 12:28:36AM -0600, Miguel de Icaza scribbled:
> > 
> > Hello Daniel,
> > 
> >    Did your patch that dropped ~/.gnome/gtkrc got applied to the CVS?
> >    It makes a lot of sense to apply.
> > 
> > Miguel.
> > 
> 
>   I finally got a new CVS checkout and it seems not to have been applied.
> I'll see if I can dig it up or create a new one tomorrow.
> 

  If anyone is interested, here it is.  I used 'diff -u' this time too. :-)

  The first patch is against libgnomeui, the second is against theme-switcher.

-- 
  Daniel Burrows

  Nothing is hopeless.

  PROOF:
(a) Assume the opposite.
(b) If something _is_ hopeless, then its condition can only improve.
(c) If its condition can only improve, then there must be hope for it.
(d) Therefore, nothing is hopeless.  QED.
? .new.ChangeLog
Index: gnome-init.c
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnomeui/gnome-init.c,v
retrieving revision 1.62.2.1
diff -u -r1.62.2.1 gnome-init.c
--- gnome-init.c	1998/12/17 02:16:00	1.62.2.1
+++ gnome-init.c	1999/01/02 15:30:46
@@ -403,7 +403,6 @@
  * Parse:
  * $gnomedatadir/gtkrc
  * $gnomedatadir/$apprc
- * ~/.gnome/gtkrc
  * ~/.gnome/$apprc
  *
  * appname is derived from argv[0].  IMHO this is a great solution.
@@ -450,13 +449,6 @@
 
 	/* <gnomedatadir>/<progname> */
 	file = gnome_datadir_file(apprc);
-	if (file){
-		gtk_rc_parse (file);
-		g_free (file);
-	}
-	
-	/* ~/.gnome/gtkrc */
-	file = gnome_util_home_file("gtkrc");
 	if (file){
 		gtk_rc_parse (file);
 		g_free (file);
Index: lister.c
===================================================================
RCS file: /cvs/gnome/control-center/capplets/theme-switcher/lister.c,v
retrieving revision 1.1
diff -u -r1.1 lister.c
--- lister.c	1998/09/23 02:39:17	1.1
+++ lister.c	1999/01/02 16:18:24
@@ -63,7 +63,7 @@
   home = getenv("HOME");
   if (!home)
     return;
-  g_snprintf(s, sizeof(s), "%s/.gnome/gtkrc", home);
+  g_snprintf(s, sizeof(s), "%s/.gtkrc", home);
   srand(time(NULL));
   g_snprintf(gtkrc_tmp, sizeof(gtkrc_tmp), "/tmp/%i-gtkrc-%i", time(NULL), rand());
   cp(s, gtkrc_tmp);
@@ -77,7 +77,7 @@
   home = getenv("HOME");
   if (!home)
     return;
-  g_snprintf(s, sizeof(s), "%s/.gnome/gtkrc", home);
+  g_snprintf(s, sizeof(s), "%s/.gtkrc", home);
   edit_file_to_use(s, theme);
 }

PGP signature