From 8d068a5a7973e7f74afb9af010c750e37f1391b0 Mon Sep 17 00:00:00 2001 From: Philip Rinn Date: Fri, 4 Sep 2020 15:16:29 +0200 Subject: [PATCH] Remove fallback to GtkSpell - Gspell is available everywhere now --- README | 2 +- bin/gtranscribe | 19 ++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/README b/README index 913a2fe..65367e8 100644 --- a/README +++ b/README @@ -13,7 +13,7 @@ Homepage: https://github.com/innir/gtranscribe - python3-dbus - gir1.2-gtk-3.0 - gir1.2-glib-2.0 - - gir1.2-gspell-1 OR gir1.2-gtkspell3-3.0 + - gir1.2-gspell-1 - gir1.2-gstreamer-1.0 - gir1.2-gst-plugins-base-1.0 diff --git a/bin/gtranscribe b/bin/gtranscribe index fd094d2..8d0f16d 100755 --- a/bin/gtranscribe +++ b/bin/gtranscribe @@ -31,14 +31,8 @@ from dbus.mainloop.glib import DBusGMainLoop import gi gi.require_version('Gtk', '3.0') from gi.repository import GLib, Gtk, Gdk, GdkPixbuf -try: - gi.require_version('Gspell', '1') - from gi.repository import Gspell - SPELL_FALLBACK = False -except ValueError: - gi.require_version('GtkSpell', '3.0') - from gi.repository import GtkSpell - SPELL_FALLBACK = True +gi.require_version('Gspell', '1') +from gi.repository import Gspell # Add project root directory to sys.path. PROJECT_ROOT_DIRECTORY = os.path.dirname(os.path.dirname( @@ -123,13 +117,8 @@ class gTranscribeWindow: self.window.set_default_icon(icon) self.text_view = builder.get_object("text_view") - if SPELL_FALLBACK: - schecker = GtkSpell.Checker() - schecker.set_language(locale.getdefaultlocale()[0]) - schecker.attach(self.text_view) - else: - schecker = Gspell.TextView.get_from_gtk_text_view(self.text_view) - Gspell.TextView.basic_setup(schecker) + schecker = Gspell.TextView.get_from_gtk_text_view(self.text_view) + Gspell.TextView.basic_setup(schecker) self.text_buffer = self.text_view.get_buffer() spinbutton_jump = builder.get_object("spinbutton_jump")