2006-04-11 [colin] 2.1.0cvs31

	* src/compose.c
		Fix inserting files not in utf8 when locale is utf8

diff --git a/ChangeLog b/ChangeLog
index f34c417a06ea50c92bb5470eb37725b0414a4dbd..bd5d68299e2815ef9a6dc4506ca25ce73ac1f928 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-11 [colin]     2.1.0cvs31
+
+       * src/compose.c
+               Fix inserting files not in utf8 when locale is utf8
+
 2006-04-11 [colin]     2.1.0cvs30
 
        * src/inc.c

diff --git a/PATCHSETS b/PATCHSETS
index 289fe686aacac6774c072f0afb8d031993f4038d..8576dea650a5dba5186f40ea7a347baf73199542 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1402,3 +1402,4 @@
 ( cvs diff -u -r 1.4.2.30 -r 1.4.2.31 src/gtk/about.c;  ) > 2.1.0cvs28.patchset
 ( cvs diff -u -r 1.382.2.261 -r 1.382.2.262 src/compose.c;  cvs diff -u -r 1.204.2.83 -r 1.204.2.84 src/prefs_common.c;  ) > 2.1.0cvs29.patchset
 ( cvs diff -u -r 1.149.2.46 -r 1.149.2.47 src/inc.c;  ) > 2.1.0cvs30.patchset
+( cvs diff -u -r 1.382.2.262 -r 1.382.2.263 src/compose.c;  ) > 2.1.0cvs31.patchset

diff --git a/configure.ac b/configure.ac
index 7ce0c1d71c171f37f67674b4fbdf5b03acc4232f..c96c05a4337f95e040be96dd4f2c12850cd62fd6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=30
+EXTRA_VERSION=31
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 30e3db7f818bda9d19cbc53ccf71cbff57b26079..b58d246ae8e19f7f9d79a8a999fc0042d022b55b 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2822,7 +2822,7 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
                                        G_CALLBACK(text_inserted),
                                        compose);
 
-       cur_encoding = conv_get_locale_charset_str();
+       cur_encoding = conv_get_locale_charset_str_no_utf8();
 
        while (fgets(buf, sizeof(buf), fp) != NULL) {
                gchar *str;