callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Same as below.

Browse Source 
2003-02-20  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (composer_get_default_charset_setting): Same as
	below.

	* e-msg-composer-attachment-bar.c (get_default_charset): Use
	camel_charset_canonical_name() rather than e_iconv_charset_name()
	as the latter will be removed shortly.

svn path=/trunk/; revision=19979
This commit is contained in:
Jeffrey Stedfast
2003-02-20 21:46:51 +00:00
committed by Jeffrey Stedfast
parent 41f1a39d58
commit 74171b6c89
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
composer/ChangeLog
View File

@ -1,3 +1,12 @@
2003-02-20 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (composer_get_default_charset_setting): Same as
below.
* e-msg-composer-attachment-bar.c (get_default_charset): Use
camel_charset_canonical_name() rather than e_iconv_charset_name()
as the latter will be removed shortly.
2003-02-18 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account):

4
composer/e-msg-composer-attachment-bar.c
View File

@ -31,7 +31,6 @@
#include <glade/glade.h>
#include <gconf/gconf.h>
#include <gconf/gconf-client.h>
#include <gal/util/e-iconv.h>
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-app.h>
#include <libgnomeui/gnome-app-helper.h>
@ -45,6 +44,7 @@
#include "e-icon-list.h"
#include "camel/camel-charset-map.h"
#include "camel/camel-data-wrapper.h"
#include "camel/camel-stream-fs.h"
#include "camel/camel-stream-null.h"
@ -728,7 +728,7 @@ get_default_charset (void)
gconf = gconf_client_get_default ();
buf = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL);
charset = e_iconv_charset_name (buf);
charset = camel_charset_canonical_name (buf);
g_free (buf);
return charset;

3
composer/e-msg-composer.c
View File

@ -78,7 +78,6 @@
#include <gal/widgets/e-gui-utils.h>
#include <gal/e-text/e-entry.h>
#include <gal/util/e-iconv.h>
#include "widgets/misc/e-charset-picker.h"
@ -241,7 +240,7 @@ composer_get_default_charset_setting (void)
gconf = gconf_client_get_default ();
buf = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL);
charset = e_iconv_charset_name (buf);
charset = camel_charset_canonical_name (buf);
g_free (buf);
return charset;