aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Ewing <lewing@ximian.com>2001-10-13 10:39:27 +0800
committerLarry Ewing <lewing@src.gnome.org>2001-10-13 10:39:27 +0800
commit2d46a244382329ecf71c553e8e05bde1ccd5e667 (patch)
tree49f82a65ffa4d68d994f93de1437958b85abdca5
parentb6d1043499d87d579d8a3cfb422df9a688dbb15e (diff)
downloadgsoc2013-evolution-2d46a244382329ecf71c553e8e05bde1ccd5e667.tar
gsoc2013-evolution-2d46a244382329ecf71c553e8e05bde1ccd5e667.tar.gz
gsoc2013-evolution-2d46a244382329ecf71c553e8e05bde1ccd5e667.tar.bz2
gsoc2013-evolution-2d46a244382329ecf71c553e8e05bde1ccd5e667.tar.lz
gsoc2013-evolution-2d46a244382329ecf71c553e8e05bde1ccd5e667.tar.xz
gsoc2013-evolution-2d46a244382329ecf71c553e8e05bde1ccd5e667.tar.zst
gsoc2013-evolution-2d46a244382329ecf71c553e8e05bde1ccd5e667.zip
fix the test for "cp".
2001-10-12 Larry Ewing <lewing@ximian.com> * gal/util/e-iconv.c (e_iconv_charset_name): fix the test for "cp". svn path=/trunk/; revision=13651
-rw-r--r--e-util/e-iconv.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/e-util/e-iconv.c b/e-util/e-iconv.c
index 99c6c888d5..c4f21960e1 100644
--- a/e-util/e-iconv.c
+++ b/e-util/e-iconv.c
@@ -262,6 +262,8 @@ const char *e_iconv_charset_name(const char *charset)
if (ret != NULL) {
UNLOCK();
return ret;
+
+
}
/* Unknown, try canonicalise some basic charset types to something that should work */
@@ -278,13 +280,13 @@ const char *e_iconv_charset_name(const char *charset)
} else if (strncmp(name, "windows-", 8) == 0) {
/* Convert windows-nnnnn or windows-cpnnnnn to cpnnnn */
tmp = name+8;
- if (strncmp(tmp, "cp", 2))
+ if (!strncmp(tmp, "cp", 2))
tmp+=2;
ret = g_strdup_printf("CP%s", tmp);
} else if (strncmp(name, "microsoft-", 10) == 0) {
/* Convert microsoft-nnnnn or microsoft-cpnnnnn to cpnnnn */
tmp = name+10;
- if (strncmp(tmp, "cp", 2))
+ if (!strncmp(tmp, "cp", 2))
tmp+=2;
ret = g_strdup_printf("CP%s", tmp);
} else {