From 2511403367518c17d1b74fd18d14926981a432ce Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 13 Jun 2006 06:11:41 +0000 Subject: Fix build on Win32, where EVOLUTION_ICONSDIR is a function call. 2006-06-13 Tor Lillqvist * em-format-html.c (efh_format_address): Fix build on Win32, where EVOLUTION_ICONSDIR is a function call. svn path=/trunk/; revision=32124 --- mail/ChangeLog | 5 +++++ mail/em-format-html.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 5aa0b01727..cdc358acb2 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2006-06-13 Tor Lillqvist + + * em-format-html.c (efh_format_address): Fix build on Win32, where + EVOLUTION_ICONSDIR is a function call. + 2006-06-12 Srinivasa Ragavan * message-list.etspec: Corrected the sortable parameter of the message diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 91a876cf6e..c2a5b16f21 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1560,19 +1560,19 @@ efh_format_address (EMFormatHTML *efh, GString *out, struct _camel_header_addres if (!strcmp (field, i18n_hdrs[2])) { g_string_append (out, "..."); - str = g_strdup (" "); + str = g_strdup_printf (" ", EVOLUTION_ICONSDIR); return str; } else if (!strcmp (field, i18n_hdrs[3])) { g_string_append (out, "..."); - str = g_strdup (" "); + str = g_strdup_printf (" ", EVOLUTION_ICONSDIR); return str; } else if (!strcmp (field, i18n_hdrs[4])) { g_string_append (out, "..."); - str = g_strdup (" "); + str = g_strdup_printf (" ", EVOLUTION_ICONSDIR); return str; } @@ -1584,13 +1584,13 @@ efh_format_address (EMFormatHTML *efh, GString *out, struct _camel_header_addres if (!strcmp (field, i18n_hdrs[2])) { - str = g_strdup_printf (" "); + str = g_strdup_printf (" ", EVOLUTION_ICONSDIR); } else if (!strcmp (field, i18n_hdrs[3])) { - str = g_strdup (" "); + str = g_strdup_printf (" ", EVOLUTION_ICONSDIR); } else if (!strcmp (field, i18n_hdrs[4])) { - str = g_strdup (" "); + str = g_strdup_printf (" ", EVOLUTION_ICONSDIR); } } -- cgit v1.2.3