From 8ae3cc4075d716bccfe08bc1b40f24f853ae47dd Mon Sep 17 00:00:00 2001
From: Lains <lainsce@airmail.cc>
Date: Sun, 14 Feb 2021 15:50:55 -0300
Subject: [PATCH] * - Fix warnings that were printed when running the app

---
 data/ui/headerbar.ui        |  3 +--
 src/MainWindow.vala         |  1 -
 src/Widgets/HeaderBar.vala  | 14 ++++----------
 src/Widgets/SourceView.vala | 13 ++++---------
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/data/ui/headerbar.ui b/data/ui/headerbar.ui
index 40b6d5df..74fe8b4f 100644
--- a/data/ui/headerbar.ui
+++ b/data/ui/headerbar.ui
@@ -217,8 +217,7 @@
             <property name="can-focus">False</property>
           </object>
           <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index e31003a3..45807a5c 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -508,7 +508,6 @@ namespace Quilter {
             unowned Gtk.Container parent = widget.get_parent ();
             if (parent != null) {
                 parent.remove (widget);
-                widget.unparent ();
             } else {
                 return;
             }
diff --git a/src/Widgets/HeaderBar.vala b/src/Widgets/HeaderBar.vala
index 3e5bb403..c1a960b4 100644
--- a/src/Widgets/HeaderBar.vala
+++ b/src/Widgets/HeaderBar.vala
@@ -165,21 +165,15 @@ namespace Quilter {
             var view_mode_context = view_mode.get_style_context ();
             view_mode_context.add_class ("flat");
 
-            if (Quilter.Application.gsettings.get_string("preview-type") == "full") {
-                top_grid.attach (view_mode, 0, 2, 4, 1);
-                view_mode.visible = true;
-            } else {
-                top_grid.remove (view_mode);
-                view_mode.visible = true;
-            }
+            top_grid.attach (view_mode, 0, 2, 4, 1);
 
             Quilter.Application.gsettings.changed.connect (() => {
                 if (Quilter.Application.gsettings.get_string("preview-type") == "full") {
-                    top_grid.attach (view_mode, 0, 2, 4, 1);
+                    view_mode.no_show_all = false;
                     view_mode.visible = true;
                 } else {
-                    top_grid.remove (view_mode);
-                    view_mode.visible = true;
+                    view_mode.no_show_all = true;
+                    view_mode.visible = false;
                 }
             });
         }
diff --git a/src/Widgets/SourceView.vala b/src/Widgets/SourceView.vala
index 167693ab..c8486a88 100644
--- a/src/Widgets/SourceView.vala
+++ b/src/Widgets/SourceView.vala
@@ -455,15 +455,10 @@ namespace Quilter.Services {
         public Gee.TreeSet<string> cnbuf_list = new Gee.TreeSet<string> ();
 
         public POSFiles () {
-            var dirs = GLib.Environment.get_system_data_dirs();
-
-            for (int i = dirs.length - 1; i >= 0; i--) {
-                var vpath = Path.build_filename (dirs[i], "io.github.lainsce.Quilter", "wordlist");
-                file_verbs = File.new_for_path(vpath + "/verb.txt");
-                file_adj = File.new_for_path(vpath + "/adjective.txt");
-                file_adverbs = File.new_for_path(vpath + "/adverb.txt");
-                file_conj = File.new_for_path(vpath + "/conjunction.txt");
-            }
+            file_verbs = File.new_for_path(Environment.get_system_data_dirs()[0] + "/io.github.lainsce.Quilter/wordlist/verb.txt");
+            file_adj = File.new_for_path(Environment.get_system_data_dirs()[0] + "/io.github.lainsce.Quilter/wordlist/adjective.txt");
+            file_adverbs = File.new_for_path(Environment.get_system_data_dirs()[0] + "/io.github.lainsce.Quilter/wordlist/adverb.txt");
+            file_conj = File.new_for_path(Environment.get_system_data_dirs()[0] + "/io.github.lainsce.Quilter/wordlist/conjunction.txt");
 
             try {
                 GLib.FileUtils.get_contents (file_verbs.get_path (), out vbuf, null);