aboutsummaryrefslogtreecommitdiffstats
path: root/e-util/ename
diff options
context:
space:
mode:
authorLauris Kaplinski <lauris@src.gnome.org>2000-08-24 11:25:53 +0800
committerLauris Kaplinski <lauris@src.gnome.org>2000-08-24 11:25:53 +0800
commit8d63772a7dffe54c6320a70021110e33dfe7c1ba (patch)
tree8414f5588b54d8df4b006b4effd8e6cc740f70a6 /e-util/ename
parent9e945f485b3dd9456db54f1004eb37b31acbe412 (diff)
downloadgsoc2013-evolution-8d63772a7dffe54c6320a70021110e33dfe7c1ba.tar.gz
gsoc2013-evolution-8d63772a7dffe54c6320a70021110e33dfe7c1ba.tar.zst
gsoc2013-evolution-8d63772a7dffe54c6320a70021110e33dfe7c1ba.zip
Unicode in addressbook basically works, including simple searching
svn path=/trunk/; revision=4997
Diffstat (limited to 'e-util/ename')
-rw-r--r--e-util/ename/Makefile.am5
-rw-r--r--e-util/ename/test-ename-western-gtk.c10
2 files changed, 12 insertions, 3 deletions
diff --git a/e-util/ename/Makefile.am b/e-util/ename/Makefile.am
index 25a67a929c..6e4d3818f2 100644
--- a/e-util/ename/Makefile.am
+++ b/e-util/ename/Makefile.am
@@ -47,4 +47,7 @@ test_ename_western_LDADD = $(ename_libs)
test_ename_western_gtk_SOURCES = \
test-ename-western-gtk.c
-test_ename_western_gtk_LDADD = $(ename_libs) $(gnome_libs)
+test_ename_western_gtk_LDADD = \
+ $(ename_libs) \
+ $(top_builddir)/e-util/libeutil.la \
+ $(gnome_libs)
diff --git a/e-util/ename/test-ename-western-gtk.c b/e-util/ename/test-ename-western-gtk.c
index 17daf42b30..38f3c1e0fe 100644
--- a/e-util/ename/test-ename-western-gtk.c
+++ b/e-util/ename/test-ename-western-gtk.c
@@ -1,4 +1,5 @@
#include <gnome.h>
+#include <e-util/e-unicode.h>
#include <ename/e-name-western.h>
ENameWestern *name;
@@ -14,7 +15,7 @@ static void
fill_entries (void)
{
-#define SET(a,b) (gtk_entry_set_text (GTK_ENTRY (a), (b) == NULL ? "" : (b)))
+#define SET(a,b) (e_utf8_gtk_entry_set_text (GTK_ENTRY (a), (b) == NULL ? "" : (b)))
SET(prefix, name->prefix);
SET(first, name->first);
SET(middle, name->middle);
@@ -26,9 +27,14 @@ fill_entries (void)
static void
full_changed_cb (GtkEntry *fulle)
{
+ gchar *str;
+
e_name_western_free (name);
- name = e_name_western_parse (gtk_entry_get_text (fulle));
+ str = e_utf8_gtk_entry_get_text (fulle);
+ name = e_name_western_parse (str);
fill_entries ();
+
+ g_free (str);
}
static void