Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lose libpeas dependency #1502

Closed
wants to merge 20 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix saving to plugins-enabled
Jeremy Wootten authored and Jeremy Wootten committed Dec 27, 2024
commit 739b46446473e81d1697550b7607bd5b8acec56e
2 changes: 1 addition & 1 deletion plugins/detect-indent/detect-indent.vala
Original file line number Diff line number Diff line change
@@ -85,7 +85,7 @@ public class Scratch.Plugins.DetectIndent: Scratch.Plugins.PluginBase {
}
});
}

protected override void deactivate_internal () {
this.disconnect (doc_hook_handler);
}
2 changes: 1 addition & 1 deletion plugins/editorconfig/editorconfig.vala
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@ public class Scratch.Plugins.EditorConfigPlugin: Scratch.Plugins.PluginBase {
}
});
}

protected override void deactivate_internal () {
this.disconnect (doc_hook_handler);
}
2 changes: 1 addition & 1 deletion plugins/fuzzy-search/fuzzy-search.vala
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ public class Scratch.Plugins.FuzzySearch: Scratch.Plugins.PluginBase {
if (cancellable != null) {
cancellable.cancel ();
}

this.disconnect (window_hook_handler);
this.disconnect (folder_hook_handler);
}
2 changes: 1 addition & 1 deletion plugins/markdown-actions/markdown-actions.vala
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ public class Scratch.Plugins.MarkdownActions : Scratch.Plugins.PluginBase {
current_source.key_press_event.disconnect (shortcut_handler);
current_source.notify["language"].disconnect (configure_shortcuts);
}

this.disconnect (doc_hook_handler);
}

2 changes: 1 addition & 1 deletion plugins/vim-emulation/vim-emulation.vala
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ public class Scratch.Plugins.VimEmulation : Scratch.Plugins.PluginBase {
foreach (var v in views) {
v.key_press_event.disconnect (handle_key_press);
}

this.disconnect (doc_hook_handler);
}

1 change: 0 additions & 1 deletion src/MainWindow.vala
Original file line number Diff line number Diff line change
@@ -573,7 +573,6 @@ namespace Scratch {
};

plugins.extension_added.connect (() => {
warning ("hook func");
hook_func ();
});

16 changes: 10 additions & 6 deletions src/Services/PluginManager.vala
Original file line number Diff line number Diff line change
@@ -158,12 +158,10 @@ public class Scratch.Services.PluginsManager : GLib.Object {

private void activate_plugin (Scratch.Plugins.PluginBase plugin) {
var info = plugin.plugin_info;
warning ("activate plugin %s, active %s", info.name, plugin.is_active.to_string ());
if (!plugin.is_active) {
plugin.activate ();
active_plugin_set.add (info.name);
extension_added (); // Signals Window to run initial hook function
update_active_plugin_settings ();
}
}

@@ -173,17 +171,21 @@ public class Scratch.Services.PluginsManager : GLib.Object {
plugin.deactivate ();
active_plugin_set.remove (info.name);
extension_removed (info);
update_active_plugin_settings ();
}
}

private void update_active_plugin_settings () {
settings.set_strv (ACTIVE_PLUGINS_KEY, active_plugin_set.to_array ());
// For some reason using active_plugin_set.to_array () does not work (crashes)
// So construct the string array ourselves
string[] plugins = {};
foreach (string s in active_plugin_set) {
plugins += s;
}

settings.set_strv (ACTIVE_PLUGINS_KEY, plugins);
}

private void load_modules_from_dir (string path) {


FileInfo info;
FileEnumerator enumerator;
try {
@@ -341,6 +343,8 @@ public class Scratch.Services.PluginsManager : GLib.Object {
} else {
deactivate_plugin (plugin);
}

update_active_plugin_settings ();
});
var image = new Gtk.Image.from_icon_name (info.icon_name, LARGE_TOOLBAR) {
valign = Gtk.Align.CENTER