gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2008-09-16 [colin] 3.5.0cvs110

Browse source 
* src/prefs_account.c
	* src/prefs_folder_item.c
	* src/prefs_spelling.c
	* src/gtk/gtkaspell.c
		Better stripping of aspell dictionaries names
This commit is contained in:
Colin Leroy 2008-09-16 20:40:24 +00:00
parent 085c217b8e
commit 0497785c06
7 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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

1
PATCHSETS
View file

@ -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.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

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=5
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=109
EXTRA_VERSION=110
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

14
src/gtk/gtkaspell.c
View file

@ -393,6 +393,9 @@ GtkAspell *gtkaspell_new(const gchar *dictionary,
dict->dictname = g_strdup(dictionary);
}
if (strchr(dictionary, '-')) {
*(strchr(dictionary, '-')) = '\0';
}
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);
}
if (strchr(alt_dictionary, '-')) {
*(strchr(alt_dictionary, '-')) = '\0';
}
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);
}
if (strchr(dictionary, '-')) {
*(strchr(dictionary, '-')) = '\0';
}
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);
}
if (strchr(alt_dictionary, '-')) {
*(strchr(alt_dictionary, '-')) = '\0';
}
gtkaspeller = gtkaspeller_new(dict);
if (!gtkaspeller) {

3
src/prefs_account.c
View file

@ -4538,6 +4538,9 @@ static void prefs_account_compose_default_dictionary_set_optmenu_from_string
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),

6
src/prefs_folder_item.c
View file

@ -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;
}
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);
@ -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;
}
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);

6
src/prefs_spelling.c
View file

@ -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;
}
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);