deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-10 07:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a new session guard helper for the plugin GUI so addon commands only run when there is a valid active session, and emit a user-facing error otherwise. This prevents handle_command() calls with an invalid/null session context (a likely crash path on Windows in edge UI states).

Browse Source 
Updated plugin Unload and Reload callbacks to use the guarded session helper before issuing command-based unload/reload for script plugins, and to exit cleanly when no session is available.
Fixed plugin list layout sizing by forcing the tree view’s scrolled container to expand/fill inside the plugin window’s vbox, so the loaded-plugins list now uses full available height above the button row.
This commit is contained in:
deepend
2026-02-15 15:23:39 -07:00
parent 3f31d9bd5a
commit 47a9729737
1 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/fe-gtk/plugingui.c
View File

@@ -48,6 +48,16 @@ enum
static GtkWidget *plugin_window = NULL;
static session *
plugingui_get_target_session (void)
{
if (is_session (current_sess))
return current_sess;
fe_message (_("No active session available for addon command."), FE_MSG_ERROR);
return NULL;
}
#if HAVE_GTK3
#define ICON_PLUGIN_LOAD "document-open"
#define ICON_PLUGIN_UNLOAD "edit-delete"
@@ -218,6 +228,7 @@ static void
plugingui_unload (GtkWidget * wid, gpointer unused)
{
char *modname, *file;
session *target_sess;
GtkTreeView *view;
GtkTreeIter iter;
@@ -235,11 +246,19 @@ plugingui_unload (GtkWidget * wid, gpointer unused)
{
char *buf;
/* let python.so or perl.so handle it */
target_sess = plugingui_get_target_session ();
if (!target_sess)
{
g_free (modname);
g_free (file);
return;
}
if (strchr (file, ' '))
buf = g_strdup_printf ("UNLOAD \"%s\"", file);
else
buf = g_strdup_printf ("UNLOAD %s", file);
handle_command (current_sess, buf, FALSE);
handle_command (target_sess, buf, FALSE);
g_free (buf);
}
@@ -251,16 +270,24 @@ static void
plugingui_reloadbutton_cb (GtkWidget *wid, GtkTreeView *view)
{
char *file = plugingui_getfilename(view);
session *target_sess;
if (file)
{
char *buf;
target_sess = plugingui_get_target_session ();
if (!target_sess)
{
g_free (file);
return;
}
if (strchr (file, ' '))
buf = g_strdup_printf ("RELOAD \"%s\"", file);
else
buf = g_strdup_printf ("RELOAD %s", file);
handle_command (current_sess, buf, FALSE);
handle_command (target_sess, buf, FALSE);
g_free (buf);
g_free (file);
}
@@ -270,6 +297,7 @@ void
plugingui_open (void)
{
GtkWidget *view;
GtkWidget *view_scroll;
GtkWidget *vbox, *hbox;
char buf[128];
@@ -285,6 +313,9 @@ plugingui_open (void)
gtkutil_destroy_on_esc (plugin_window);
view = plugingui_treeview_new (vbox);
view_scroll = gtk_widget_get_parent (view);
if (view_scroll)
gtk_box_set_child_packing (GTK_BOX (vbox), view_scroll, TRUE, TRUE, 0, GTK_PACK_START);
g_object_set_data (G_OBJECT (plugin_window), "view", view);