aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2003-04-05 04:59:48 +0800
committerChris Toshok <toshok@src.gnome.org>2003-04-05 04:59:48 +0800
commit3fd8d4f4f75f22c6758d8323cf7f24ab4bdc3464 (patch)
tree63d98adc411806e404e5844a4f5ddcced8518314
parentaf4b3a1ee957a61f72546ade18b2b3717915ad34 (diff)
downloadgsoc2013-evolution-3fd8d4f4f75f22c6758d8323cf7f24ab4bdc3464.tar.gz
gsoc2013-evolution-3fd8d4f4f75f22c6758d8323cf7f24ab4bdc3464.tar.zst
gsoc2013-evolution-3fd8d4f4f75f22c6758d8323cf7f24ab4bdc3464.zip
fix abr. (e_name_western_get_suffix_at_str_end): same.
2003-04-04 Chris Toshok <toshok@ximian.com> * ename/e-name-western.c (e_name_western_extract_middle): fix abr. (e_name_western_get_suffix_at_str_end): same. svn path=/trunk/; revision=20676
-rw-r--r--e-util/ChangeLog5
-rw-r--r--e-util/ename/e-name-western.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 631d33b8a3..8d78374234 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-04 Chris Toshok <toshok@ximian.com>
+
+ * ename/e-name-western.c (e_name_western_extract_middle): fix abr.
+ (e_name_western_get_suffix_at_str_end): same.
+
2003-04-02 Not Zed <NotZed@Ximian.com>
* e-passwords.c (e_passwords_forget_passwords): Delete all
diff --git a/e-util/ename/e-name-western.c b/e-util/ename/e-name-western.c
index 33c9d53f6c..081ddc64e0 100644
--- a/e-util/ename/e-name-western.c
+++ b/e-util/ename/e-name-western.c
@@ -299,8 +299,10 @@ e_name_western_extract_middle (ENameWestern *name, ENameWesternIdxs *idxs)
return;
middle = name->full + idxs->first_idx + strlen (name->first);
- middle = g_utf8_next_char (middle);
+ if (*middle == '\0')
+ return;
+ middle = g_utf8_next_char (middle);
if (*middle == '\0')
return;
@@ -536,6 +538,8 @@ e_name_western_get_suffix_at_str_end (char *str)
word = e_name_western_get_preceding_word (str, p - str);
nextp = p - strlen (word);
+ if (nextp == str)
+ break;
nextp = g_utf8_prev_char (nextp);
e_name_western_cleanup_string (& word);