gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2008-09-14 [colin] 3.5.0cvs104

Browse source 
* src/codeconv.c
	* src/codeconv.h
		Make conv_iconv_strdup static
This commit is contained in:
Colin Leroy 2008-09-14 20:00:40 +00:00
parent daee52fe5a
commit 4bc94269e4
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-09-14 [colin] 3.5.0cvs104
* src/codeconv.c
* src/codeconv.h
Make conv_iconv_strdup static
2008-09-12 [colin] 3.5.0cvs103
* claws-mail.pc.in

1
PATCHSETS
View file

@ -3515,3 +3515,4 @@
( cvs diff -u -r 1.382.2.473 -r 1.382.2.474 src/compose.c; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_wrapping.c; ) > 3.5.0cvs101.patchset
( cvs diff -u -r 1.30.2.31 -r 1.30.2.32 tools/README; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 tools/csv2addressbook.pl; ) > 3.5.0cvs102.patchset
( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 claws-mail.pc.in; cvs diff -u -r 1.155.2.90 -r 1.155.2.91 src/Makefile.am; cvs diff -u -r 1.382.2.474 -r 1.382.2.475 src/compose.c; cvs diff -u -r 1.50.2.50 -r 1.50.2.51 src/compose.h; cvs diff -u -r 1.23.2.29 -r 1.23.2.30 src/crash.c; cvs diff -u -r 1.2.2.30 -r 1.2.2.31 src/folder_item_prefs.c; cvs diff -u -r 1.2.2.17 -r 1.2.2.18 src/folder_item_prefs.h; cvs diff -u -r 1.115.2.204 -r 1.115.2.205 src/main.c; cvs diff -u -r 1.105.2.144 -r 1.105.2.145 src/prefs_account.c; cvs diff -u -r 1.204.2.177 -r 1.204.2.178 src/prefs_common.c; cvs diff -u -r 1.103.2.112 -r 1.103.2.113 src/prefs_common.h; cvs diff -u -r 1.52.2.66 -r 1.52.2.67 src/prefs_folder_item.c; cvs diff -u -r 1.5.2.36 -r 1.5.2.37 src/prefs_spelling.c; cvs diff -u -r 1.12.2.66 -r 1.12.2.67 src/prefs_template.c; cvs diff -u -r 1.5.12.18 -r 1.5.12.19 src/quote_fmt.h; cvs diff -u -r 1.22.2.39 -r 1.22.2.40 src/quote_fmt_parse.y; cvs diff -u -r 1.43.2.104 -r 1.43.2.105 src/toolbar.c; cvs diff -u -r 1.19.2.28 -r 1.19.2.29 src/toolbar.h; cvs diff -u -r 1.20.2.17 -r 1.20.2.18 src/gtk/Makefile.am; cvs diff -u -r 1.4.2.66 -r 1.4.2.67 src/gtk/about.c; cvs diff -u -r 1.2.2.37 -r 1.2.2.38 src/gtk/filesel.c; cvs diff -u -r 1.9.2.60 -r 1.9.2.61 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/gtk/gtkaspell.h; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/bogofilter/Makefile.am; cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/plugins/dillo_viewer/Makefile.am; cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/plugins/spamassassin/Makefile.am; cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/plugins/trayicon/Makefile.am; ) > 3.5.0cvs103.patchset
( cvs diff -u -r 1.65.2.59 -r 1.65.2.60 src/codeconv.c; cvs diff -u -r 1.15.2.20 -r 1.15.2.21 src/codeconv.h; ) > 3.5.0cvs104.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=5
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=103
EXTRA_VERSION=104
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

6
src/codeconv.c
View file

@ -114,6 +114,10 @@ static CodeConvFunc conv_get_code_conv_func (const gchar *src_charset_str,
static gchar *conv_iconv_strdup_with_cd (const gchar *inbuf,
iconv_t cd);
static gchar *conv_iconv_strdup (const gchar *inbuf,
const gchar *src_code,
const gchar *dest_code);
static CharSet conv_get_locale_charset (void);
static CharSet conv_get_outgoing_charset (void);
static CharSet conv_guess_ja_encoding(const gchar *str);
@ -818,7 +822,7 @@ static CodeConvFunc conv_get_code_conv_func(const gchar *src_charset_str,
return code_conv;
}
gchar *conv_iconv_strdup(const gchar *inbuf,
static gchar *conv_iconv_strdup(const gchar *inbuf,
const gchar *src_code, const gchar *dest_code)
{
iconv_t cd;

4
src/codeconv.h
View file

@ -185,10 +185,6 @@ gchar *conv_codeset_strdup (const gchar *inbuf,
const gchar *src_code,
const gchar *dest_code);
gchar *conv_iconv_strdup (const gchar *inbuf,
const gchar *src_code,
const gchar *dest_code);
const gchar *conv_get_charset_str (CharSet charset);
CharSet conv_get_charset_from_str (const gchar *charset);
const gchar *conv_get_locale_charset_str (void);