diff options
| author | 5 <NotZed@Ximian.com> | 2001-10-26 08:35:20 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2001-10-26 08:35:20 +0800 |
| commit | ac091e954da440e6229c5ab3368188e0cde34023 (patch) | |
| tree | a4106948937d2bc113ea093e67ec576481f9d082 | |
| parent | 79c7cb13de4039e531aaaa1d38418c19ca26e5e6 (diff) | |
| download | gsoc2013-evolution-ac091e954da440e6229c5ab3368188e0cde34023.tar.gz gsoc2013-evolution-ac091e954da440e6229c5ab3368188e0cde34023.tar.zst gsoc2013-evolution-ac091e954da440e6229c5ab3368188e0cde34023.zip | |
Bumped version to 0.15.99.4 for e-iconv changes.
2001-10-25 <NotZed@Ximian.com>
* configure.in: Bumped version to 0.15.99.4 for e-iconv changes.
* gal/widgets/e-unicode.c (e_utf8_from_iconv_string_sized): "
(e_utf8_to_iconv_string_sized): "
(e_utf8_from_gtk_string_sized): "
(e_utf8_to_gtk_string_sized): "
* gal/widgets/e-font.c (e_font_to_native): s/iconv/e_iconv/
* gal/util/e-iconv.c (e_iconv): Implement a wrapper for iconv() to
make sure we link with and execute the right iconv to match the
right iconv_open. (BLAH!)
svn path=/trunk/; revision=14111
| -rw-r--r-- | e-util/e-iconv.c | 5 | ||||
| -rw-r--r-- | e-util/e-iconv.h | 1 | ||||
| -rw-r--r-- | widgets/misc/e-unicode.c | 8 | ||||
| -rw-r--r-- | widgets/text/e-text.c | 4 |
4 files changed, 13 insertions, 5 deletions
diff --git a/e-util/e-iconv.c b/e-util/e-iconv.c index c22c9915b2..bd85a7f599 100644 --- a/e-util/e-iconv.c +++ b/e-util/e-iconv.c @@ -419,6 +419,11 @@ iconv_t e_iconv_open(const char *oto, const char *ofrom) return ip; } +size_t e_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char ** outbuf, size_t *outbytesleft) +{ + return iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft); +} + void e_iconv_close(iconv_t ip) { diff --git a/e-util/e-iconv.h b/e-util/e-iconv.h index dee9ce3573..9bdeba8e30 100644 --- a/e-util/e-iconv.h +++ b/e-util/e-iconv.h @@ -32,6 +32,7 @@ extern "C" { const char *e_iconv_charset_name(const char *charset); iconv_t e_iconv_open(const char *oto, const char *ofrom); +size_t e_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char ** outbuf, size_t *outbytesleft); void e_iconv_close(iconv_t ip); const char *e_iconv_locale_charset(void); diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c index 9fb780cf63..871bb1e3b6 100644 --- a/widgets/misc/e-unicode.c +++ b/widgets/misc/e-unicode.c @@ -239,7 +239,7 @@ e_utf8_from_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) obl = ibl * 6 + 1; while (ibl > 0) { - iconv (ic, &ib, &ibl, &ob, &obl); + e_iconv (ic, &ib, &ibl, &ob, &obl); if (ibl > 0) { gint len; if ((*ib & 0x80) == 0x00) len = 1; @@ -302,7 +302,7 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) obl = ibl * 4 + 1; while (ibl > 0) { - iconv (ic, &ib, &ibl, &ob, &obl); + e_iconv (ic, &ib, &ibl, &ob, &obl); if (ibl > 0) { gint len; if ((*ib & 0x80) == 0x00) len = 1; @@ -428,7 +428,7 @@ e_utf8_from_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes obl = ibl * 6 + 1; while (ibl > 0) { - iconv (ic, &ib, &ibl, &ob, &obl); + e_iconv (ic, &ib, &ibl, &ob, &obl); if (ibl > 0) { gint len; if ((*ib & 0x80) == 0x00) len = 1; @@ -506,7 +506,7 @@ e_utf8_to_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes) obl = ibl * 4 + 1; while (ibl > 0) { - iconv (ic, &ib, &ibl, &ob, &obl); + e_iconv (ic, &ib, &ibl, &ob, &obl); if (ibl > 0) { gint len; if ((*ib & 0x80) == 0x00) len = 1; diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 119e6bb2ed..91077d98de 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -2093,10 +2093,12 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, area.height = height; #define DEFAULT_SPACING 7 - +#if 0 default_spacing = gtk_style_get_prop_experimental (widget->style, "GtkButton::default_spacing", DEFAULT_SPACING); +#endif + default_spacing = 7; thisx = 0; thisy = 0; |