aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch
blob: 42900c3806277cebddc9763514ca034e424de5dc (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
From 4fd6da39ab33a6eef46ee2c64eb4f5595c7fe633 Mon Sep 17 00:00:00 2001
Message-Id: <4fd6da39ab33a6eef46ee2c64eb4f5595c7fe633.1599180249.git-series.worldofpeace@protonmail.ch>
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu,  3 Sep 2020 20:43:25 -0400
Subject: [PATCH] Remove Install Unlisted Engines function

https://github.com/elementary/switchboard-plug-keyboard/issues/324
---
 src/Dialogs/InstallEngineDialog.vala           | 140 +------------------
 src/Dialogs/ProgressDialog.vala                |  82 +----------
 src/InputMethod/Installer/InstallList.vala     |  73 +---------
 src/InputMethod/Installer/UbuntuInstaller.vala | 142 +------------------
 src/InputMethod/Installer/aptd-client.vala     |  93 +------------
 src/Widgets/InputMethod/AddEnginesPopover.vala |  12 +--
 src/Widgets/InputMethod/LanguagesRow.vala      |  43 +-----
 src/meson.build                                |   6 +-
 8 files changed, 591 deletions(-)
 delete mode 100644 src/Dialogs/InstallEngineDialog.vala
 delete mode 100644 src/Dialogs/ProgressDialog.vala
 delete mode 100644 src/InputMethod/Installer/InstallList.vala
 delete mode 100644 src/InputMethod/Installer/UbuntuInstaller.vala
 delete mode 100644 src/InputMethod/Installer/aptd-client.vala
 delete mode 100644 src/Widgets/InputMethod/LanguagesRow.vala

diff --git a/src/Dialogs/InstallEngineDialog.vala b/src/Dialogs/InstallEngineDialog.vala
deleted file mode 100644
index ffba3a8..0000000
--- a/src/Dialogs/InstallEngineDialog.vala
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-* Copyright 2019-2020 elementary, Inc. (https://elementary.io)
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-public class Pantheon.Keyboard.InputMethodPage.InstallEngineDialog : Granite.MessageDialog {
-    private InstallList? engines_filter;
-
-    public InstallEngineDialog (Gtk.Window parent) {
-        Object (
-            primary_text: _("Choose an engine to install"),
-            secondary_text: _("Select an engine from the list to install and use."),
-            image_icon: new ThemedIcon ("extension"),
-            transient_for: parent,
-            buttons: Gtk.ButtonsType.CANCEL
-        );
-    }
-
-    construct {
-        var languages_list = new Gtk.ListBox () {
-            activate_on_single_click = true,
-            expand = true,
-            selection_mode = Gtk.SelectionMode.NONE
-        };
-
-        foreach (var language in InstallList.get_all ()) {
-            var lang = new LanguagesRow (language);
-            languages_list.add (lang);
-        }
-
-        var back_button = new Gtk.Button.with_label (_("Languages")) {
-            halign = Gtk.Align.START,
-            margin = 6
-        };
-        back_button.get_style_context ().add_class (Granite.STYLE_CLASS_BACK_BUTTON);
-
-        var language_title = new Gtk.Label ("");
-
-        var language_header = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
-        language_header.pack_start (back_button);
-        language_header.set_center_widget (language_title);
-
-        var listbox = new Gtk.ListBox () {
-            expand = true
-        };
-        listbox.set_filter_func (filter_function);
-        listbox.set_sort_func (sort_function);
-
-        foreach (var language in InstallList.get_all ()) {
-            foreach (var engine in language.get_components ()) {
-                listbox.add (new EnginesRow (engine));
-            }
-        }
-
-        var scrolled = new Gtk.ScrolledWindow (null, null);
-        scrolled.add (listbox);
-
-        var engine_list_grid = new Gtk.Grid () {
-            orientation = Gtk.Orientation.VERTICAL
-        };
-        engine_list_grid.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
-        engine_list_grid.add (language_header);
-        engine_list_grid.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
-        engine_list_grid.add (scrolled);
-
-        var stack = new Gtk.Stack () {
-            height_request = 200,
-            width_request = 300,
-            transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT
-        };
-        stack.add (languages_list);
-        stack.add (engine_list_grid);
-
-        var frame = new Gtk.Frame (null);
-        frame.add (stack);
-
-        custom_bin.add (frame);
-        custom_bin.show_all ();
-
-        var install_button = add_button (_("Install"), Gtk.ResponseType.OK);
-        install_button.sensitive = false;
-        install_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
-
-        languages_list.row_activated.connect ((row) => {
-            stack.visible_child = engine_list_grid;
-            language_title.label = ((LanguagesRow) row).language.get_name ();
-            engines_filter = ((LanguagesRow) row).language;
-            listbox.invalidate_filter ();
-            var adjustment = scrolled.get_vadjustment ();
-            adjustment.set_value (adjustment.lower);
-        });
-
-        back_button.clicked.connect (() => {
-            stack.visible_child = languages_list;
-            install_button.sensitive = false;
-        });
-
-        listbox.selected_rows_changed.connect (() => {
-            foreach (var engines_row in listbox.get_children ()) {
-                ((EnginesRow) engines_row).selected = false;
-            }
-
-            ((EnginesRow) listbox.get_selected_row ()).selected = true;
-            install_button.sensitive = true;
-        });
-
-        response.connect ((response_id) => {
-            if (response_id == Gtk.ResponseType.OK) {
-                string engine_to_install = ((EnginesRow) listbox.get_selected_row ()).engine_name;
-                UbuntuInstaller.get_default ().install (engine_to_install);
-            }
-        });
-    }
-
-    [CCode (instance_pos = -1)]
-    private bool filter_function (Gtk.ListBoxRow row) {
-        if (InstallList.get_language_from_engine_name (((EnginesRow) row).engine_name) == engines_filter) {
-            return true;
-        }
-
-        return false;
-    }
-
-    [CCode (instance_pos = -1)]
-    private int sort_function (Gtk.ListBoxRow row1, Gtk.ListBoxRow row2) {
-        return ((EnginesRow) row1).engine_name.collate (((EnginesRow) row1).engine_name);
-    }
-}
diff --git a/src/Dialogs/ProgressDialog.vala b/src/Dialogs/ProgressDialog.vala
deleted file mode 100644
index f110aca..0000000
--- a/src/Dialogs/ProgressDialog.vala
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-* Copyright 2011-2020 elementary, Inc. (https://elementary.io)
-*
-* This program is free software: you can redistribute it
-* and/or modify it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation, either version 3 of the
-* License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-* Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along
-* with this program. If not, see http://www.gnu.org/licenses/.
-*/
-
-public class Pantheon.Keyboard.InputMethodPage.ProgressDialog : Gtk.Dialog {
-    public int progress {
-        set {
-            if (value >= 100) {
-                destroy ();
-            }
-
-            progress_bar.fraction = value / 100.0;
-        }
-    }
-
-    private Gtk.ProgressBar progress_bar;
-
-    construct {
-        var image = new Gtk.Image.from_icon_name ("preferences-desktop-locale", Gtk.IconSize.DIALOG) {
-            valign = Gtk.Align.START
-        };
-
-        var primary_label = new Gtk.Label (null) {
-            max_width_chars = 50,
-            wrap = true,
-            xalign = 0
-        };
-        primary_label.get_style_context ().add_class (Granite.STYLE_CLASS_PRIMARY_LABEL);
-
-        unowned UbuntuInstaller installer = UbuntuInstaller.get_default ();
-        switch (installer.transaction_mode) {
-            case UbuntuInstaller.TransactionMode.INSTALL:
-                primary_label.label = _("Installing %s").printf (installer.engine_to_address);
-                break;
-            case UbuntuInstaller.TransactionMode.REMOVE:
-                primary_label.label = _("Removing %s").printf (installer.engine_to_address);
-                break;
-        }
-
-        progress_bar = new Gtk.ProgressBar () {
-            hexpand = true,
-            valign = Gtk.Align.START,
-            width_request = 300
-        };
-
-        var cancel_button = (Gtk.Button) add_button (_("Cancel"), 0);
-
-        installer.bind_property ("install-cancellable", cancel_button, "sensitive");
-
-        var grid = new Gtk.Grid () {
-            column_spacing = 12,
-            margin = 6,
-            row_spacing = 6
-        };
-        grid.attach (image, 0, 0, 1, 2);
-        grid.attach (primary_label, 1, 0);
-        grid.attach (progress_bar, 1, 1);
-        grid.show_all ();
-
-        border_width = 6;
-        deletable = false;
-        get_content_area ().add (grid);
-
-        cancel_button.clicked.connect (() => {
-            installer.cancel_install ();
-            destroy ();
-        });
-    }
-}
diff --git a/src/InputMethod/Installer/InstallList.vala b/src/InputMethod/Installer/InstallList.vala
deleted file mode 100644
index 275c302..0000000
--- a/src/InputMethod/Installer/InstallList.vala
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-* 2019-2020 elementary, Inc. (https://elementary.io)
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-public enum Pantheon.Keyboard.InputMethodPage.InstallList {
-    JA,
-    KO,
-    ZH;
-
-    public string get_name () {
-        switch (this) {
-            case JA:
-                return _("Japanese");
-            case KO:
-                return _("Korean");
-            case ZH:
-                return _("Chinese");
-            default:
-                assert_not_reached ();
-        }
-    }
-
-    public string[] get_components () {
-        switch (this) {
-            case JA:
-                return { "ibus-anthy", "ibus-mozc", "ibus-skk" };
-            case KO:
-                return { "ibus-hangul" };
-            case ZH:
-                return { "ibus-cangjie", "ibus-chewing", "ibus-pinyin" };
-            default:
-                assert_not_reached ();
-        }
-    }
-
-    public static InstallList get_language_from_engine_name (string engine_name) {
-        switch (engine_name) {
-            case "ibus-anthy":
-                return JA;
-            case "ibus-mozc":
-                return JA;
-            case "ibus-skk":
-                return JA;
-            case "ibus-hangul":
-                return KO;
-            case "ibus-cangjie":
-                return ZH;
-            case "ibus-chewing":
-                return ZH;
-            case "ibus-pinyin":
-                return ZH;
-            default:
-                assert_not_reached ();
-        }
-    }
-
-    public static InstallList[] get_all () {
-        return { JA, KO, ZH };
-    }
-}
diff --git a/src/InputMethod/Installer/UbuntuInstaller.vala b/src/InputMethod/Installer/UbuntuInstaller.vala
deleted file mode 100644
index b65aa1f..0000000
--- a/src/InputMethod/Installer/UbuntuInstaller.vala
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-* Copyright 2011-2020 elementary, Inc. (https://elementary.io)
-*
-* This program is free software: you can redistribute it
-* and/or modify it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation, either version 3 of the
-* License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-* Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along
-* with this program. If not, see http://www.gnu.org/licenses/.
-*/
-
-public class Pantheon.Keyboard.InputMethodPage.UbuntuInstaller : Object {
-    private AptdProxy aptd;
-    private AptdTransactionProxy proxy;
-
-    public bool install_cancellable { get; private set; }
-    public TransactionMode transaction_mode { get; private set; }
-    public string engine_to_address { get; private set; }
-
-    public signal void install_finished (string langcode);
-    public signal void install_failed ();
-    public signal void remove_finished (string langcode);
-    public signal void progress_changed (int progress);
-
-    public enum TransactionMode {
-        INSTALL,
-        REMOVE,
-        INSTALL_MISSING,
-    }
-
-    Gee.HashMap<string, string> transactions;
-
-    private static GLib.Once<UbuntuInstaller> instance;
-    public static unowned UbuntuInstaller get_default () {
-        return instance.once (() => {
-            return new UbuntuInstaller ();
-        });
-    }
-
-    private UbuntuInstaller () {}
-
-    construct {
-        transactions = new Gee.HashMap<string, string> ();
-        aptd = new AptdProxy ();
-
-        try {
-            aptd.connect_to_aptd ();
-        } catch (Error e) {
-            warning ("Could not connect to APT daemon");
-        }
-    }
-
-    public void install (string engine_name) {
-        transaction_mode = TransactionMode.INSTALL;
-        engine_to_address = engine_name;
-        string[] packages = {};
-        packages += engine_to_address;
-
-        foreach (var packet in packages) {
-            message ("Packet: %s", packet);
-        }
-
-        aptd.install_packages.begin (packages, (obj, res) => {
-            try {
-                var transaction_id = aptd.install_packages.end (res);
-                transactions.@set (transaction_id, "i-" + engine_name);
-                run_transaction (transaction_id);
-            } catch (Error e) {
-                warning ("Could not queue downloads: %s", e.message);
-            }
-        });
-    }
-
-    public void cancel_install () {
-        if (install_cancellable) {
-            warning ("cancel_install");
-            try {
-                proxy.cancel ();
-            } catch (Error e) {
-                warning ("cannot cancel installation:%s", e.message);
-            }
-        }
-    }
-
-    private void run_transaction (string transaction_id) {
-        proxy = new AptdTransactionProxy ();
-        proxy.finished.connect (() => {
-            on_apt_finshed (transaction_id, true);
-        });
-
-        proxy.property_changed.connect ((prop, val) => {
-            if (prop == "Progress") {
-                progress_changed ((int) val.get_int32 ());
-            }
-
-            if (prop == "Cancellable") {
-                install_cancellable = val.get_boolean ();
-            }
-        });
-
-        try {
-            proxy.connect_to_aptd (transaction_id);
-            proxy.simulate ();
-
-            proxy.run ();
-        } catch (Error e) {
-            on_apt_finshed (transaction_id, false);
-            warning ("Could no run transaction: %s", e.message);
-        }
-    }
-
-    private void on_apt_finshed (string id, bool success) {
-        if (!success) {
-            install_failed ();
-            transactions.unset (id);
-            return;
-        }
-
-        if (!transactions.has_key (id)) { //transaction already removed
-            return;
-        }
-
-        var action = transactions.get (id);
-        var lang = action[2:action.length];
-
-        message ("ID %s -> %s", id, success ? "success" : "failed");
-
-        if (action[0:1] == "i") { // install
-            install_finished (lang);
-        } else {
-            remove_finished (lang);
-        }
-
-        transactions.unset (id);
-    }
-}
diff --git a/src/InputMethod/Installer/aptd-client.vala b/src/InputMethod/Installer/aptd-client.vala
deleted file mode 100644
index ee5c3f5..0000000
--- a/src/InputMethod/Installer/aptd-client.vala
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Pawel Stolowski <pawel.stolowski@canonical.com>
- */
-
-namespace Pantheon.Keyboard.InputMethodPage {
-    private const string APTD_DBUS_NAME = "org.debian.apt";
-    private const string APTD_DBUS_PATH = "/org/debian/apt";
-
-    /**
-    * Expose a subset of org.debian.apt interfaces -- only what's needed by applications lens.
-    */
-    [DBus (name = "org.debian.apt")]
-    public interface AptdService : GLib.Object {
-        public abstract async string install_packages (string[] packages) throws GLib.Error;
-        public abstract async string remove_packages (string[] packages) throws GLib.Error;
-        public abstract async void quit () throws GLib.Error;
-    }
-
-    [DBus (name = "org.debian.apt.transaction")]
-    public interface AptdTransactionService : GLib.Object {
-        public abstract void run () throws GLib.Error;
-        public abstract void simulate () throws GLib.Error;
-        public abstract void cancel () throws GLib.Error;
-        public signal void finished (string exit_state);
-        public signal void property_changed (string property, Variant val);
-    }
-
-    public class AptdProxy : GLib.Object {
-        private AptdService _aptd_service;
-
-        public void connect_to_aptd () throws GLib.Error {
-            _aptd_service = Bus.get_proxy_sync (BusType.SYSTEM, APTD_DBUS_NAME, APTD_DBUS_PATH);
-        }
-
-        public async string install_packages (string[] packages) throws GLib.Error {
-            string res = yield _aptd_service.install_packages (packages);
-            return res;
-        }
-
-        public async string remove_packages (string[] packages) throws GLib.Error {
-            string res = yield _aptd_service.remove_packages (packages);
-            return res;
-        }
-
-        public async void quit () throws GLib.Error {
-            yield _aptd_service.quit ();
-        }
-    }
-
-    public class AptdTransactionProxy : GLib.Object {
-        public signal void finished (string transaction_id);
-        public signal void property_changed (string property, Variant variant);
-
-        private AptdTransactionService _aptd_service;
-
-        public void connect_to_aptd (string transaction_id) throws GLib.Error {
-            _aptd_service = Bus.get_proxy_sync (BusType.SYSTEM, APTD_DBUS_NAME, transaction_id);
-            _aptd_service.finished.connect ((exit_state) => {
-                debug ("aptd transaction finished: %s\n", exit_state);
-                finished (transaction_id);
-            });
-            _aptd_service.property_changed.connect ((prop, variant) => {
-                property_changed (prop, variant);
-            });
-        }
-
-        public void simulate () throws GLib.Error {
-            _aptd_service.simulate ();
-        }
-
-        public void run () throws GLib.Error {
-            _aptd_service.run ();
-        }
-
-        public void cancel () throws GLib.Error {
-            _aptd_service.cancel ();
-        }
-    }
-}
diff --git a/src/Widgets/InputMethod/AddEnginesPopover.vala b/src/Widgets/InputMethod/AddEnginesPopover.vala
index 46e005d..6b56c6b 100644
--- a/src/Widgets/InputMethod/AddEnginesPopover.vala
+++ b/src/Widgets/InputMethod/AddEnginesPopover.vala
@@ -49,8 +49,6 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
         };
         scrolled.add (listbox);
 
-        var install_button = new Gtk.Button.with_label (_("Install Unlisted Engines…"));
-
         var cancel_button = new Gtk.Button.with_label (_("Cancel"));
 
         var add_button = new Gtk.Button.with_label (_("Add Engine"));
@@ -61,10 +59,8 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
             margin = 12,
             spacing = 6
         };
-        button_box.add (install_button);
         button_box.add (cancel_button);
         button_box.add (add_button);
-        button_box.set_child_secondary (install_button, true);
 
         var grid = new Gtk.Grid ();
         grid.attach (search_entry, 0, 0);
@@ -92,14 +88,6 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
             listbox.invalidate_filter ();
         });
 
-        install_button.clicked.connect (() => {
-            popdown ();
-
-            var install_dialog = new InstallEngineDialog ((Gtk.Window) get_toplevel ());
-            install_dialog.run ();
-            install_dialog.destroy ();
-        });
-
         cancel_button.clicked.connect (() => {
             popdown ();
         });
diff --git a/src/Widgets/InputMethod/LanguagesRow.vala b/src/Widgets/InputMethod/LanguagesRow.vala
deleted file mode 100644
index dc064ae..0000000
--- a/src/Widgets/InputMethod/LanguagesRow.vala
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-* 2019-2020 elementary, Inc. (https://elementary.io)
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-public class Pantheon.Keyboard.InputMethodPage.LanguagesRow : Gtk.ListBoxRow {
-    public InstallList language { get; construct; }
-
-    public LanguagesRow (InstallList language) {
-        Object (language: language);
-    }
-
-    construct {
-        var label = new Gtk.Label (language.get_name ()) {
-            halign = Gtk.Align.START,
-            hexpand = true
-        };
-
-        var caret = new Gtk.Image.from_icon_name ("pan-end-symbolic", Gtk.IconSize.MENU);
-
-        var grid = new Gtk.Grid () {
-            margin = 3,
-            margin_start = 6,
-            margin_end = 6
-        };
-        grid.add (label);
-        grid.add (caret);
-
-        add (grid);
-    }
-}
diff --git a/src/meson.build b/src/meson.build
index 28f07c1..a515419 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -16,7 +16,6 @@ plug_files = files(
     'Widgets/Shortcuts/CustomTree.vala',
     'Widgets/Layout/Display.vala',
     'Widgets/Layout/AddLayoutPopover.vala',
-    'Widgets/InputMethod/LanguagesRow.vala',
     'Widgets/InputMethod/EnginesRow.vala',
     'Widgets/InputMethod/AddEnginesPopover.vala',
     'Views/Shortcuts.vala',
@@ -36,11 +35,6 @@ plug_files = files(
     'Layout/AdvancedSettingsGrid.vala',
     'InputMethod/Utils.vala',
     'InputMethod/AddEnginesList.vala',
-    'InputMethod/Installer/UbuntuInstaller.vala',
-    'InputMethod/Installer/InstallList.vala',
-    'InputMethod/Installer/aptd-client.vala',
-    'Dialogs/ProgressDialog.vala',
-    'Dialogs/InstallEngineDialog.vala',
     'Dialogs/ConflictDialog.vala',
 )
 

base-commit: 9d9eddeb7da8450a309496c25066f4f78a9d4070
-- 
git-series 0.9.1