diff options
| -rw-r--r-- | composer/ChangeLog | 1 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 1f7ee0e411..6c0b04b3d1 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -3,6 +3,7 @@ * e-msg-composer.c (composer_get_default_charset_setting): Use e_iconv_locale_charset() instead of e_iconv_locale_name(), dunno what I was thinking. locale_name() doesn't even exist. + (setup_ui): Don't free the default_charset, it's a const char*. * e-msg-composer-attachment-bar.c (get_default_charset): Same. diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 2f8ddf45e9..aeabea9028 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2072,7 +2072,7 @@ static void setup_ui (EMsgComposer *composer) { BonoboUIContainer *container; - char *default_charset; + const char *default_charset; gboolean hide_smime; GConfClient *gconf; @@ -2100,7 +2100,6 @@ setup_ui (EMsgComposer *composer) default_charset, menu_changed_charset_cb, composer); - g_free (default_charset); /* Format -> HTML */ bonobo_ui_component_set_prop ( |