applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update icon theme directory code so it looks in PREFIX/share/icons rather

Browse source 
2002-12-28  Seth Nickell  <snickell@stanford.edu>

	* Makefile.am:
	* gnome-theme-info.c: (gnome_theme_info_init):

	Update icon theme directory code so it looks in
	PREFIX/share/icons rather than PREFIX/share/theme,
	as per freedesktop icon spec.
This commit is contained in:
Seth Nickell 2002-12-28 23:54:37 +00:00 • committed by Seth Nickell
parent 87bd7acd10
commit 4f04912bb6
3 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
capplets/common/ChangeLog
View file

@ -1,3 +1,12 @@
2002-12-28 Seth Nickell <snickell@stanford.edu>
* Makefile.am:
* gnome-theme-info.c: (gnome_theme_info_init):
Update icon theme directory code so it looks in
PREFIX/share/icons rather than PREFIX/share/theme,
as per freedesktop icon spec.
2002-12-18 Jody Goldberg <jody@gnome.org> 2002-12-18 Jody Goldberg <jody@gnome.org>
* Release 2.1.5 * Release 2.1.5

1
capplets/common/Makefile.am
View file

@ -4,6 +4,7 @@ INCLUDES = \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-DG_LOG_DOMAIN=\"capplet-common\" \ -DG_LOG_DOMAIN=\"capplet-common\" \
-DINSTALL_PREFIX=\"$(prefix)\" \
-I$(top_srcdir)/ \ -I$(top_srcdir)/ \
-I$(top_srcdir)/libbackground \ -I$(top_srcdir)/libbackground \
@VFS_CAPPLET_CFLAGS@ @VFS_CAPPLET_CFLAGS@

9
capplets/common/gnome-theme-info.c
View file

@ -365,6 +365,7 @@ gnome_theme_info_init (void)
{ {
static gboolean initted = FALSE; static gboolean initted = FALSE;
gchar *dir; gchar *dir;
const gchar *gtk_data_dir;
GnomeVFSURI *uri; GnomeVFSURI *uri;
if (initted) if (initted)
@ -402,7 +403,13 @@ gnome_theme_info_init (void)
icon_themes_add_dir (dir); icon_themes_add_dir (dir);
g_free (dir); g_free (dir);
dir = gtk_rc_get_theme_dir (); gtk_data_dir = g_getenv ("GTK_DATA_PREFIX");
if (gtk_data_dir) {
dir = g_build_filename (gtk_data_dir, "share", "icons", NULL);
} else {
dir = g_build_filename (INSTALL_PREFIX, "share", "icons", NULL);
}
icon_themes_add_dir (dir); icon_themes_add_dir (dir);
g_free (dir); g_free (dir);