0.9.0claws21
authorChristoph Hohmann <reboot@gmx.ch>
Sat, 7 Jun 2003 22:15:41 +0000 (22:15 +0000)
committerChristoph Hohmann <reboot@gmx.ch>
Sat, 7 Jun 2003 22:15:41 +0000 (22:15 +0000)
* 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

ChangeLog.claws
configure.ac
doc/src/readme.txt
doc/src/ui_seperation.txt
src/Makefile.am
src/compose.c
src/gtk/Makefile.am
src/gtk/gtkaspell.c [moved from src/gtkaspell.c with 99% similarity]
src/gtk/gtkaspell.h [moved from src/gtkaspell.h with 96% similarity]

index 77143f67e1557e7d2277d69ff7777db4fc6d64ec..37ec7e0780bc7e03d8bb2f8df057e8e68ade5e3c 100644 (file)
@@ -1,3 +1,13 @@
+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
index e2911f3c6da1e292aede7e9501fe726b8b5c2909..6dc8fbbfd770cca73f92e48430a006a670948399 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 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
@@ -128,7 +128,7 @@ AC_HEADER_STDC
 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
index b7e46379695c105d9ffca2de4d44e4303a4c03c4..a2c86947f4bcd495d853dd558c718570b24a4bd0 100644 (file)
@@ -10,6 +10,7 @@ rfc2342.txt   IMAP4 Namespace
 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
index d00a02a4478f9a77c6d151d26443c37b87bfc3b7..24c888aa083618f4267c4c5d2c03a5bd8b5be4ca 100644 (file)
@@ -50,3 +50,5 @@ about.[ch]            gtk/about.[ch]          ok
 colorlabel.[ch]                gtk/colorlabel.[ch]     ok
 
 filesel.[ch]           gtk/filesel.[ch]        ok
+
+gtkaspell.[ch]         gtk/gtkaspell.[ch]      ok
index 4501133a8c7189925e5699c31759951150ff115e..362572d1cde8da4719a7549c3393eabf4c46a8af 100644 (file)
@@ -103,7 +103,6 @@ sylpheed_SOURCES = \
        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 \
@@ -197,7 +196,7 @@ INCLUDES = \
        -Igtk \
        -DG_LOG_DOMAIN=\"Sylpheed\" \
        -I$(top_srcdir)/intl \
-        $(ASPELL_CFLAGS)    \
+       $(ASPELL_CFLAGS) \
        $(GTK_CFLAGS) \
        $(GPGME_CFLAGS) \
        $(OPENSSL_CFLAGS) \
index 729fb1850a6b9547624dca13dca574753bf688a2..9c2caeab22d36a2ec02ab81fd7266979a64e871f 100644 (file)
@@ -5076,7 +5076,8 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        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,
index 5e41bfc0869e3f24f73f7839613ecc43ed943170..1ac992bce0f5097d7dfd981d2cc5b8f76b7b1a28 100644 (file)
@@ -5,6 +5,7 @@ libsylpheedgtk_la_SOURCES = \
        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 \
@@ -18,9 +19,11 @@ libsylpheedgtk_la_SOURCES = \
 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)
similarity index 99%
rename from src/gtkaspell.c
rename to src/gtk/gtkaspell.c
index 9d13646609ade6ff90b582e22863ea8411bdd6c9..ced5f01dc2ce9f2c98d8a64febfce7896ec2970c 100644 (file)
@@ -53,7 +53,6 @@
 
 #include "intl.h"
 #include "gtkstext.h"
-#include "prefs_common.h"
 #include "utils.h"
 #include "gtkaspell.h"
 
@@ -255,7 +254,8 @@ void gtkaspell_checkers_reset_error(void)
        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,
@@ -280,6 +280,8 @@ GtkAspell *gtkaspell_new(const gchar *dictionary,
        
        gtkaspell = g_new0(GtkAspell, 1);
 
+       gtkaspell->dictionary_path    = dictionary_path;
+
        gtkaspell->gtkaspeller        = gtkaspeller;
        gtkaspell->alternate_speller  = NULL;
        gtkaspell->theword[0]         = 0x00;
@@ -346,6 +348,8 @@ void gtkaspell_delete(GtkAspell * gtkaspell)
 
        if (gtkaspell->suggestions_list)
                free_suggestions_list(gtkaspell);
+
+       g_free((gchar *)gtkaspell->dictionary_path);
        
        debug_print("Aspell: deleting gtkaspell %0x\n", (guint) gtkaspell);
 
@@ -1801,7 +1805,7 @@ static void populate_submenu(GtkAspell *gtkaspell, GtkWidget *menu)
                        gtk_widget_destroy(GTK_WIDGET(amenu->data));
                        amenu = alist;
                }
-}
+       }
        
        dictname = g_strdup_printf(_("Dictionary: %s"),
                                   gtkaspeller->dictionary->dictname);
@@ -1887,7 +1891,7 @@ static void populate_submenu(GtkAspell *gtkaspell, GtkWidget *menu)
 
        /* 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;
similarity index 96%
rename from src/gtkaspell.h
rename to src/gtk/gtkaspell.h
index 8405aa4c9e101490b6ff5b1e6236f62c6b961856..7408f25ef74e29465f05ea312cc991c65394257e 100644 (file)
@@ -67,6 +67,8 @@ typedef void (*ContCheckFunc) (gpointer *gtkaspell);
 
 typedef struct _GtkAspell
 {
+       const gchar     *dictionary_path;
+
        GtkAspeller     *gtkaspeller;
        GtkAspeller     *alternate_speller;
        gchar            theword[GTKASPELLWORDSIZE];
@@ -103,7 +105,8 @@ GtkAspellCheckers*  gtkaspell_checkers_delete       (void);
 
 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,