Hello community, here is the log from the commit of package enchant for openSUSE:Factory checked in at Sat Apr 3 00:10:13 CEST 2010. -------- --- GNOME/enchant/enchant.changes 2009-05-24 14:30:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/enchant/enchant.changes 2010-04-02 19:30:24.000000000 +0200 @@ -1,0 +2,32 @@ +Fri Apr 2 19:11:59 CEST 2010 - vuntz@opensuse.org + +- Update to version 1.6.0: + + Add a function to get enchant's version (enchant_get_version) + + Disable zemberek plugin by default, as it's known to cause + issues/crashes with WebKit + + Fix Win32 DLL dependency not found popup occurs when module has + unmet dependencies + + Possibly fix lp#474062 + + Fix Registry handle not closed in enchant_get_registry_value_ex + + Fix Leak in _enchant_get_user_home_dirs() on Windows + + Update FSF address + + Fix Zemberek module listing a Turkish dictionary even without + Zemberek installed + + Don't assert if passed a null string list + + Fix enchant_pwl_init_with_file truncating pwl file + + Fix a double-free memory corruption bug + + Fix some small memory leaks + + Fix mis-acceptence of dictionaries which start with a partial + match of the lang id + + Fix enchant always looking in "lib" dir for plugins + + Fix the build with the MSVC compiler + + Add a --with-system-myspell option + + Package missing compile-resource file + + Compare paths ignoring case sensitivity on windows +- Drop libmalaga-devel BuildRequires. +- Pass --enable-zemberek to configure: it's in a subpackage for us, + so we can keep it even if it's experimental. +- Explicitly list the backends in the file list to make sure we + don't lose some of them by accident. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- enchant-1.5.0.tar.bz2 New: ---- enchant-1.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enchant.spec ++++++ --- /var/tmp/diff_new_pack.KTNMjp/_old 2010-04-03 00:09:36.000000000 +0200 +++ /var/tmp/diff_new_pack.KTNMjp/_new 2010-04-03 00:09:36.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package enchant (Version 1.5.0) +# spec file for package enchant (Version 1.6.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,30 +19,27 @@ Name: enchant -BuildRequires: aspell-devel dbus-1-glib-devel gcc-c++ glib2-devel hunspell-devel libvoikko-devel -# FIXME: Delete before submit. Will be fixed after malaga checkin. -BuildRequires: libmalaga-devel -License: LGPL v2.1 or later -Group: Productivity/Text/Spell -Version: 1.5.0 +Version: 1.6.0 Release: 1 +License: LGPLv2.1+ Summary: Generic Spell Checking Library -Source: %{name}-%{version}.tar.bz2 +Group: Productivity/Text/Spell Url: http://www.abisource.com/ +Source: %{name}-%{version}.tar.bz2 +BuildRequires: aspell-devel +BuildRequires: dbus-1-glib-devel +BuildRequires: gcc-c++ +BuildRequires: glib2-devel +BuildRequires: hunspell-devel +BuildRequires: libvoikko-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A library providing an efficient extensible abstraction for dealing with different spell checking libraries. - - -Authors: --------- - Dom Lachowicz <cinamod@hotmail.com> - %package voikko -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Generic Spell Checking Library - Voikko Plugin Group: Productivity/Text/Spell Provides: locale(%{name}:fi) @@ -52,14 +49,8 @@ extensible abstraction for dealing with different spell checking libraries. - - -Authors: --------- - Dom Lachowicz <cinamod@hotmail.com> - %package zemberek -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Generic Spell Checking Library - Zemberek Plugin Group: Productivity/Text/Spell Provides: locale(%{name}:az) @@ -74,14 +65,8 @@ providing an efficient extensible abstraction for dealing with different spell checking libraries. - - -Authors: --------- - Dom Lachowicz <cinamod@hotmail.com> - %package -n libenchant1 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Generic Spell Checking Library Group: System/Libraries Requires: %{name} = %{version} @@ -90,14 +75,8 @@ A library providing an efficient extensible abstraction for dealing with different spell checking libraries. - - -Authors: --------- - Dom Lachowicz <cinamod@hotmail.com> - %package devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Requires: %{name} = %{version} glib2-devel libstdc++-devel @@ -106,28 +85,23 @@ This package contains all necessary include files and libraries needed to develop applications that require these. - - -Authors: --------- - Dom Lachowicz <cinamod@hotmail.com> - %prep %setup -q %build %configure --with-pic \ - --disable-static + --disable-static \ + --enable-zemberek make %{?jobs:-j%jobs} %install %makeinstall %if %suse_version > 1110 -find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} + +find %{buildroot} -type f -name "*.la" -delete -print %endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -n libenchant1 -p /sbin/ldconfig @@ -140,9 +114,10 @@ %defattr (-, root, root) %{_bindir}/* %{_datadir}/enchant -%{_libdir}/enchant -%exclude %{_libdir}/enchant/libenchant_voikko.so -%exclude %{_libdir}/enchant/libenchant_zemberek.so +%dir %{_libdir}/enchant +%{_libdir}/enchant/libenchant_aspell.so +%{_libdir}/enchant/libenchant_ispell.so +%{_libdir}/enchant/libenchant_myspell.so %doc %{_mandir}/man?/*.* %files voikko ++++++ enchant-1.5.0.tar.bz2 -> enchant-1.6.0.tar.bz2 ++++++ ++++ 7621 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/COPYING.LIB new/enchant-1.6.0/COPYING.LIB --- old/enchant-1.5.0/COPYING.LIB 2009-05-23 11:44:18.000000000 +0200 +++ new/enchant-1.6.0/COPYING.LIB 2010-04-01 22:53:37.000000000 +0200 @@ -2,7 +2,7 @@ Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/Makefile.am new/enchant-1.6.0/Makefile.am --- old/enchant-1.5.0/Makefile.am 2009-05-23 11:44:18.000000000 +0200 +++ new/enchant-1.6.0/Makefile.am 2010-04-01 22:53:37.000000000 +0200 @@ -10,6 +10,7 @@ enchant.spec.in \ enchant.spec \ lt-compile-resource \ + compile-resource \ README \ TODO \ HACKING \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/README new/enchant-1.6.0/README --- old/enchant-1.5.0/README 2009-05-23 11:44:18.000000000 +0200 +++ new/enchant-1.6.0/README 2010-04-01 22:53:37.000000000 +0200 @@ -39,7 +39,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Inc., 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/compile-resource new/enchant-1.6.0/compile-resource --- old/enchant-1.5.0/compile-resource 1970-01-01 01:00:00.000000000 +0100 +++ new/enchant-1.6.0/compile-resource 2010-04-01 22:53:37.000000000 +0200 @@ -0,0 +1,46 @@ +#!/bin/sh + +# Script to compile a resource file for a DLL if there is a .rc file +# for it. The resource source file is supposed to contain a version +# info section, that uses the string BUILDNUMBER as the least +# significant part of the version numbers. This script replaces that +# string with a "build number" before compiling the binary resource +# file. The build number is kept between builds in a "stamp" file, and +# incremented each time. (If there is no stamp file, build number 0 is +# used.) The intention is that only the "official" maintainer of a DLL +# keeps such a stamp file, and thus the DLLs he releases have +# increasing version number resources, which can be used by an +# installer program to decide whether to replace an existing DLL with +# the same name. + +# This is just my (tml@iki.fi) idea, if somebody comes up with a +# better way to generate version number resources, don't hesitate to +# suggest. + +# The command line arguments are: +# $1: the name of the .rc file to check +# $2: the name of the resource object file to produce, if the rc file exists + +# Check if we have a resource file for this DLL. +rcfile=$1 +resfile=$2 +if [ -f $rcfile ]; then + # Check if we have a build number stamp file. + basename=`basename $rcfile .rc` + if [ -f $basename-build.stamp ]; then + read number <$basename-build.stamp + buildnumber=$[number] + echo Build number $buildnumber + rm -rf $basename-build.stamp + else + echo Using zero as build number + buildnumber=0 + fi + + m4 -DBUILDNUMBER=$buildnumber <$rcfile >$$.rc && + ${WINDRES-windres} $$.rc $resfile && + rm $$.rc +else + # Return failure + exit 1 +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/configure.in new/enchant-1.6.0/configure.in --- old/enchant-1.5.0/configure.in 2009-05-23 11:44:18.000000000 +0200 +++ new/enchant-1.6.0/configure.in 2010-04-01 22:56:07.000000000 +0200 @@ -8,7 +8,7 @@ ENCHANT_MAJOR_VERSION=1 dnl 4a) 5) Increment when adding interfaces. dnl 6) Set to zero when removing or changing interfaces. -ENCHANT_MINOR_VERSION=5 +ENCHANT_MINOR_VERSION=6 dnl 3) Increment when interfaces not changed at all, dnl only bug fixes or internal changes made. dnl 4b) Set to zero when adding, removing or changing interfaces. @@ -295,9 +295,15 @@ fi MYSPELL_CFLAGS="$MYSPELL_CFLAGS -DENCHANT_MYSPELL_DICT_DIR='\"$myspell_dir\"'" -PKG_CHECK_MODULES(MYSPELL, [hunspell], have_system_myspell=true, have_system_myspell=false) -AC_SUBST(MYSPELL_CFLAGS) -AC_SUBST(MYSPELL_LIBS) + +AC_ARG_WITH(system-myspell, AS_HELP_STRING([--with-system-myspell=yes/no],[use the system myspell/hunspell @<:@default=auto@:>@])) +if test "x$with_system_myspell" != "xno"; then + PKG_CHECK_MODULES(MYSPELL, [hunspell], have_system_myspell=true, have_system_myspell=false) + AC_SUBST(MYSPELL_CFLAGS) + AC_SUBST(MYSPELL_LIBS) +else + have_system_myspell=false; +fi AM_CONDITIONAL(WITH_SYSTEM_MYSPELL, test "x$have_system_myspell" = "xtrue") check_aspell=yes @@ -457,9 +463,9 @@ AM_CONDITIONAL(WITH_HSPELL, test "$build_hspell" = yes) -build_zemberek=yes +build_zemberek=no -AC_ARG_ENABLE(zemberek, AS_HELP_STRING([--disable-zemberek],[enable the zemberek backend @<:@default=auto@:>@]), build_zemberek="$enableval", build_zemberek=yes) +AC_ARG_ENABLE(zemberek, AS_HELP_STRING([--disable-zemberek],[enable the experimental zemberek (turkish) backend @<:@default=auto@:>@]), build_zemberek="$enableval", build_zemberek=no) if test "x$have_cxx" = "xno"; then build_zemberek=no @@ -522,6 +528,11 @@ Build Hspell backend: ${build_hspell} Build Myspell/Hunspell backend: ${build_myspell} Build Voikko backend: ${build_voikko} - Build Zemberek backend: ${build_zemberek} - Build a relocatable library: ${relocatable_library} -" + Build Zemberek backend: ${build_zemberek} + Build a relocatable library: ${relocatable_library}" + +if test "x$build_zemberek" = "xyes"; then + echo " +The Zemberek Turkish spell-checking plugin is enabled. It is known +to cause crashes with WebKit. Use at your own discretion." +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/enchant.spec new/enchant-1.6.0/enchant.spec --- old/enchant-1.5.0/enchant.spec 2009-05-23 11:44:52.000000000 +0200 +++ new/enchant-1.6.0/enchant.spec 2010-04-01 22:56:46.000000000 +0200 @@ -1,5 +1,5 @@ %define name enchant -%define version 1.5.0 +%define version 1.6.0 %define release 1 Summary: An Enchanting Spell Checking Library diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/missing new/enchant-1.6.0/missing --- old/enchant-1.5.0/missing 2009-05-23 11:44:34.000000000 +0200 +++ new/enchant-1.6.0/missing 2010-04-01 22:56:37.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake@gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/Makefile.am new/enchant-1.6.0/src/Makefile.am --- old/enchant-1.5.0/src/Makefile.am 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/Makefile.am 2010-04-01 22:53:37.000000000 +0200 @@ -1,6 +1,6 @@ SUBDIRS=. aspell ispell uspell myspell hspell applespell voikko zemberek -INCLUDES=-I$(top_srcdir) $(ENCHANT_CFLAGS) $(CC_WARN_CFLAGS) -DENCHANT_GLOBAL_MODULE_DIR=\"$(libdir)/enchant\" -DENCHANT_GLOBAL_ORDERING=\"$(datadir)/enchant\" -D_ENCHANT_BUILD=1 +INCLUDES=-I$(top_srcdir) $(ENCHANT_CFLAGS) $(CC_WARN_CFLAGS) -DENCHANT_GLOBAL_MODULE_DIR=\"$(libdir)/enchant\" -DENCHANT_GLOBAL_ORDERING=\"$(datadir)/enchant\" -D_ENCHANT_BUILD=1 -DENCHANT_VERSION_STRING=\"@ENCHANT_MAJOR_VERSION@.@ENCHANT_MINOR_VERSION@.@ENCHANT_MICRO_VERSION@\" lib_LTLIBRARIES = libenchant.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/applespell/applespell_checker.h new/enchant-1.6.0/src/applespell/applespell_checker.h --- old/enchant-1.5.0/src/applespell/applespell_checker.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/applespell/applespell_checker.h 2010-04-01 22:53:37.000000000 +0200 @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * 02110-1301, USA. */ #import <Cocoa/Cocoa.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/applespell/applespell_checker.mm new/enchant-1.6.0/src/applespell/applespell_checker.mm --- old/enchant-1.5.0/src/applespell/applespell_checker.mm 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/applespell/applespell_checker.mm 2010-04-01 22:53:37.000000000 +0200 @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * 02110-1301, USA. */ #include <glib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/aspell/aspell_provider.c new/enchant-1.6.0/src/aspell/aspell_provider.c --- old/enchant-1.5.0/src/aspell/aspell_provider.c 2009-05-23 11:44:14.000000000 +0200 +++ new/enchant-1.6.0/src/aspell/aspell_provider.c 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/enchant++.h new/enchant-1.6.0/src/enchant++.h --- old/enchant-1.5.0/src/enchant++.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/enchant++.h 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/enchant-provider.h new/enchant-1.6.0/src/enchant-provider.h --- old/enchant-1.5.0/src/enchant-provider.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/enchant-provider.h 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/enchant.c new/enchant-1.6.0/src/enchant.c --- old/enchant-1.5.0/src/enchant.c 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/enchant.c 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with @@ -106,10 +106,15 @@ /********************************************************************************/ /********************************************************************************/ +#ifdef _WIN32 +#define path_cmp g_utf8_collate +#else +#define path_cmp strcmp +#endif -static GSList* enchant_slist_prepend_unique_string (GSList *slist, gchar* data) +static GSList* enchant_slist_prepend_unique_path (GSList *slist, gchar* data) { - if (NULL == g_slist_find_custom (slist, data, (GCompareFunc)strcmp)) + if (NULL == g_slist_find_custom (slist, data, (GCompareFunc)path_cmp)) { return g_slist_prepend (slist, data); } @@ -120,9 +125,9 @@ } } -static GSList* enchant_slist_append_unique_string (GSList *slist, gchar* data) +static GSList* enchant_slist_append_unique_path (GSList *slist, gchar* data) { - if (NULL == g_slist_find_custom (slist, data, (GCompareFunc)strcmp)) + if (NULL == g_slist_find_custom (slist, data, (GCompareFunc)path_cmp)) { return g_slist_append (slist, data); } @@ -138,14 +143,15 @@ { GSList *dirs = NULL; const char* home_dir; + char *tmp; - home_dir = enchant_get_registry_value_ex (1, "Config", "Home_Dir"); - if (home_dir) - dirs = enchant_slist_append_unique_string (dirs, g_strdup (home_dir)); + tmp = enchant_get_registry_value_ex (1, "Config", "Home_Dir"); + if (tmp) + dirs = enchant_slist_append_unique_path (dirs, tmp); home_dir = g_get_home_dir (); if (home_dir) - dirs = enchant_slist_append_unique_string (dirs, g_strdup (home_dir)); + dirs = enchant_slist_append_unique_path (dirs, g_strdup (home_dir)); return dirs; } @@ -171,7 +177,7 @@ user_config_dir = g_get_user_config_dir(); if (user_config_dir) - user_dirs = enchant_slist_append_unique_string (user_dirs, g_build_filename (user_config_dir, + user_dirs = enchant_slist_append_unique_path (user_dirs, g_build_filename (user_config_dir, "enchant", NULL)); } @@ -182,7 +188,7 @@ for (dir = home_dirs; dir; dir = dir->next) { - user_dirs = enchant_slist_append_unique_string (user_dirs, + user_dirs = enchant_slist_append_unique_path (user_dirs, g_build_filename (dir->data, ENCHANT_USER_PATH_EXTENSION, NULL)); @@ -209,11 +215,11 @@ user_module_dir = enchant_get_registry_value_ex (1, "Config", "Module_Dir"); if (user_module_dir) - module_dirs = enchant_slist_append_unique_string (module_dirs, user_module_dir); + module_dirs = enchant_slist_append_unique_path (module_dirs, user_module_dir); } #ifdef XP_TARGET_COCOA - module_dirs = enchant_slist_append_unique_string (module_dirs, g_strdup ([[EnchantResourceProvider instance] moduleFolder])); + module_dirs = enchant_slist_append_unique_path (module_dirs, g_strdup ([[EnchantResourceProvider instance] moduleFolder])); #endif { @@ -222,7 +228,7 @@ user_dirs = enchant_get_user_dirs(); for (iter = user_dirs; iter; iter = iter->next) - module_dirs = enchant_slist_append_unique_string (module_dirs, iter->data); + module_dirs = enchant_slist_append_unique_path (module_dirs, iter->data); g_slist_free (user_dirs); } @@ -230,19 +236,19 @@ /* Look for explicitly set registry values */ module_dir = enchant_get_registry_value_ex (0, "Config", "Module_Dir"); if (module_dir) - module_dirs = enchant_slist_append_unique_string (module_dirs, module_dir); + module_dirs = enchant_slist_append_unique_path (module_dirs, module_dir); +#if defined(ENCHANT_GLOBAL_MODULE_DIR) + module_dirs = enchant_slist_append_unique_path (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR)); +#else /* Dynamically locate library and search for modules relative to it. */ prefix = enchant_get_prefix_dir(); if(prefix) { module_dir = g_build_filename(prefix,"lib","enchant",NULL); g_free(prefix); - module_dirs = enchant_slist_append_unique_string (module_dirs, module_dir); + module_dirs = enchant_slist_append_unique_path (module_dirs, module_dir); } - -#if defined(ENCHANT_GLOBAL_MODULE_DIR) - module_dirs = enchant_slist_append_unique_string (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR)); #endif return module_dirs; @@ -258,19 +264,19 @@ for (iter = user_conf_dirs; iter != NULL; iter = iter->next) { - conf_dirs = enchant_slist_append_unique_string (conf_dirs, iter->data); + conf_dirs = enchant_slist_append_unique_path (conf_dirs, iter->data); } g_slist_free (user_conf_dirs); #ifdef XP_TARGET_COCOA - conf_dirs = enchant_slist_append_unique_string (conf_dirs, g_strdup ([[EnchantResourceProvider instance] configFolder])); + conf_dirs = enchant_slist_append_unique_path (conf_dirs, g_strdup ([[EnchantResourceProvider instance] configFolder])); #endif /* Look for explicitly set registry values */ ordering_dir = enchant_get_registry_value_ex (0, "Config", "Data_Dir"); if (ordering_dir) - conf_dirs = enchant_slist_append_unique_string (conf_dirs, ordering_dir); + conf_dirs = enchant_slist_append_unique_path (conf_dirs, ordering_dir); /* Dynamically locate library and search for files relative to it. */ prefix = enchant_get_prefix_dir(); @@ -278,11 +284,11 @@ { ordering_dir = g_build_filename(prefix,"share","enchant",NULL); g_free(prefix); - conf_dirs = enchant_slist_append_unique_string (conf_dirs, ordering_dir); + conf_dirs = enchant_slist_append_unique_path (conf_dirs, ordering_dir); } #if defined(ENCHANT_GLOBAL_ORDERING) - conf_dirs = enchant_slist_append_unique_string (conf_dirs, g_strdup (ENCHANT_GLOBAL_ORDERING)); + conf_dirs = enchant_slist_append_unique_path (conf_dirs, g_strdup (ENCHANT_GLOBAL_ORDERING)); #endif return conf_dirs; @@ -346,7 +352,7 @@ user_config = enchant_get_registry_value_ex (1, "Config", "Data_Dir"); if (user_config) - dirs = enchant_slist_prepend_unique_string (dirs, user_config); + dirs = enchant_slist_prepend_unique_path (dirs, user_config); return dirs; } @@ -388,6 +394,7 @@ wszValue = g_new0(WCHAR, dwSize + 1); RegQueryValueExW(hKey, uKey, NULL, &lType, (LPBYTE) wszValue, &dwSize); } + RegCloseKey(hKey); } if(wszValue && *wszValue) @@ -1270,7 +1277,6 @@ EnchantSession * session; g_return_if_fail (dict); - g_return_if_fail (string_list); session = ((EnchantDictPrivateData*)dict->enchant_private_data)->session; enchant_session_clear_error (session); g_strfreev(string_list); @@ -1417,6 +1423,10 @@ if ((entry_len > g_module_suffix_len) && !strcmp(dir_entry+(entry_len-g_module_suffix_len), G_MODULE_SUFFIX)) { +#ifdef _WIN32 + /* Suppress error popups for failing to load plugins */ + UINT old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS); +#endif filename = g_build_filename (dir_name, dir_entry, NULL); module = g_module_open (filename, (GModuleFlags) 0); @@ -1451,6 +1461,10 @@ } g_free (filename); +#ifdef _WIN32 + /* Restore the original error mode */ + SetErrorMode(old_error_mode); +#endif } if (provider) { @@ -1610,11 +1624,13 @@ EnchantDict *dict; EnchantProvider *owner; EnchantSession *session; + EnchantDictPrivateData *enchant_dict_private_data; g_return_if_fail (data); dict = (EnchantDict *) data; - session = ((EnchantDictPrivateData*)dict->enchant_private_data)->session; + enchant_dict_private_data = (EnchantDictPrivateData*)dict->enchant_private_data; + session = enchant_dict_private_data->session; owner = session->provider; if (owner && owner->dispose_dict) @@ -1622,6 +1638,8 @@ else if(session->is_pwl) g_free (dict); + g_free(enchant_dict_private_data); + enchant_session_destroy (session); } @@ -1719,7 +1737,7 @@ * @pwl: A non-null pathname in the GLib file name encoding (UTF-8 on Windows) * to the personal wordlist file * - * Returns: + * Returns: An EnchantDict. This dictionary is reference counted. */ ENCHANT_MODULE_EXPORT (EnchantDict *) enchant_broker_request_pwl_dict (EnchantBroker * broker, const char *const pwl) @@ -1814,7 +1832,7 @@ * @broker: A non-null #EnchantBroker * @tag: The non-null language tag you wish to request a dictionary for ("en_US", "de_DE", ...) * - * Returns: An #EnchantDict, or %null if no suitable dictionary could be found. + * Returns: An #EnchantDict, or %null if no suitable dictionary could be found. This dictionary is reference counted. */ ENCHANT_MODULE_EXPORT (EnchantDict *) enchant_broker_request_dict (EnchantBroker * broker, const char *const tag) @@ -2312,3 +2330,8 @@ return dirs; } + +ENCHANT_MODULE_EXPORT(char *) +enchant_get_version (void) { + return ENCHANT_VERSION_STRING; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/enchant.h new/enchant-1.6.0/src/enchant.h --- old/enchant-1.5.0/src/enchant.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/enchant.h 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with @@ -51,6 +51,10 @@ typedef struct str_enchant_broker EnchantBroker; typedef struct str_enchant_dict EnchantDict; +/* const */ +ENCHANT_MODULE_EXPORT (char *) + enchant_get_version (void); + ENCHANT_MODULE_EXPORT (EnchantBroker *) enchant_broker_init (void); ENCHANT_MODULE_EXPORT (void) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/hspell/hspell_provider.c new/enchant-1.6.0/src/hspell/hspell_provider.c --- old/enchant-1.5.0/src/hspell/hspell_provider.c 2009-05-23 11:44:14.000000000 +0200 +++ new/enchant-1.6.0/src/hspell/hspell_provider.c 2010-04-01 22:53:37.000000000 +0200 @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz and Yaacov Zamir * give permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/correct.cpp new/enchant-1.6.0/src/ispell/correct.cpp --- old/enchant-1.5.0/src/ispell/correct.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/correct.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* * correct.c - Routines to manage the higher-level aspects of spell-checking * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/good.cpp new/enchant-1.6.0/src/ispell/good.cpp --- old/enchant-1.5.0/src/ispell/good.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/good.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* * good.c - see if a word or its root word * is in the dictionary. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/hash.cpp new/enchant-1.6.0/src/ispell/hash.cpp --- old/enchant-1.5.0/src/ispell/hash.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/hash.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* * hash.c - a simple hash function for ispell * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/ispell.h new/enchant-1.6.0/src/ispell/ispell.h --- old/enchant-1.5.0/src/ispell/ispell.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/ispell.h 2010-04-01 22:53:37.000000000 +0200 @@ -1,40 +1,11 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - #ifndef ISPELL_H #define ISPELL_H #include <sys/types.h> /* - * $Id: ispell.h 20792 2003-08-14 17:51:30Z dom $ + * $Id: ispell.h 28601 2010-01-11 12:40:00Z dom $ */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/ispell_checker.cpp new/enchant-1.6.0/src/ispell/ispell_checker.cpp --- old/enchant-1.5.0/src/ispell/ispell_checker.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/ispell_checker.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -465,11 +436,11 @@ if (prefstringchar < 0) { - std::string teststring; + char teststring[64]; for(int n1 = 1; n1 <= 15; n1++) { - teststring = "latin" + n1; - prefstringchar = findfiletype(teststring.c_str(), 1, + sprintf(teststring, "latin%d", n1); + prefstringchar = findfiletype(teststring, 1, deftflag < 0 ? &deftflag : static_cast<int *>(NULL)); if (prefstringchar >= 0) break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/ispell_checker.h new/enchant-1.6.0/src/ispell/ispell_checker.h --- old/enchant-1.5.0/src/ispell/ispell_checker.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/ispell_checker.h 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - #ifndef ISPELL_CHECKER_H #define ISPELL_CHECKER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/ispell_def.h new/enchant-1.6.0/src/ispell/ispell_def.h --- old/enchant-1.5.0/src/ispell/ispell_def.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/ispell_def.h 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* largest word accepted from a file by any input routine, plus one */ #ifndef INPUTWORDLEN #define INPUTWORDLEN 100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/lookup.cpp new/enchant-1.6.0/src/ispell/lookup.cpp --- old/enchant-1.5.0/src/ispell/lookup.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/lookup.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* * lookup.c - see if a word appears in the dictionary * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/makedent.cpp new/enchant-1.6.0/src/ispell/makedent.cpp --- old/enchant-1.5.0/src/ispell/makedent.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/makedent.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* * Copyright 1988, 1989, 1992, 1993, Geoff Kuenning, Granada Hills, CA * All rights reserved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/msgs.h new/enchant-1.6.0/src/ispell/msgs.h --- old/enchant-1.5.0/src/ispell/msgs.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/msgs.h 2010-04-01 22:53:37.000000000 +0200 @@ -1,35 +1,6 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* - * $Id: msgs.h 20792 2003-08-14 17:51:30Z dom $ + * $Id: msgs.h 28601 2010-01-11 12:40:00Z dom $ * * Copyright 1992, 1993, Geoff Kuenning, Granada Hills, CA * All rights reserved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/sp_spell.h new/enchant-1.6.0/src/ispell/sp_spell.h --- old/enchant-1.5.0/src/ispell/sp_spell.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/sp_spell.h 2010-04-01 22:53:37.000000000 +0200 @@ -1,32 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version.* - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - #ifndef SPELL_H #define SPELL_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/ispell/tgood.cpp new/enchant-1.6.0/src/ispell/tgood.cpp --- old/enchant-1.5.0/src/ispell/tgood.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/ispell/tgood.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -1,33 +1,4 @@ /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* enchant - * Copyright (C) 2003 Dom Lachowicz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * In addition, as a special exception, Dom Lachowicz - * gives permission to link the code of this program with - * non-LGPL Spelling Provider libraries (eg: a MSFT Office - * spell checker backend) and distribute linked combinations including - * the two. You must obey the GNU Lesser General Public License in all - * respects for all of the code used other than said providers. If you modify - * this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to - * do so, delete this exception statement from your version. - */ - /* * Copyright 1987, 1988, 1989, 1992, 1993, Geoff Kuenning, Granada Hills, CA * All rights reserved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/myspell/myspell_checker.cpp new/enchant-1.6.0/src/myspell/myspell_checker.cpp --- old/enchant-1.5.0/src/myspell/myspell_checker.cpp 2009-05-23 11:44:14.000000000 +0200 +++ new/enchant-1.6.0/src/myspell/myspell_checker.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with @@ -38,6 +38,10 @@ #include "enchant.h" #include "enchant-provider.h" +#ifdef near +#undef near +#endif + /* built against hunspell 1.2.2 on 2008-04-12 */ #ifdef HUNSPELL_STATIC @@ -341,6 +345,27 @@ return g_file_test(aff.c_str(), G_FILE_TEST_EXISTS) != 0; } +static bool is_plausible_dict_for_tag(const char *dir_entry, const char *tag) +{ + const char *dic_suffix = ".dic"; + size_t dic_suffix_len = strlen(dic_suffix); + size_t dir_entry_len = strlen(dir_entry); + size_t tag_len = strlen(tag); + + if (dir_entry_len - dic_suffix_len < tag_len) + return false; + if (strcmp(dir_entry+dir_entry_len-dic_suffix_len, dic_suffix) != 0) + return false; + if (strncmp (dir_entry, tag, tag_len) != 0) + return false; + //e.g. requested dict for "fi", + //reject "fil_PH.dic" + //allow "fi-FOO.dic", "fi_FOO.dic", "fi.dic", etc. + if (!ispunct(dir_entry[tag_len])) + return false; + return true; +} + static char * myspell_request_dictionary (EnchantBroker * broker, const char * tag) { @@ -364,8 +389,7 @@ if (dir) { const char *dir_entry; while ((dir_entry = g_dir_read_name (dir)) != NULL) { - if (strncmp (dir_entry, tag, strlen(tag)) == 0 && - strstr (dir_entry, ".dic") != NULL) { + if (is_plausible_dict_for_tag(dir_entry, tag)) { char *dict = g_build_filename (dirs[i].c_str(), dir_entry, NULL); if(s_hasCorrespondingAffFile(dict)){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/pwl.c new/enchant-1.6.0/src/pwl.c --- old/enchant-1.5.0/src/pwl.c 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/pwl.c 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with @@ -264,7 +264,7 @@ g_return_val_if_fail (file != NULL, NULL); - fd = enchant_fopen(file, "wb"); + fd = enchant_fopen(file, "ab+"); if(fd == NULL) { return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/pwl.h new/enchant-1.6.0/src/pwl.h --- old/enchant-1.5.0/src/pwl.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/pwl.h 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/uspell/uspell_provider.cpp new/enchant-1.6.0/src/uspell/uspell_provider.cpp --- old/enchant-1.5.0/src/uspell/uspell_provider.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/uspell/uspell_provider.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/voikko/voikko_provider.c new/enchant-1.6.0/src/voikko/voikko_provider.c --- old/enchant-1.5.0/src/voikko/voikko_provider.c 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/voikko/voikko_provider.c 2010-04-01 22:53:37.000000000 +0200 @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/zemberek/zemberek.cpp new/enchant-1.6.0/src/zemberek/zemberek.cpp --- old/enchant-1.5.0/src/zemberek/zemberek.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/zemberek/zemberek.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with @@ -43,10 +43,11 @@ g_error_free (Error); return false; } - proxy = dbus_g_proxy_new_for_name (connection, + proxy = dbus_g_proxy_new_for_name_owner (connection, "net.zemberekserver.server.dbus", "/net/zemberekserver/server/dbus/ZemberekDbus", - "net.zemberekserver.server.dbus.ZemberekDbusInterface"); + "net.zemberekserver.server.dbus.ZemberekDbusInterface", + &Error); dbus_g_connection_unref (connection); if (proxy == NULL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/zemberek/zemberek.h new/enchant-1.6.0/src/zemberek/zemberek.h --- old/enchant-1.5.0/src/zemberek/zemberek.h 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/zemberek/zemberek.h 2010-04-01 22:53:37.000000000 +0200 @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/src/zemberek/zemberek_provider.cpp new/enchant-1.6.0/src/zemberek/zemberek_provider.cpp --- old/enchant-1.5.0/src/zemberek/zemberek_provider.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/src/zemberek/zemberek_provider.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/tests/enchant-ispell.c new/enchant-1.6.0/tests/enchant-ispell.c --- old/enchant-1.5.0/tests/enchant-ispell.c 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/tests/enchant-ispell.c 2010-04-01 22:53:37.000000000 +0200 @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with @@ -431,6 +431,8 @@ do_mode_a (out, dict, word, pos, lineCount); else if (mode == MODE_L) do_mode_l (out, dict, word, lineCount); + + g_string_free(word, TRUE); } if (token_ptr) g_slist_free (token_ptr); @@ -446,8 +448,6 @@ enchant_broker_free_dict (broker, dict); enchant_broker_free (broker); - if (word) - g_string_free (word, TRUE); g_string_free (str, TRUE); return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/tests/enchant-lsmod.c new/enchant-1.6.0/tests/enchant-lsmod.c --- old/enchant-1.5.0/tests/enchant-lsmod.c 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/tests/enchant-lsmod.c 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/tests/test-enchant.c new/enchant-1.6.0/tests/test-enchant.c --- old/enchant-1.5.0/tests/test-enchant.c 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/tests/test-enchant.c 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/enchant-1.5.0/tests/test-enchantxx.cpp new/enchant-1.6.0/tests/test-enchantxx.cpp --- old/enchant-1.5.0/tests/test-enchantxx.cpp 2009-05-23 11:44:15.000000000 +0200 +++ new/enchant-1.6.0/tests/test-enchantxx.cpp 2010-04-01 22:53:37.000000000 +0200 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Boston, MA 02110-1301, USA. * * In addition, as a special exception, Dom Lachowicz * gives permission to link the code of this program with ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org