Plug possible memory leaks, add a legacy manifest

Author: teamcons

io.github.ellie_commons.jorts.legacy.yml

@@ -0,0 +1,33 @@
+id: com.github.lainsce.notejot
+runtime: io.elementary.Platform
+runtime-version: '8'
+sdk: io.elementary.Sdk
+command: com.github.lainsce.notejot
+finish-args:
+  - '--share=ipc'
+  - '--device=dri'
+  - '--socket=x11'
+cleanup:
+  -  '/include'
+  -  '/lib/pkgconfig'
+  -  '/man'
+  -  '/share/doc'
+  -  '/share/gtk-doc'
+  -  '/share/man'
+  -  '/share/pkgconfig'
+  -  '/share/installed-tests'
+  -  '*.la'
+  -  '*.a'
+modules:
+  - name: gtksourceview3
+    config-opts: ["--enable-gtk-doc=no"]
+    sources:
+      - type: archive
+        url: https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.11.tar.xz
+        sha256: 691b074a37b2a307f7f48edc5b8c7afa7301709be56378ccf9cc9735909077fd
+  - name: notejot
+    buildsystem: meson
+    sources:
+      - type: git
+        url: https://github.com/ellie-commons/Jorts.git
+        commit: a67fb85e81032e4a73067906ea99b1dc9d8176b3

make-appimage.sh

@@ -18,7 +18,4 @@ gtk4-update-icon-cache -q -t -f "$PROJECT_DIR/builddir/AppDir/usr/share/icons/hi
 update-desktop-database -q "$PROJECT_DIR/builddir/AppDir/usr/share/applications"
 
 # Run appimage-builder to create the AppImage
-appimage-builder --recipe ../io.github.ellie_commons.jorts.appimage.yml 
-
-# Move the generated AppImage to the project directory
-mv Mingle-*-x86_64.AppImage "$PROJECT_DIR"
+appimage-builder --recipe ../io.github.ellie_commons.jorts.appimage.yml --appdir ./Jorts-x86_64.AppImage

src/Application.vala

@@ -119,9 +119,7 @@ namespace jorts {
             var save_action = new SimpleAction ("save", null);
             set_accels_for_action ("app.save", {"<Control>s"});
             add_action (save_action);
-            save_action.activate.connect (() => {
-                this.save_to_stash ();
-            });
+            save_action.activate.connect (save_to_stash);
             var zoom_out = new SimpleAction ("zoom_out", null);
             set_accels_for_action ("app.zoom_out", { "<Control>minus", "<Control>KP_Subtract", null });
             add_action (zoom_out);
@@ -143,9 +141,7 @@ namespace jorts {
             var toggle_hidebar = new SimpleAction ("toggle_hidebar", null);
             set_accels_for_action ("app.toggle_hidebar", { "<Control>t", null });
             add_action (toggle_hidebar);
-            toggle_hidebar.activate.connect (() => {
-                this.toggle_hidebar();
-            });
+            toggle_hidebar.activate.connect (this.toggle_hidebar);
 
         }
 

src/MainWindow.vala

@@ -159,9 +159,7 @@ namespace jorts {
 
             view = new jorts.StickyView (this.content);
 
-            view.buffer.changed.connect (() => {
-                on_buffer_changed();
-            });
+            view.buffer.changed.connect (on_buffer_changed);
 
             scrolled.set_child (view);
 
@@ -232,14 +230,10 @@ namespace jorts {
             this.set_zoom(data.zoom);
 
             // The settings popover tells us a new theme has been chosen!
-            this.popover.theme_changed.connect ((selected) => {
-                this.update_theme(selected);
-            });
+            this.popover.theme_changed.connect (update_theme);
 
             // The settings popover tells us a new zoom has been chosen!
-            this.popover.zoom_changed.connect ((zoomkind) => {
-                this.on_zoom_changed(zoomkind);
-            });
+            this.popover.zoom_changed.connect (on_zoom_changed);
 
             var app_button = new Gtk.MenuButton();
             app_button.has_tooltip = true;
@@ -282,23 +276,15 @@ namespace jorts {
             //});
 
             // Use the color theme of this sticky note when focused
-            this.notify["is-active"].connect(() => {
-                this.on_focus_changed();
-            });
+            this.notify["is-active"].connect(on_focus_changed);
 
             //The application tells us the squiffly state has changed!
-            Application.gsettings.changed["scribbly-mode-active"].connect (() => {
-                this.on_scribbly_changed();
-            });
+            Application.gsettings.changed["scribbly-mode-active"].connect (on_scribbly_changed);
 
             //The application tells us the squiffly state has changed!
-            Application.gsettings.changed["hide-bar"].connect (() => {
-                this.on_hidebar_changed();
-            });            
+            Application.gsettings.changed["hide-bar"].connect (on_hidebar_changed);            
 
-            gtk_settings.notify["enable-animations"].connect (() => {
-                this.on_reduceanimation_changed();
-            });
+            gtk_settings.notify["enable-animations"].connect (on_reduceanimation_changed);
 
         } // END OF MAIN CONSTRUCT
 

src/Preferences.vala

@@ -253,12 +253,7 @@ namespace jorts {
             reset_button.tooltip_markup = (_("Reset all settings to defaults"));
             actionbar.pack_end (reset_button);
 
-            reset_button.clicked.connect(() => {
-                string[] keys = {"scribbly-mode-active","hide-bar"};
-                foreach (var key in keys) {
-                    Application.gsettings.reset (key);
-                }
-            });
+            reset_button.clicked.connect(on_reset);
 
 
             //  var close_button = new Gtk.Button();
@@ -286,6 +281,14 @@ namespace jorts {
         }
 
 
+        private void on_reset() {
+            string[] keys = {"scribbly-mode-active","hide-bar"};
+            foreach (var key in keys) {
+                Application.gsettings.reset (key);
+            }
+        }
+
+
     }
 }