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

Same as below.

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

	* e-msg-composer.c: Same as below.

	* e-msg-composer-attachment-bar.c: Go back to using
	e_iconv_charset_name().

svn path=/trunk/; revision=20059
This commit is contained in:
Jeffrey Stedfast
2003-02-25 20:54:19 +00:00
committed by Jeffrey Stedfast
parent bcae81e843
commit e5f2139df7
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
composer/ChangeLog
View File

@ -1,3 +1,10 @@
2003-02-25 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c: Same as below.
* e-msg-composer-attachment-bar.c: Go back to using
e_iconv_charset_name().
2003-02-24 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (drag_data_received): Make sure the url is !=

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

@ -44,7 +44,8 @@
#include "e-icon-list.h"
#include "camel/camel-charset-map.h"
#include <gal/util/e-iconv.h>
#include "camel/camel-data-wrapper.h"
#include "camel/camel-stream-fs.h"
#include "camel/camel-stream-null.h"
@ -729,7 +730,7 @@ get_default_charset (void)
gconf = gconf_client_get_default ();
buf = gconf_client_get_string (gconf, "/apps/evolution/mail/composer/charset", NULL);
charset = camel_charset_canonical_name (buf);
charset = e_iconv_charset_name (buf);
g_free (buf);
return charset;

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

@ -52,8 +52,6 @@
#include <errno.h>
#include <ctype.h>
#include <glib/gunicode.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtkscrolledwindow.h>
@ -76,6 +74,7 @@
#include <glade/glade.h>
#include <gal/util/e-iconv.h>
#include <gal/widgets/e-gui-utils.h>
#include <gal/e-text/e-entry.h>
@ -240,7 +239,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 = camel_charset_canonical_name (buf);
charset = e_iconv_charset_name (buf);
g_free (buf);
return charset;