Browse Source

Revert "room-history: Add spell checker to message entry"

This reverts commit 2295e8a9d1.
merge-requests/1461/head
Kévin Commaille 2 years ago
parent
commit
bcee8bfd9f
No known key found for this signature in database
GPG Key ID: 29A48C1F03620416
  1. 15
      .gitlab-ci/org.gnome.Fractal.CiTest.json
  2. 30
      Cargo.lock
  3. 1
      Cargo.toml
  4. 15
      build-aux/org.gnome.Fractal.Devel.json
  5. 15
      build-aux/org.gnome.Fractal.Hack.json
  6. 1
      meson.build
  7. 9
      src/session/view/content/room_history/mod.rs

15
.gitlab-ci/org.gnome.Fractal.CiTest.json

@ -38,21 +38,6 @@
}
]
},
{
"name" : "libspelling",
"buildsystem" : "meson",
"config-opts" : [
"-Ddocs=false",
"-Dvapi=false"
],
"sources" : [
{
"type" : "archive",
"url" : "https://download.gnome.org/sources/libspelling/0.2/libspelling-0.2.0.tar.xz",
"sha256" : "fdc5609e02818eca6fc172ff164caa8e52dba638d7590130af3dfb1f28b53421"
}
]
},
{
"name": "fractal",
"buildsystem": "meson",

30
Cargo.lock generated

@ -1515,7 +1515,6 @@ dependencies = [
"indexmap 2.1.0",
"libadwaita",
"libshumate",
"libspelling",
"matrix-sdk",
"matrix-sdk-ui",
"mime",
@ -3040,35 +3039,6 @@ dependencies = [
"system-deps",
]
[[package]]
name = "libspelling"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "850363056ea48497686407e7e583c50c793896c151bbe7139ad4ea02fbf15e76"
dependencies = [
"gio",
"glib",
"gtk4",
"libc",
"libspelling-sys",
"sourceview5",
]
[[package]]
name = "libspelling-sys"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "377675d9465da676ebc05742743d5e5bc53a49be1138f463583181aea97da3c6"
dependencies = [
"gio-sys",
"glib-sys",
"gobject-sys",
"gtk4-sys",
"libc",
"sourceview5-sys",
"system-deps",
]
[[package]]
name = "libsqlite3-sys"
version = "0.26.0"

1
Cargo.toml

@ -72,7 +72,6 @@ gst_video = { version = "0.21", package = "gstreamer-video" }
gtk = { package = "gtk4", version = "0.7", features = ["v4_10"] }
shumate = { package = "libshumate", version = "0.4" }
sourceview = { package = "sourceview5", version = "0.7" }
spelling = { package = "libspelling", version = "0.1" }
[dependencies.matrix-sdk]
git = "https://github.com/matrix-org/matrix-rust-sdk.git"

15
build-aux/org.gnome.Fractal.Devel.json

@ -47,21 +47,6 @@
}
]
},
{
"name" : "libspelling",
"buildsystem" : "meson",
"config-opts" : [
"-Ddocs=false",
"-Dvapi=false"
],
"sources" : [
{
"type" : "archive",
"url" : "https://download.gnome.org/sources/libspelling/0.2/libspelling-0.2.0.tar.xz",
"sha256" : "fdc5609e02818eca6fc172ff164caa8e52dba638d7590130af3dfb1f28b53421"
}
]
},
{
"name": "fractal",
"buildsystem": "meson",

15
build-aux/org.gnome.Fractal.Hack.json

@ -53,21 +53,6 @@
}
]
},
{
"name" : "libspelling",
"buildsystem" : "meson",
"config-opts" : [
"-Ddocs=false",
"-Dvapi=false"
],
"sources" : [
{
"type" : "archive",
"url" : "https://download.gnome.org/sources/libspelling/0.2/libspelling-0.2.0.tar.xz",
"sha256" : "fdc5609e02818eca6fc172ff164caa8e52dba638d7590130af3dfb1f28b53421"
}
]
},
{
"name": "fractal",
"buildsystem": "meson",

1
meson.build

@ -33,7 +33,6 @@ dependency(
default_options: ['gtk_doc=false', 'sysprof=false', 'gir=false', 'vapi=false', 'install_tests=false']
)
dependency('libpipewire-0.3', version: '>= 0.3.0')
dependency('libspelling-1', version: '>= 0.2.0')
dependency('openssl', version: '>= 1.0.1')
dependency('shumate-1.0', version: '>= 1.0.0')
dependency('sqlite3', version: '>= 3.24.0')

9
src/session/view/content/room_history/mod.rs

@ -507,15 +507,6 @@ mod imp {
// Tab auto-completion.
self.completion.set_parent(&*self.message_entry);
// Spellchecker.
let spell_checker = spelling::Checker::default();
let adapter = spelling::TextBufferAdapter::new(&buffer, &spell_checker);
let extra_menu = adapter.menu_model();
self.message_entry.set_extra_menu(Some(&extra_menu));
self.message_entry
.insert_action_group("spelling", Some(&adapter));
adapter.set_enabled(true);
}
fn setup_drop_target(&self) {

Loading…
Cancel
Save