Re: cleaning up themes

[Thomas Wood <thos gnome org>]

Owen Taylor wrote:
> On Sat, 2005-07-30 at 16:58 +0200, uws wrote:
>
> > P�at, Jul 30, 2005 at 02:52:30PM +0200, Murray Cumming skrev:
> >
> > > On Sat, 2005-07-30 at 12:18 +0800, Davyd Madeley wrote:
> > >
> > > > I'm sure I've brought this up before, but I think we should clean up the
> > > > list of themes we ship for G2.12.
> >
> > > Maybe for 2.14/2.14, but I'm not personally going to approve this
> > > feature-freeze break. It's bad enough that the change of the default
> > > theme has taken this long. Well, maybe it'd be ok to remove the non-
> > > default "default".
> >
> > If the default is just the built-in theme in GTK+ (no way to check now, no X
> > over here), I think a rename to "Built-in" is the best.
>
>
> The Red Hat packages have renamed this theme to "Raleigh" for a long
> time to avoid having a non-default Default. (It is derived from the
> Raleigh theme we did for GTK+-1.2)
>
> Regards,
> 						Owen

Here are two patches to rename the "Default" theme to "Raleigh". One 
patch alters GTK+ to install the default gtkrc into the Raleigh 
directory, and the other one patches gnome-themes so that the 
"Traditional" metatheme uses "Raleigh" rather than "Default".

Changing the name of the default gtk themes may break existing configs 
and uses. However, GTK+ will always fall back to the default theme if 
"Default" is not found, so this would not cause any problems.

-Thomas

Index: desktop-themes/Traditional/index.theme.in
===================================================================
RCS file: /cvs/gnome/gnome-themes/desktop-themes/Traditional/index.theme.in,v
retrieving revision 1.1
diff -u -p -r1.1 index.theme.in
--- desktop-themes/Traditional/index.theme.in	30 Jan 2003 22:42:25 -0000	1.1
+++ desktop-themes/Traditional/index.theme.in	30 Jul 2005 21:28:48 -0000
@@ -5,6 +5,6 @@ _Comment=Traditional hard-edged 3D appea
 Encoding=UTF-8
 
 [X-GNOME-Metatheme]
-GtkTheme=Default
+GtkTheme=Raleigh
 MetacityTheme=Atlanta
 IconTheme=gnome

Index: gtk/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v
retrieving revision 1.275
diff -u -p -r1.275 Makefile.am
--- gtk/Makefile.am	29 Jul 2005 14:06:02 -0000	1.275
+++ gtk/Makefile.am	30 Jul 2005 21:29:20 -0000
@@ -688,16 +688,16 @@ endif
 
 # Install a RC file for the default GTK+ theme, and key themes
 install-data-local: install-ms-lib install-def-file
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
-	$(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key
-	$(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0
+	$(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0-key
+	$(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0-key/gtkrc
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key
 	$(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
 
 uninstall-local: uninstall-ms-lib uninstall-def-file
-	rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
-	rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
+	rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc
+	rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0-key/gtkrc
 	rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
 
 # if srcdir!=builddir, clean out maintainer-clean files from builddir