Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 mail/sylpheed/HISTORY        |    6 ++
 mail/sylpheed/PRE_BUILD      |    5 +-
 mail/sylpheed/patch-gtkspell |   93 
+++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 102 insertions(+), 2 deletions(-)

New commits:
commit 1511a6d55efef3bbf740d43c98814592223f2a3b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    sylpheed: added gtkspell patch: it doesn't use aspell directly anymore, 
via enchant only.

diff --git a/mail/sylpheed/HISTORY b/mail/sylpheed/HISTORY
index 7015839..bd393b2 100644
--- a/mail/sylpheed/HISTORY
+++ b/mail/sylpheed/HISTORY
@@ -1,3 +1,7 @@
+2008-05-28 Vlad Glagolev <stealth AT sourcemage.org>
+       * PRE_BUILD: SPELL > SCRIPT, added gtkspell patch: it doesn't use
+         aspell directly anymore, via enchant only.
+
 2008-02-25 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated 1.0 branch to 1.0.6
        * INSTALL: added installation of a 48x48 png icon
@@ -294,6 +298,6 @@
        * DETAILS: Version++ (0.7.4)
 
 2002-03-15 M.L. <m.l AT compaqnet.fr>
-       * HISTORY: Added 
+       * HISTORY: Added
        * DETAILS: MAINTAINTER field.
 
diff --git a/mail/sylpheed/PRE_BUILD b/mail/sylpheed/PRE_BUILD
index 7447a90..e7794a1 100755
--- a/mail/sylpheed/PRE_BUILD
+++ b/mail/sylpheed/PRE_BUILD
@@ -1,5 +1,8 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SPELL_DIRECTORY/patch-gtkspell &&
+
 if [[ $NO_USERAGENT == y ]]; then
-  patch -p0 < ${SCRIPT_DIRECTORY}/patch-src_compose_c
+  patch -p0 < $SPELL_DIRECTORY/patch-src_compose_c
 fi
diff --git a/mail/sylpheed/patch-gtkspell b/mail/sylpheed/patch-gtkspell
new file mode 100644
index 0000000..c737b2a
--- /dev/null
+++ b/mail/sylpheed/patch-gtkspell
@@ -0,0 +1,93 @@
+--- src/compose.c      2007-09-28 07:46:21.000000000 +0200
++++ src/compose.c      2007-12-24 23:15:31.000000000 +0100
+@@ -67,7 +67,7 @@
+ #if USE_GTKSPELL
+ #  include <gtk/gtkradiomenuitem.h>
+ #  include <gtkspell/gtkspell.h>
+-#  include <aspell.h>
++#  include <enchant/enchant.h>
+ #endif
+ 
+ #include <stdio.h>
+@@ -4889,6 +4889,7 @@
+ #ifdef USE_GTKSPELL
+       compose->check_spell = prefs_common.check_spell;
+       compose->spell_lang  = g_strdup(prefs_common.spell_lang);
++      compose->spell_dict_list = NULL;
+       compose->spell_menu  = spell_menu;
+ #endif /* USE_GTKSPELL */
+ 
+@@ -5320,26 +5321,30 @@
+ #if USE_GTKSPELL
+ static void compose_set_spell_lang_menu(Compose *compose)
+ {
+-      AspellConfig *config;
+-      AspellDictInfoList *dlist;
+-      AspellDictInfoEnumeration *dels;
+-      const AspellDictInfo *entry;
++      EnchantBroker* eb;
+       GSList *dict_list = NULL, *menu_list = NULL, *cur;
+       GtkWidget *menu;
+       gboolean lang_set = FALSE;
+ 
+-      config = new_aspell_config();
+-      dlist = get_aspell_dict_info_list(config);
+-      delete_aspell_config(config);
+-
+-      dels = aspell_dict_info_list_elements(dlist);
+-      while ((entry = aspell_dict_info_enumeration_next(dels)) != 0) {
+-              dict_list = g_slist_append(dict_list, (gchar *)entry->name);
+-              if (compose->spell_lang != NULL &&
+-                  g_ascii_strcasecmp(compose->spell_lang, entry->name) == 0)
+-                      lang_set = TRUE;
++        void enchDictDescCb (const char * const lang_tag,
++                           const char * const provider_name,
++                           const char * const provider_desc,
++                           const char * const provider_file,
++                           void * user_data)
++      {
++        dict_list = g_slist_append(dict_list, g_strdup((gchar*)lang_tag));
++      }
++
++        eb = enchant_broker_init();
++        enchant_broker_list_dicts (eb, enchDictDescCb, &dict_list);
++        compose->spell_dict_list = dict_list;
++      enchant_broker_free(eb);
++
++      for (cur = dict_list; cur!=NULL; cur = cur->next) {
++        if (compose->spell_lang != NULL &&
++            g_ascii_strcasecmp(compose->spell_lang, cur->data) == 0)
++            lang_set = TRUE;
+       }
+-      delete_aspell_dict_info_enumeration(dels);
+ 
+       menu = gtk_menu_new();
+ 
+@@ -5499,6 +5504,7 @@
+       AttachInfo *ainfo;
+       GtkTextBuffer *buffer;
+       GtkClipboard *clipboard;
++      GSList *cur;
+ 
+       compose_list = g_list_remove(compose_list, compose);
+ 
+@@ -5510,6 +5516,9 @@
+       address_completion_end(compose->window);
+ 
+ #if USE_GTKSPELL
++      for (cur = compose->spell_dict_list; cur!=NULL; cur = cur->next) {
++        g_free((gchar*)cur->data);
++      }
+       g_free(compose->spell_lang);
+ #endif
+ 
+--- src/compose.h      2007-07-12 04:56:58.000000000 +0200
++++ src/compose.h      2007-12-24 23:03:27.000000000 +0100
+@@ -135,6 +135,7 @@
+ #if USE_GTKSPELL
+         GtkWidget *spell_menu;
+         gchar     *spell_lang;
++        GSList *spell_dict_list;
+         gboolean   check_spell;
+ #endif
+ 
\ No newline at end of file