diff options
| author | Dan Winship <danw@src.gnome.org> | 2001-04-24 02:53:28 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2001-04-24 02:53:28 +0800 |
| commit | 0dc7aed0e6deba74b49df209c861e2c6e40b7e98 (patch) | |
| tree | 9e4f4c5b3aba99e080b94152a02a4dec8c24a46e /widgets/misc/e-unicode.h | |
| parent | 04c91826b15a68ab5db7bb3143f24d06680447c9 (diff) | |
| download | gsoc2013-evolution-0dc7aed0e6deba74b49df209c861e2c6e40b7e98.tar.gz gsoc2013-evolution-0dc7aed0e6deba74b49df209c861e2c6e40b7e98.tar.zst gsoc2013-evolution-0dc7aed0e6deba74b49df209c861e2c6e40b7e98.zip | |
bump to 0.7.99.1, add gal/unicode/Makefile. gal no longer internally
* configure.in: bump to 0.7.99.1, add gal/unicode/Makefile. gal no
longer internally depends on libunicode, although it will continue
to configure against it until gtkhtml/evolution are ported too.
* gal/Makefile.am (nonui_subdirs): add unicode
(libgal_la_LDFLAGS): remove $(UNICODE_LIBS)
(libgal_la_LIBADD): add unicode/*.lo
* gal/unicode/*: unicode handling code copied nearly verbatim from
glib 2.0, plus gal build glue.
* gal/e-text/Makefile.am (INCLUDES): Remove UNICODE_CFLAGS
(e_text_test_LDADD, e_entry_test_LDADD, e_text_model_test_LDADD,
e_completion_test_LDADD): remove -lunicode, add libunicode.la
* gal/e-text/e-text.c: Remove <unicode.h>, use gunicode functions.
* gal/widgets/Makefile.am (libwidgets_la_LDFLAGS): remove
UNICODE_LIBS
(INCLUDES): remove UNICODE_CFLAGS
(test_e_font_LDADD, test_font_loading_LDADD): add libunicode.la
* gal/widgets/e-unicode.h: #include <gal/unicode/gunicode.h>.
Remove some cruft.
* gal/widgets/e-unicode.c: remove <unicode.h>, use gunicode
functions. Add e_unicode_get_utf8 to replace some uses of
unicode_get_utf8, which isn't quite the same as any gunicode
function.
* gal/widgets/e-font.c: remove <unicode.h>, use gunicode functions
svn path=/trunk/; revision=9512
Diffstat (limited to 'widgets/misc/e-unicode.h')
| -rw-r--r-- | widgets/misc/e-unicode.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/widgets/misc/e-unicode.h b/widgets/misc/e-unicode.h index f9eb0a9ae6..019505948f 100644 --- a/widgets/misc/e-unicode.h +++ b/widgets/misc/e-unicode.h @@ -19,19 +19,12 @@ #include <gtk/gtkwidget.h> #include <libgnome/gnome-defs.h> #include <gnome-xml/tree.h> +#include <gal/unicode/gunicode.h> BEGIN_GNOME_DECLS -#ifdef USING_GNOME_PRINT_0_20 -#define gnome_font_get_size(f) ((f)->size) -#define gnome_font_get_glyph_width gnome_font_get_width -#define gnome_font_lookup_default gnome_font_get_glyph -#endif - #define G_UTF8_IN_GAL -void e_unicode_init (void); - /* * UTF-8 searching implementations * @@ -80,6 +73,7 @@ gchar * e_utf8_xml1_decode (const gchar *text); gchar * e_utf8_xml1_encode (const gchar *text); gint e_unichar_to_utf8 (gint c, gchar *outbuf); +gchar *e_unicode_get_utf8 (const gchar *text, gunichar *out); guint32 gdk_keyval_to_unicode (guint keysym); gchar *e_xml_get_translated_utf8_string_prop_by_name (const xmlNode *parent, |