diff options
| author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-03-11 17:28:11 +0800 |
|---|---|---|
| committer | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-03-11 17:28:11 +0800 |
| commit | 594dc83bc0b17b2db1bd9573ab1dd588e0ce98b9 (patch) | |
| tree | 5b5acc6ddf451fec53c29e97ce5160f01c8af016 | |
| parent | 186faf3821d20ad3073bc3a23bd7e427b59be069 (diff) | |
| download | gsoc2013-evolution-594dc83bc0b17b2db1bd9573ab1dd588e0ce98b9.tar gsoc2013-evolution-594dc83bc0b17b2db1bd9573ab1dd588e0ce98b9.tar.gz gsoc2013-evolution-594dc83bc0b17b2db1bd9573ab1dd588e0ce98b9.tar.bz2 gsoc2013-evolution-594dc83bc0b17b2db1bd9573ab1dd588e0ce98b9.tar.lz gsoc2013-evolution-594dc83bc0b17b2db1bd9573ab1dd588e0ce98b9.tar.xz gsoc2013-evolution-594dc83bc0b17b2db1bd9573ab1dd588e0ce98b9.tar.zst gsoc2013-evolution-594dc83bc0b17b2db1bd9573ab1dd588e0ce98b9.zip | |
Use proper URIs in markup and be consistent in directory names
| -rw-r--r-- | mail/Makefile.am | 2 | ||||
| -rw-r--r-- | mail/em-format-html.c | 23 |
2 files changed, 18 insertions, 7 deletions
diff --git a/mail/Makefile.am b/mail/Makefile.am index aa8f5fa350..a6274c064f 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -24,7 +24,7 @@ libevolution_mail_la_CPPFLAGS = \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \ diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 801bc8430b..60382f259e 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -2296,22 +2296,29 @@ efh_format_address (EMFormatHTML *efh, GString *out, struct _camel_header_addres /* Let us add a '...' if we have more addresses */ if (limit > 0 && wrap && a && (i>(limit-1))) { + gchar * evolution_imagesdir = g_filename_to_uri(EVOLUTION_IMAGESDIR, NULL, NULL); + if (!strcmp (field, _("To"))) { g_string_append (out, "<a href=\"##TO##\">...</a>"); - str = g_strdup_printf ("<a href=\"##TO##\"><img src=\"%s/plus.png\" /></a> ", EVOLUTION_ICONSDIR); + str = g_strdup_printf ("<a href=\"##TO##\"><img src=\"%s/plus.png\" /></a> ", evolution_imagesdir); + + g_free(evolution_imagesdir); return str; } else if (!strcmp (field, _("Cc"))) { g_string_append (out, "<a href=\"##CC##\">...</a>"); - str = g_strdup_printf ("<a href=\"##CC##\"><img src=\"%s/plus.png\" /></a> ", EVOLUTION_ICONSDIR); + str = g_strdup_printf ("<a href=\"##CC##\"><img src=\"%s/plus.png\" /></a> ", evolution_imagesdir); + + g_free(evolution_imagesdir); return str; } else if (!strcmp (field, _("Bcc"))) { g_string_append (out, "<a href=\"##BCC##\">...</a>"); - str = g_strdup_printf ("<a href=\"##BCC##\"><img src=\"%s/plus.png\" /></a> ", EVOLUTION_ICONSDIR); + str = g_strdup_printf ("<a href=\"##BCC##\"><img src=\"%s/plus.png\" /></a> ", evolution_imagesdir); + g_free(evolution_imagesdir); return str; } @@ -2321,15 +2328,19 @@ efh_format_address (EMFormatHTML *efh, GString *out, struct _camel_header_addres if (limit > 0 && i>(limit)) { + gchar * evolution_imagesdir = g_filename_to_uri(EVOLUTION_IMAGESDIR, NULL, NULL); + if (!strcmp (field, _("To"))) { - str = g_strdup_printf ("<a href=\"##TO##\"><img src=\"%s/minus.png\" /></a> ", EVOLUTION_ICONSDIR); + str = g_strdup_printf ("<a href=\"##TO##\"><img src=\"%s/minus.png\" /></a> ", evolution_imagesdir); } else if (!strcmp (field, _("Cc"))) { - str = g_strdup_printf ("<a href=\"##CC##\"><img src=\"%s/minus.png\" /></a> ", EVOLUTION_ICONSDIR); + str = g_strdup_printf ("<a href=\"##CC##\"><img src=\"%s/minus.png\" /></a> ", evolution_imagesdir); } else if (!strcmp (field, _("Bcc"))) { - str = g_strdup_printf ("<a href=\"##BCC##\"><img src=\"%s/minus.png\" /></a> ", EVOLUTION_ICONSDIR); + str = g_strdup_printf ("<a href=\"##BCC##\"><img src=\"%s/minus.png\" /></a> ", evolution_imagesdir); } + + g_free(evolution_imagesdir); } return str; |