evolution r34885 - trunk/e-util

[tml svn gnome org]

Author: tml
Date: Thu Jan 24 21:06:23 2008
New Revision: 34885
URL: http://svn.gnome.org/viewvc/evolution?rev=34885&view=rev

Log:
2008-01-24  Tor Lillqvist  <tml novell com>

	* e-icon-factory.c (e_icon_factory_init): Construct pathname under
	EVOLUTION_DATADIR at run-time because EVOLUTION_DATADIR is a
	function call on Windows.



Modified:
   trunk/e-util/ChangeLog
   trunk/e-util/e-icon-factory.c

Modified: trunk/e-util/e-icon-factory.c
==============================================================================
--- trunk/e-util/e-icon-factory.c	(original)
+++ trunk/e-util/e-icon-factory.c	Thu Jan 24 21:06:23 2008
@@ -206,6 +206,8 @@
 void
 e_icon_factory_init (void)
 {
+	gchar *path;
+
 	if (name_to_icon != NULL)
 		return;
 
@@ -215,10 +217,13 @@
 		(GDestroyNotify) icon_free);
 
 	icon_theme = gtk_icon_theme_get_default ();
-	gtk_icon_theme_append_search_path (icon_theme,
-                                   EVOLUTION_DATADIR G_DIR_SEPARATOR_S
-                                   "evolution" G_DIR_SEPARATOR_S
-                                   BASE_VERSION G_DIR_SEPARATOR_S "icons");
+	path = g_build_filename (EVOLUTION_DATADIR,
+				 "evolution",
+				 BASE_VERSION,
+				 "icons",
+				 NULL);
+	gtk_icon_theme_append_search_path (icon_theme, path);
+	g_free (path);
 	g_signal_connect (
 		icon_theme, "changed",
 		G_CALLBACK (icon_theme_changed_cb), NULL);