2008-09-16 [colin] 3.5.0cvs110

	* src/prefs_account.c
	* src/prefs_folder_item.c
	* src/prefs_spelling.c
	* src/gtk/gtkaspell.c
		Better stripping of aspell dictionaries names

diff --git a/ChangeLog b/ChangeLog
index fc0167827c87b0e95910d6b0eea6502e666a2ae5..799ebd7d8bac76757d081511f4bca5b33b97f842 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-16 [colin]     3.5.0cvs110
+
+       * src/prefs_account.c
+       * src/prefs_folder_item.c
+       * src/prefs_spelling.c
+       * src/gtk/gtkaspell.c
+               Better stripping of aspell dictionaries names
+

 2008-09-16 [colin]     3.5.0cvs109
 
        * src/account.c
 2008-09-16 [colin]     3.5.0cvs109
 
        * src/account.c

diff --git a/PATCHSETS b/PATCHSETS
index 732b3b3640ffb729aea4fe3ae4366113b603a340..22f7b78a097dca37fbd46f27626473887637b649 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3521,3 +3521,4 @@
 ( cvs diff -u -r 1.382.2.476 -r 1.382.2.477 src/compose.c;  ) > 3.5.0cvs107.patchset
 ( cvs diff -u -r 1.94.2.185 -r 1.94.2.186 src/messageview.c;  cvs diff -u -r 1.2.2.33 -r 1.2.2.34 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/inputdialog.h;  ) > 3.5.0cvs108.patchset
 ( cvs diff -u -r 1.61.2.85 -r 1.61.2.86 src/account.c;  cvs diff -u -r 1.149.2.95 -r 1.149.2.96 src/inc.c;  cvs diff -u -r 1.274.2.272 -r 1.274.2.273 src/mainwindow.c;  cvs diff -u -r 1.49.2.40 -r 1.49.2.41 src/prefs_account.h;  cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/prefs_other.c;  cvs diff -u -r 1.17.2.50 -r 1.17.2.51 src/send_message.c;  cvs diff -u -r 1.2.2.34 -r 1.2.2.35 src/gtk/inputdialog.c;  ) > 3.5.0cvs109.patchset
 ( cvs diff -u -r 1.382.2.476 -r 1.382.2.477 src/compose.c;  ) > 3.5.0cvs107.patchset
 ( cvs diff -u -r 1.94.2.185 -r 1.94.2.186 src/messageview.c;  cvs diff -u -r 1.2.2.33 -r 1.2.2.34 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/inputdialog.h;  ) > 3.5.0cvs108.patchset
 ( cvs diff -u -r 1.61.2.85 -r 1.61.2.86 src/account.c;  cvs diff -u -r 1.149.2.95 -r 1.149.2.96 src/inc.c;  cvs diff -u -r 1.274.2.272 -r 1.274.2.273 src/mainwindow.c;  cvs diff -u -r 1.49.2.40 -r 1.49.2.41 src/prefs_account.h;  cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/prefs_other.c;  cvs diff -u -r 1.17.2.50 -r 1.17.2.51 src/send_message.c;  cvs diff -u -r 1.2.2.34 -r 1.2.2.35 src/gtk/inputdialog.c;  ) > 3.5.0cvs109.patchset

+( cvs diff -u -r 1.105.2.145 -r 1.105.2.146 src/prefs_account.c;  cvs diff -u -r 1.52.2.67 -r 1.52.2.68 src/prefs_folder_item.c;  cvs diff -u -r 1.5.2.37 -r 1.5.2.38 src/prefs_spelling.c;  cvs diff -u -r 1.9.2.61 -r 1.9.2.62 src/gtk/gtkaspell.c;  ) > 3.5.0cvs110.patchset

diff --git a/configure.ac b/configure.ac
index 03367d108bd4d0e012c30e6fd3fdcc50bf4c26a1..2b8b00a64dcc2ffe1879bfb477d840532bef0fde 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=109
+EXTRA_VERSION=110

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index 2c9fea598091a2e62e524cefe01d4acfeb2f17c9..2870b8ad1c0775bfe99b2a620f12ace9a5d7ab9f 100644 (file)
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -393,6 +393,9 @@ GtkAspell *gtkaspell_new(const gchar *dictionary,
                dict->dictname = g_strdup(dictionary);
        }
 
                dict->dictname = g_strdup(dictionary);
        }
 

+       if (strchr(dictionary, '-')) {
+               *(strchr(dictionary, '-')) = '\0';
+       }

        gtkaspeller    = gtkaspeller_new(dict); 
        dictionary_delete(dict);
 
        gtkaspeller    = gtkaspeller_new(dict); 
        dictionary_delete(dict);
 


@@ -418,6 +421,9 @@ GtkAspell *gtkaspell_new(const gchar *dictionary,
                        alt_dict->fullname = g_strdup(alt_dictionary);
                        alt_dict->dictname = g_strdup(alt_dictionary);
                }
                        alt_dict->fullname = g_strdup(alt_dictionary);
                        alt_dict->dictname = g_strdup(alt_dictionary);
                }

