aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/backend/ebook/e-destination.c8
-rw-r--r--addressbook/gui/component/select-names/e-select-names-manager.c2
3 files changed, 15 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 30a0402599..a63e8dce56 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-03 Jon Trowbridge <trow@ximian.com>
+
+ * gui/component/select-names/e-select-names-manager.c (focus_out_cb): Clean
+ ESelectNamesModel on focus-out. (Half of a fix for 15656)
+
+ * backend/ebook/e-destination.c (nonempty): Fix this function
+ and make it utf8-safe. (The other half of the fix for 15656)
+
2001-11-28 Christopher James Lahey <clahey@ximian.com>
* gui/contact-list-editor/e-contact-list-editor.c: Consistency
diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c
index 20365491a3..508802b823 100644
--- a/addressbook/backend/ebook/e-destination.c
+++ b/addressbook/backend/ebook/e-destination.c
@@ -319,10 +319,12 @@ e_destination_clear (EDestination *dest)
static gboolean
nonempty (const gchar *s)
{
- while (s) {
- if (! isspace ((gint) *s))
+ gunichar c;
+ while (*s) {
+ c = g_utf8_get_char (s);
+ if (! g_unichar_isspace (c))
return TRUE;
- ++s;
+ s = g_utf8_next_char (s);
}
return FALSE;
}
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c
index a4b61def7e..e2b0238123 100644
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ b/addressbook/gui/component/select-names/e-select-names-manager.c
@@ -446,6 +446,8 @@ focus_out_cb (GtkWidget *w, GdkEventFocus *ev, gpointer user_data)
ESelectNamesModel *model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (entry), "select_names_model"));
ESelectNamesManager *manager = E_SELECT_NAMES_MANAGER (gtk_object_get_data (GTK_OBJECT (entry), "select_names_manager"));
+ e_select_names_model_clean (model);
+
if (!e_entry_completion_popup_is_visible (entry))
e_select_names_model_cardify_all (model, manager->completion_book, 100);