anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Don't keep own reference to GspellTextView/Buffer

Browse source 
fixes #1058
This commit is contained in:
fiaxh 2021-07-29 15:13:03 +02:00
parent 2ea4fa0ce6
commit defdf8e6ae
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
main/src/ui/chat_input/spell_checker.vala
View file

@ -1,6 +1,5 @@
using Gdk; using Gdk;
using Gee; using Gee;
using Gspell;
using Dino.Entities; using Dino.Entities;
@ -9,12 +8,14 @@ namespace Dino.Ui {
public class SpellChecker { public class SpellChecker {
private Conversation? conversation; private Conversation? conversation;
private TextView text_view; private Gtk.TextView text_input;
private TextBuffer text_buffer;
public SpellChecker(Gtk.TextView text_input) { public SpellChecker(Gtk.TextView text_input) {
this.text_view = TextView.get_from_gtk_text_view(text_input); this.text_input = text_input;
this.text_buffer = TextBuffer.get_from_gtk_text_buffer(text_view.view.buffer);
// We can't keep a reference to GspellTextView/Buffer around, otherwise they'd get freed twice
Gspell.TextView text_view = Gspell.TextView.get_from_gtk_text_view(text_input);
Gspell.TextBuffer text_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer(text_view.view.buffer);
text_view.basic_setup(); text_view.basic_setup();
text_buffer.spell_checker.notify["language"].connect(lang_changed); text_buffer.spell_checker.notify["language"].connect(lang_changed);
@ -32,11 +33,14 @@ public class SpellChecker {
public void initialize_for_conversation(Conversation conversation) { public void initialize_for_conversation(Conversation conversation) {
this.conversation = conversation; this.conversation = conversation;
Gspell.TextView text_view = Gspell.TextView.get_from_gtk_text_view(text_input);
Gspell.TextBuffer text_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer(text_view.view.buffer);
if (!Dino.Application.get_default().settings.check_spelling) { if (!Dino.Application.get_default().settings.check_spelling) {
text_buffer.set_spell_checker(null); text_buffer.set_spell_checker(null);
return; return;
} }
if (text_buffer.spell_checker == null) text_buffer.spell_checker = new Checker(null); if (text_buffer.spell_checker == null) text_buffer.spell_checker = new Gspell.Checker(null);
// Set the conversation language (from cache or db) // Set the conversation language (from cache or db)
text_buffer.spell_checker.notify["language"].disconnect(lang_changed); text_buffer.spell_checker.notify["language"].disconnect(lang_changed);
@ -48,7 +52,7 @@ public class SpellChecker {
.single().row(); .single().row();
if (row_option.is_present()) { if (row_option.is_present()) {
string lang_code = row_option.inner[db.conversation_settings.value]; string lang_code = row_option.inner[db.conversation_settings.value];
Language? lang = Language.lookup(lang_code); Gspell.Language? lang = Gspell.Language.lookup(lang_code);
text_buffer.spell_checker.language = lang; text_buffer.spell_checker.language = lang;
} else { } else {
text_buffer.spell_checker.language = null; text_buffer.spell_checker.language = null;
@ -60,8 +64,11 @@ public class SpellChecker {
private void lang_changed() { private void lang_changed() {
var db = Dino.Application.get_default().db; var db = Dino.Application.get_default().db;
Checker spell_checker = text_buffer.spell_checker; Gspell.TextView text_view = Gspell.TextView.get_from_gtk_text_view(text_input);
Gspell.TextBuffer text_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer(text_view.view.buffer);
Gspell.Checker spell_checker = text_buffer.spell_checker;
if (spell_checker.language.get_code() == null) return; if (spell_checker.language.get_code() == null) return;
db.conversation_settings.upsert() db.conversation_settings.upsert()
.value(db.conversation_settings.conversation_id, conversation.id, true) .value(db.conversation_settings.conversation_id, conversation.id, true)
.value(db.conversation_settings.key, "lang", true) .value(db.conversation_settings.key, "lang", true)