From 4f04912bb6013e56d96b6940f5fc5809c958d6cd Mon Sep 17 00:00:00 2001 From: Seth Nickell Date: Sat, 28 Dec 2002 23:54:37 +0000 Subject: [PATCH] Update icon theme directory code so it looks in PREFIX/share/icons rather 2002-12-28 Seth Nickell * 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. --- capplets/common/ChangeLog | 9 +++++++++ capplets/common/Makefile.am | 1 + capplets/common/gnome-theme-info.c | 9 ++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index c4a8d8830..439136b29 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -1,3 +1,12 @@ +2002-12-28 Seth Nickell + + * 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 * Release 2.1.5 diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am index 7f1601c07..0e456a268 100644 --- a/capplets/common/Makefile.am +++ b/capplets/common/Makefile.am @@ -4,6 +4,7 @@ INCLUDES = \ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -DG_LOG_DOMAIN=\"capplet-common\" \ + -DINSTALL_PREFIX=\"$(prefix)\" \ -I$(top_srcdir)/ \ -I$(top_srcdir)/libbackground \ @VFS_CAPPLET_CFLAGS@ diff --git a/capplets/common/gnome-theme-info.c b/capplets/common/gnome-theme-info.c index 935e42deb..7c8711273 100644 --- a/capplets/common/gnome-theme-info.c +++ b/capplets/common/gnome-theme-info.c @@ -365,6 +365,7 @@ gnome_theme_info_init (void) { static gboolean initted = FALSE; gchar *dir; + const gchar *gtk_data_dir; GnomeVFSURI *uri; if (initted) @@ -402,7 +403,13 @@ gnome_theme_info_init (void) icon_themes_add_dir (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); g_free (dir);