From: Paul Mangan Date: Tue, 3 Dec 2002 10:28:02 +0000 (+0000) Subject: sync with 0.8.6cvs15 X-Git-Tag: rel_0_8_7~98 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=5aff4c331ec7f3c08583bfc2c0fb54b89e78cf9b sync with 0.8.6cvs15 --- diff --git a/ChangeLog b/ChangeLog index cad270c78..a2e1a2105 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2002-12-03 + + * autogen.sh: added 'libtoolize --force --copy' to override the + current ltmain.sh. + * acconfig.h: removed. + * configure.in: increased minimal version of GPGME to 0.3.10. + Fixed checking of XIM. + * ac/check-type.m4 + ac/gnupg-check-typedef.m4: added an argument for comment. + +2002-11-29 + + * src/imageview.[ch]: fixed conflicting declarations of + imageview_show_image() (thanks to Thorsten Maerz). + 2002-11-28 * src/compose.c: compose_entry_append(): don't add ", " on subject diff --git a/ChangeLog.claws b/ChangeLog.claws index 56aba1a03..988d87bb2 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,8 @@ +2002-12-03 [paul] 0.8.6claws52 + + * sync with 0.8.6cvs15 + see ChangeLog 2002-12-03 + 2002-11-30 [christoph] 0.8.6claws51 * src/logwindow.[ch] diff --git a/ChangeLog.jp b/ChangeLog.jp index 6aae55479..278345879 100644 --- a/ChangeLog.jp +++ b/ChangeLog.jp @@ -1,3 +1,18 @@ +2002-12-03 + + * autogen.sh: ¸½ºß¤Î ltmain.sh ¤ò¾å½ñ¤­¤¹¤ë¤¿¤á¤Ë + 'libtoolize --force --copy' ¤òÄɲᣠ+ * acconfig.h: ºï½ü¡£ + * configure.in: GPGME ¤ÎºÇÄã¥Ð¡¼¥¸¥ç¥ó¤ò 0.3.10 ¤Ë¾å¤²¤¿¡£ + XIM ¤Î¥Á¥§¥Ã¥¯¤ò½¤Àµ¡£ + * ac/check-type.m4 + ac/gnupg-check-typedef.m4: ¥³¥á¥ó¥ÈÍѤΰú¿ô¤òÄɲᣠ+ +2002-11-29 + + * src/imageview.[ch]: ¾×Æͤ¹¤ë imageview_show_image() ¤ÎÄêµÁ¤ò½¤Àµ + (Thorsten Maerz ¤µ¤ó thanks)¡£ + 2002-11-28 * src/compose.c: compose_entry_append(): ¥µ¥Ö¥¸¥§¥¯¥È¥¨¥ó¥È¥ê¤Ç diff --git a/ac/check-type.m4 b/ac/check-type.m4 index 30dd8a1a1..90611451b 100644 --- a/ac/check-type.m4 +++ b/ac/check-type.m4 @@ -1,4 +1,4 @@ -dnl SYLPHEED_CHECK_TYPE(TYPE, DEFAULT [, INCLUDES]) +dnl SYLPHEED_CHECK_TYPE(TYPE, DEFAULT [, INCLUDES, COMMENT]) dnl dnl Like AC_CHECK_TYPE, but in addition to `sys/types.h', `stdlib.h' and dnl `stddef.h' checks files included by INCLUDES, which should be a diff --git a/ac/gnupg-check-typedef.m4 b/ac/gnupg-check-typedef.m4 index d910fb073..b53e2ab2f 100644 --- a/ac/gnupg-check-typedef.m4 +++ b/ac/gnupg-check-typedef.m4 @@ -1,4 +1,4 @@ -dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME) +dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME [, COMMENT]) dnl Check whether a typedef exists and create a #define $2 if it exists dnl AC_DEFUN(GNUPG_CHECK_TYPEDEF, diff --git a/autogen.sh b/autogen.sh index 672ad5577..517d398b4 100644 --- a/autogen.sh +++ b/autogen.sh @@ -1,7 +1,7 @@ #!/bin/sh aclocal -I ac \ - && libtoolize --force \ + && libtoolize --force --copy \ && autoheader \ && automake --add-missing --foreign --copy \ && autoconf \ diff --git a/configure.in b/configure.in index f05661d2d..8c967e63c 100644 --- a/configure.in +++ b/configure.in @@ -11,7 +11,7 @@ MINOR_VERSION=8 MICRO_VERSION=6 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws51 +EXTRA_VERSION=claws52 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target @@ -51,7 +51,7 @@ AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE dnl Checks for programs. -AC_ARG_PROGRAM +dnl AC_ARG_PROGRAM AC_PROG_CC AC_ISC_POSIX AM_PROG_CC_STDC @@ -62,7 +62,7 @@ AC_PROG_CPP dnl AC_PROG_RANLIB AM_PROG_LEX AC_PROG_YACC -AC_PROG_LIBTOOL +AM_PROG_LIBTOOL SYLPHEED_ACLOCAL_INCLUDE(ac) @@ -102,6 +102,23 @@ AM_PATH_GLIB(1.2.6,, AM_PATH_GTK(1.2.6,, AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.)) +dnl check if gdk / gtk was compiled with USE_XIM +AC_MSG_CHECKING([whether GTK was compiled with XIM support]) +CFLAGS_SAVE="$CFLAGS" +LDFLAGS_SAVE="$LDFLAGS" +CFLAGS="$CFLAGS `$GTK_CONFIG --cflags`" +LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`" +AC_CACHE_VAL(ac_cv_use_xim, [ + AC_TRY_LINK_FUNC([gdk_ic_attr_new], + ac_cv_use_xim=yes, ac_cv_use_xim=no) +]) +AC_MSG_RESULT($ac_cv_use_xim) +if test $ac_cv_use_xim = yes; then + AC_DEFINE(USE_XIM, 1, Whether GTK was compiled with XIM support or not) +fi +CFLAGS="$CFLAGS_SAVE" +LDFLAGS="$LDFLAGS_SAVE" + dnl Check for built-in image view support AC_ARG_ENABLE(gdk-pixbuf, [ --disable-gdk-pixbuf Do not use gdk-pixbuf], @@ -112,12 +129,13 @@ AC_ARG_ENABLE(imlib, if test "$ac_cv_enable_gdk_pixbuf" = yes; then AM_PATH_GDK_PIXBUF(0.8.0, - [AC_DEFINE(HAVE_GDK_PIXBUF, 1, Use GDK Pixbuf for image rendering) + [AC_DEFINE(HAVE_GDK_PIXBUF, 1, Define if you use gdk-pixbuf to support image view) ac_cv_enable_imlib=no], [ac_cv_enable_gdk_pixbuf=no]) fi if test "$ac_cv_enable_imlib" = yes; then AM_PATH_GDK_IMLIB(1.9, - AC_DEFINE(HAVE_GDK_IMLIB, 1, Use GDK Imlib for image rendering), [ac_cv_enable_imlib=no]) + AC_DEFINE(HAVE_GDK_IMLIB, 1, Define if you use gdk_imlib to support image view), + [ac_cv_enable_imlib=no]) fi if test "$ac_cv_enable_gdk_pixbuf" = no -a "$ac_cv_enable_imlib" = no; then AC_MSG_WARN(*** Built-in image view will not be supported ***) @@ -130,8 +148,9 @@ AC_ARG_ENABLE(gpgme, AC_MSG_CHECKING([whether to use GPGME]) if test $ac_cv_enable_gpgme = yes; then AC_MSG_RESULT(yes) - AM_PATH_GPGME(0.3.10, AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP), - [use_gpgme=no ac_cv_enable_gpgme=no]) + AM_PATH_GPGME(0.3.10, AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP.), + [use_gpgme=no + ac_cv_enable_gpgme=no]) else AC_MSG_RESULT(no) fi @@ -150,7 +169,7 @@ if test "$ac_cv_enable_jpilot" = yes; then if test "$ac_cv_enable_jpilot" = no; then AC_CHECK_HEADERS(libpisock/pi-args.h libpisock/pi-appinfo.h libpisock/pi-address.h, [ ac_cv_enable_jpilot=yes - AC_DEFINE(USE_JPILOT, 1) ]) + AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ]) fi AC_MSG_CHECKING([whether jpilot is available]) AC_MSG_RESULT($ac_cv_enable_jpilot) @@ -163,6 +182,7 @@ else fi dnl for LDAP support in addressbook +dnl no check for libraries; dynamically loaded AC_ARG_ENABLE(ldap, [ --enable-ldap Enable LDAP support [default=no]], [ac_cv_enable_ldap=$enableval], [ac_cv_enable_ldap=no]) @@ -198,7 +218,7 @@ if test "$ac_cv_enable_ldap" = yes; then if test "$ac_cv_enable_ldap" = yes; then CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`" LDAP_LIBS="$LDAP_LIBS -lldap `$GLIB_CONFIG --libs gthread`" - AC_DEFINE(USE_LDAP, 1, Define LDAP support in addressbook.) + AC_DEFINE(USE_LDAP, 1, Define if you want LDAP support in addressbook.) AC_SUBST(LDAP_LIBS) fi else @@ -218,7 +238,7 @@ if test $ac_cv_enable_ssl = yes; then #include ], [ return OPENSSL_VERSION_NUMBER; ], [ AC_MSG_RESULT(yes) - AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL) ], + AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.) ], [ AC_MSG_RESULT(no) LIBS="$ac_save_LIBS" ac_cv_enable_ssl=no ]) @@ -304,23 +324,6 @@ else AC_MSG_RESULT(no) fi -dnl check if gdk / gtk was compiled with USE_XIM -AC_MSG_CHECKING([whether GTK was compiled with XIM support]) -CFLAGS_SAVE="$CFLAGS" -LDFLAGS_SAVE="$LDFLAGS" -CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags` `$GTK_CONFIG --cflags`" -LDFLAGS="$LIBS `$GLIB_CONFIG --libs` `$GTK_CONFIG --libs`" -AC_CACHE_VAL(ac_cv_use_gtkgdk_xim, [ - AC_TRY_LINK_FUNC([ gdk_ic_attr_new ], - ac_cv_use_gtkgdk_xim=yes, ac_cv_use_gtkgdk_xim=no) - ]) -AC_MSG_RESULT($ac_cv_use_gtkgdk_xim) -if test $ac_cv_use_gtkgdk_xim = yes; then - AC_DEFINE(USE_GTKGDK_XIM, 1, USE_GTKGDK_XIM) -fi -CFLAGS="$CFLAGS_SAVE" -LDFLAGS="$LDFLAGS_SAVE" - dnl want crash dialog AC_ARG_ENABLE(crash-dialog, [ --enable-crash-dialog Enable crash dialog [default=no]], diff --git a/src/gtkstext.c b/src/gtkstext.c index 76a364c1d..70cde2676 100644 --- a/src/gtkstext.c +++ b/src/gtkstext.c @@ -1450,7 +1450,7 @@ gtk_stext_realize (GtkWidget *widget) gdk_gc_set_exposures (text->gc, TRUE); gdk_gc_set_foreground (text->gc, &widget->style->text[GTK_STATE_NORMAL]); -#ifdef USE_GTKGDK_XIM +#ifdef USE_XIM if (gdk_im_ready () && (editable->ic_attr = gdk_ic_attr_new ()) != NULL) { gint width, height; @@ -1576,7 +1576,7 @@ gtk_stext_unrealize (GtkWidget *widget) text = GTK_STEXT (widget); -#ifdef USE_GTKGDK_XIM +#ifdef USE_XIM if (GTK_EDITABLE (widget)->ic) { gdk_ic_destroy (GTK_EDITABLE (widget)->ic); @@ -1771,7 +1771,7 @@ gtk_stext_size_allocate (GtkWidget *widget, MAX (1, (gint)widget->allocation.height - (gint)(widget->style->klass->ythickness + (gint)TEXT_BORDER_ROOM) * 2)); -#ifdef USE_GTKGDK_XIM +#ifdef USE_XIM if (editable->ic && (gdk_ic_get_style (editable->ic) & GDK_IM_PREEDIT_POSITION)) { gint width, height; @@ -2441,7 +2441,7 @@ gtk_stext_focus_in (GtkWidget *widget, GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS); gtk_widget_draw_focus (widget); -#ifdef USE_GTKGDK_XIM +#ifdef USE_XIM if (GTK_EDITABLE(widget)->ic) gdk_im_begin (GTK_EDITABLE(widget)->ic, GTK_STEXT(widget)->text_area); #endif @@ -2475,7 +2475,7 @@ gtk_stext_focus_out (GtkWidget *widget, undraw_cursor (GTK_STEXT(widget), TRUE); GTK_STEXT(widget)->cursor_visible = FALSE; -#ifdef USE_GTKGDK_XIM +#ifdef USE_XIM gdk_im_end (); #endif @@ -3972,7 +3972,7 @@ find_cursor_at_line (GtkSText* text, const LineParams* start_line, gint pixel_he else text->cursor_char = ch; -#ifdef USE_GTKGDK_XIM +#ifdef USE_XIM if (GTK_WIDGET_HAS_FOCUS(text) && gdk_im_ready() && editable->ic && (gdk_ic_get_style (editable->ic) & GDK_IM_PREEDIT_POSITION)) {