+               if (strchr(alt_dictionary, '-')) {
+                       *(strchr(alt_dictionary, '-')) = '\0';
+               }

 
                alt_gtkaspeller    = gtkaspeller_new(alt_dict);
                dictionary_delete(alt_dict);
 
                alt_gtkaspeller    = gtkaspeller_new(alt_dict);
                dictionary_delete(alt_dict);


@@ -2055,6 +2061,10 @@ gboolean gtkaspell_change_dict(GtkAspell *gtkaspell, const gchar *dictionary,
                dict->dictname = g_strdup(dictionary);
        }
 
                dict->dictname = g_strdup(dictionary);
        }
 

+       if (strchr(dictionary, '-')) {
+               *(strchr(dictionary, '-')) = '\0';
+       }
+

        gtkaspeller = gtkaspeller_new(dict);
 
        if (!gtkaspeller) {
        gtkaspeller = gtkaspeller_new(dict);
 
        if (!gtkaspeller) {


@@ -2101,6 +2111,10 @@ gboolean gtkaspell_change_alt_dict(GtkAspell *gtkaspell, const gchar *alt_dictio
                dict->dictname = g_strdup(alt_dictionary);
        }
 
                dict->dictname = g_strdup(alt_dictionary);
        }
 

+       if (strchr(alt_dictionary, '-')) {
+               *(strchr(alt_dictionary, '-')) = '\0';
+       }
+

        gtkaspeller = gtkaspeller_new(dict);
 
        if (!gtkaspeller) {
        gtkaspeller = gtkaspeller_new(dict);
 
        if (!gtkaspeller) {

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 25a01ba4995299314dc61f2056b7992369f9990d..4f17d82c8bb12086eee125af925fe87c6696560b 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -4538,6 +4538,9 @@ static void prefs_account_compose_default_dictionary_set_optmenu_from_string
                dictionary = g_strdup(strrchr(dictionary, '/')+1);
        }
 
                dictionary = g_strdup(strrchr(dictionary, '/')+1);
        }
 

+       if (strchr(dictionary, '-')) {
+               *(strchr(dictionary, '-')) = '\0';
+       }

        combo = *pparam->widget;
        if (dictionary)
                gtkaspell_set_dictionary_menu_active_item(GTK_COMBO_BOX(combo), 
        combo = *pparam->widget;
        if (dictionary)
                gtkaspell_set_dictionary_menu_active_item(GTK_COMBO_BOX(combo), 

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 5d66a893548fc80ccc72b721d04de666caac4e5f..f4ef920e7d3d977598c0f2933040d7989708e8ac 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -939,6 +939,9 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                item->prefs->default_dictionary = tmp;
                dictionary = item->prefs->default_dictionary;
        }
                item->prefs->default_dictionary = tmp;
                dictionary = item->prefs->default_dictionary;
        }

+       if (strchr(item->prefs->default_dictionary, '-')) {
+               *(strchr(item->prefs->default_dictionary, '-')) = '\0';
+       }

        if (dictionary)
                gtkaspell_set_dictionary_menu_active_item(
                        GTK_COMBO_BOX(combo_default_dictionary), dictionary);
        if (dictionary)
                gtkaspell_set_dictionary_menu_active_item(
                        GTK_COMBO_BOX(combo_default_dictionary), dictionary);


@@ -969,6 +972,9 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                item->prefs->default_alt_dictionary = tmp;
                dictionary = item->prefs->default_alt_dictionary;
        }
                item->prefs->default_alt_dictionary = tmp;
                dictionary = item->prefs->default_alt_dictionary;
        }

+       if (strchr(item->prefs->default_alt_dictionary, '-')) {
+               *(strchr(item->prefs->default_alt_dictionary, '-')) = '\0';
+       }

        if (dictionary)
                gtkaspell_set_dictionary_menu_active_item(
                        GTK_COMBO_BOX(combo_default_alt_dictionary), dictionary);
        if (dictionary)
                gtkaspell_set_dictionary_menu_active_item(
                        GTK_COMBO_BOX(combo_default_alt_dictionary), dictionary);

diff --git a/src/prefs_spelling.c b/src/prefs_spelling.c
index 6c8f9bb9c6a562edde39fcaf4ac6990e5c55c33a..b9de1cc720166d8feb421cb34cd4c766a7818da2 100644 (file)
--- a/src/prefs_spelling.c
+++ b/src/prefs_spelling.c
@@ -238,6 +238,12 @@ static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gp
                g_free(prefs_common.alt_dictionary);
                prefs_common.alt_dictionary = tmp;
        }
                g_free(prefs_common.alt_dictionary);
                prefs_common.alt_dictionary = tmp;
        }

+       if (strchr(prefs_common.dictionary, '-')) {
+               *(strchr(prefs_common.dictionary, '-')) = '\0';
+       }
+       if (strchr(prefs_common.alt_dictionary, '-')) {
+               *(strchr(prefs_common.alt_dictionary, '-')) = '\0';
+       }

        gtkaspell_set_dictionary_menu_active_item(GTK_COMBO_BOX(default_dict_combo),
                                                prefs_common.dictionary);
 
        gtkaspell_set_dictionary_menu_active_item(GTK_COMBO_BOX(default_dict_combo),
                                                prefs_common.dictionary);