diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2008-05-07 10:17:18 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-05-07 10:17:18 +0800 |
| commit | 2e731573fba05a9848808a359d757734ad24a607 (patch) | |
| tree | 679afb1822966010d05c0089145f195c5b948d67 /mail/em-mailer-prefs.c | |
| parent | 68552ed22e3feeb63456d03d4c428b05d17a4c0b (diff) | |
| download | gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.tar gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.tar.gz gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.tar.bz2 gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.tar.lz gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.tar.xz gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.tar.zst gsoc2013-evolution-2e731573fba05a9848808a359d757734ad24a607.zip | |
** Fixes part of bug #424744
2008-05-06 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #424744
* configure.in:
Bump eds_minimum_version to 2.23.2 for camel-iconv.h.
* composer/e-composer-private.c:
* composer/e-composer-private.h:
* composer/e-msg-composer.c:
* mail/em-composer-prefs.c:
* mail/em-format-html.c:
* mail/em-format-quote.c:
* mail/em-mailer-prefs.c:
* widgets/misc/e-attachment-bar.c:
* widgets/misc/e-unicode.c:
Use camel-iconv.c instead of e-iconv.h (now deprecated).
svn path=/trunk/; revision=35474
Diffstat (limited to 'mail/em-mailer-prefs.c')
| -rw-r--r-- | mail/em-mailer-prefs.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |