diff options
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/ChangeLog | 6 | ||||
| -rw-r--r-- | e-util/e-icon-factory.c | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 68b2df7839..b9489d1a25 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,9 @@ +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. + 2008-01-11 Milan Crha <mcrha@redhat.com> ** Fix for bug #488213 diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 5a604786dd..556c52ebb5 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -206,6 +206,8 @@ icon_theme_changed_cb (GtkIconTheme *icon_theme, gpointer user_data) void e_icon_factory_init (void) { + gchar *path; + if (name_to_icon != NULL) return; @@ -215,10 +217,13 @@ e_icon_factory_init (void) (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); |