diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 10 | ||||
| -rw-r--r-- | mail/em-composer-prefs.c | 7 | ||||
| -rw-r--r-- | mail/em-format-html.c | 4 | ||||
| -rw-r--r-- | mail/em-format-quote.c | 4 | ||||
| -rw-r--r-- | mail/em-mailer-prefs.c | 6 | ||||
| -rw-r--r-- | mail/em-migrate.c | 1 | ||||
| -rw-r--r-- | mail/em-subscribe-editor.c | 1 | ||||
| -rw-r--r-- | mail/mail-folder-cache.c | 1 |
8 files changed, 23 insertions, 11 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index a2a0b7e318..a46dbef5d2 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,15 @@ 2008-05-06 Matthew Barnes <mbarnes@redhat.com> + ** Fixes part of bug #424744 + + * em-composer-prefs.c: + * em-format-html.c: + * em-format-quote.c: + * em-mailer-prefs.c: + Use camel-iconv.c instead of e-iconv.h (now deprecated). + +2008-05-06 Matthew Barnes <mbarnes@redhat.com> + * mail-component.c (mail_component_show_logger): Use the GtkCellRendererText's "markup" property for error messages. diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index 118bfb6a3c..dc7b3b9c4c 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -39,7 +39,8 @@ #include <bonobo/bonobo-generic-factory.h> -#include <libedataserver/e-iconv.h> +#include <camel/camel-iconv.h> + #include <misc/e-gui-utils.h> #include <glib/gstdio.h> @@ -760,7 +761,7 @@ charset_activate (GtkWidget *item, string = e_charset_picker_get_charset (menu); if (string == NULL) - string = g_strdup (e_iconv_locale_charset ()); + string = g_strdup (camel_iconv_locale_charset ()); gconf_client_set_string ( client, "/apps/evolution/mail/composer/charset", @@ -950,7 +951,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) buf = gconf_client_get_string ( client, "/apps/evolution/mail/composer/charset", NULL); menu = e_charset_picker_new ( - buf && *buf ? buf : e_iconv_locale_charset ()); + buf && *buf ? buf : camel_iconv_locale_charset ()); gtk_option_menu_set_menu (prefs->charset, GTK_WIDGET (menu)); option_menu_connect ( prefs, prefs->charset, diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 12fd050157..467d84c0e6 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -41,7 +41,6 @@ #undef interface #endif -#include <libedataserver/e-iconv.h> #include <libedataserver/e-data-server-util.h> /* for e_utf8_strftime, what about e_time_format_time? */ #include <libedataserver/e-time-utils.h> #include "e-util/e-icon-factory.h" @@ -54,6 +53,7 @@ #include <glib/gi18n.h> +#include <camel/camel-iconv.h> #include <camel/camel-mime-message.h> #include <camel/camel-stream.h> #include <camel/camel-stream-filter.h> @@ -1847,7 +1847,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) ct = camel_mime_part_get_content_type((CamelMimePart *)part); charset = camel_content_type_param (ct, "charset"); - charset = e_iconv_charset_name(charset); + charset = camel_iconv_charset_name(charset); if (!efh->simple_headers) camel_stream_printf(stream, diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c index 401801b510..059c2c98dc 100644 --- a/mail/em-format-quote.c +++ b/mail/em-format-quote.c @@ -26,6 +26,7 @@ #include <string.h> +#include <camel/camel-iconv.h> #include <camel/camel-stream.h> #include <camel/camel-stream-filter.h> #include <camel/camel-mime-filter-tohtml.h> @@ -34,7 +35,6 @@ #include <camel/camel-mime-message.h> #include <camel/camel-url.h> -#include <libedataserver/e-iconv.h> #include <glib/gi18n.h> #include <gconf/gconf-client.h> @@ -379,7 +379,7 @@ emfq_format_headers (EMFormatQuote *emfq, CamelStream *stream, CamelMedium *part ct = camel_mime_part_get_content_type ((CamelMimePart *) part); charset = camel_content_type_param (ct, "charset"); - charset = e_iconv_charset_name (charset); + charset = camel_iconv_charset_name (charset); /* dump selected headers */ h = (EMFormatHeader *) emf->header_list.head; diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index 40b6188659..6616cfcc48 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -29,7 +29,7 @@ #include "em-mailer-prefs.h" #include "em-format.h" -#include <libedataserver/e-iconv.h> +#include <camel/camel-iconv.h> #include <gtkhtml/gtkhtml-properties.h> #include <libxml/tree.h> #include "misc/e-charset-picker.h" @@ -909,7 +909,7 @@ charset_activate (GtkWidget *item, EMMailerPrefs *prefs) menu = gtk_option_menu_get_menu (prefs->charset); if (!(string = e_charset_picker_get_charset (menu))) - string = g_strdup (e_iconv_locale_charset ()); + string = g_strdup (camel_iconv_locale_charset ()); gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/display/charset", string, NULL); g_free (string); @@ -923,7 +923,7 @@ charset_menu_init (EMMailerPrefs *prefs) char *buf; buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/charset", NULL); - menu = e_charset_picker_new (buf && *buf ? buf : e_iconv_locale_charset ()); + menu = e_charset_picker_new (buf && *buf ? buf : camel_iconv_locale_charset ()); gtk_option_menu_set_menu (prefs->charset, GTK_WIDGET (menu)); g_free (buf); diff --git a/mail/em-migrate.c b/mail/em-migrate.c index c0dc7797f0..cfb4a5f435 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -58,7 +58,6 @@ #include <e-util/e-util.h> #include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-iconv.h> #include <e-util/e-xml-utils.h> #include "e-util/e-bconf-map.h" diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 60e0a921b0..014c43c3f4 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -37,6 +37,7 @@ #include "camel/camel-store.h" #include "camel/camel-session.h" #include "libedataserver/e-account-list.h" +#include "libedataserver/e-msgport.h" #include "e-util/e-util-private.h" #include "em-subscribe-editor.h" diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index 1c1ad89a89..bb1c36827c 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -47,6 +47,7 @@ #include <camel/camel-disco-store.h> #include <libedataserver/e-data-server-util.h> +#include <libedataserver/e-msgport.h> #include "e-util/e-util.h" #include "mail-mt.h" |