+2003-06-07 [christoph] 0.9.0claws21
+
+ * src/Makefile.am
+ * src/compose.c
+ * src/gtkaspell.[ch] ** REMOVE **
+ * src/gtk/Makefile.am
+ * src/gtk/gtkaspell.[ch] ** NEW **
+ o make gtkaspell independent from sylpheed's prefs
+ o move gtkaspell.[ch] to gtk directory
+
2003-06-07 [christoph] 0.9.0claws20
* src/Makefile.am
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=claws20
+EXTRA_VERSION=claws21
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl set $target
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(fcntl.h sys/file.h unistd.h paths.h \
sys/param.h sys/utsname.h sys/select.h \
- wchar.h wctype.h fnmatch.h)
+ wchar.h wctype.h)
dnl alf - Check for apache installation f*ck up. apache may also install an
dnl fnmatch, which includes their own regex stuff if USE_HSREGEX is defined
rfc2359.txt IMAP4 UIDPLUS extension
rfc2487.txt SMTP Service Extension for Secure SMTP over TLS
rfc2554.txt SMTP Service Extension for Authentication
+rfc2683.txt IMAP4 Implementation Recommendations
rfc2821.txt SMTP
rfc2822.txt Internet Message Format
rfc2980.txt Common NNTP Extensions
colorlabel.[ch] gtk/colorlabel.[ch] ok
filesel.[ch] gtk/filesel.[ch] ok
+
+gtkaspell.[ch] gtk/gtkaspell.[ch] ok
mbox_folder.c mbox_folder.h \
quote_fmt_lex.l quote_fmt_lex.h \
quote_fmt_parse.y quote_fmt.c quote_fmt.h \
- gtkaspell.c gtkaspell.h \
matcher_parser_lex.l matcher_parser_lex.h \
matcher_parser_parse.y matcher_parser.h matcher_parser_parse.h \
string_match.h string_match.c \
-Igtk \
-DG_LOG_DOMAIN=\"Sylpheed\" \
-I$(top_srcdir)/intl \
- $(ASPELL_CFLAGS) \
+ $(ASPELL_CFLAGS) \
$(GTK_CFLAGS) \
$(GPGME_CFLAGS) \
$(OPENSSL_CFLAGS) \
if (mode != COMPOSE_REDIRECT) {
if (prefs_common.enable_aspell && prefs_common.dictionary &&
strcmp(prefs_common.dictionary, _("None"))) {
- gtkaspell = gtkaspell_new((const gchar*)prefs_common.dictionary,
+ gtkaspell = gtkaspell_new(prefs_common.aspell_path,
+ prefs_common.dictionary,
conv_get_current_charset_str(),
prefs_common.misspelled_col,
prefs_common.check_while_typing,
colorlabel.c colorlabel.h \
description_window.c description_window.h \
filesel.c filesel.h \
+ gtkaspell.c gtkaspell.h \
gtkutils.c gtkutils.h \
gtkshruler.c gtkshruler.h \
gtksctree.c gtksctree.h \
CPPFLAGS = \
-I../common \
-I.. \
- $(GTK_CFLAGS)
- $(OPENSSL_CFLAGS)
+ $(GTK_CFLAGS) \
+ $(OPENSSL_CFLAGS) \
+ $(ASPELL_CFLAGS)
libsylpheedgtk_la_LIBADD = \
../common/libsylpheedcommon.la \
- $(GTK_LIBS)
+ $(GTK_LIBS) \
+ $(ASPELL_LIBS)
#include "intl.h"
#include "gtkstext.h"
-#include "prefs_common.h"
#include "utils.h"
#include "gtkaspell.h"
gtkaspellcheckers->error_message = NULL;
}
-GtkAspell *gtkaspell_new(const gchar *dictionary,
+GtkAspell *gtkaspell_new(const gchar *dictionary_path,
+ const gchar *dictionary,
const gchar *encoding,
gint misspelled_color,
gboolean check_while_typing,
gtkaspell = g_new0(GtkAspell, 1);
+ gtkaspell->dictionary_path = dictionary_path;
+
gtkaspell->gtkaspeller = gtkaspeller;
gtkaspell->alternate_speller = NULL;
gtkaspell->theword[0] = 0x00;
if (gtkaspell->suggestions_list)
free_suggestions_list(gtkaspell);
+
+ g_free((gchar *)gtkaspell->dictionary_path);
debug_print("Aspell: deleting gtkaspell %0x\n", (guint) gtkaspell);
gtk_widget_destroy(GTK_WIDGET(amenu->data));
amenu = alist;
}
-}
+ }
dictname = g_strdup_printf(_("Dictionary: %s"),
gtkaspeller->dictionary->dictname);
/* Dict list */
if (gtkaspellcheckers->dictionary_list == NULL)
- gtkaspell_get_dictionary_list(prefs_common.aspell_path, FALSE);
+ gtkaspell_get_dictionary_list(gtkaspell->dictionary_path, FALSE);
{
GtkWidget * curmenu = submenu;
int count = 0;
typedef struct _GtkAspell
{
+ const gchar *dictionary_path;
+
GtkAspeller *gtkaspeller;
GtkAspeller *alternate_speller;
gchar theword[GTKASPELLWORDSIZE];
void gtkaspell_checkers_reset_error (void);
-GtkAspell* gtkaspell_new (const gchar *dictionary,
+GtkAspell* gtkaspell_new (const gchar *dictionary_path,
+ const gchar *dictionary,
const gchar *encoding,
gint misspelled_color,
gboolean check_while_typing,