[geany/geany] 4d252c: Merge pull request #1799 from b4n/plugin-manager/selection-on-double-click

Colomban Wendling git-noreply at xxxxx
Tue Apr 3 21:52:19 UTC 2018


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Tue, 03 Apr 2018 21:52:19 UTC
Commit:      4d252c7a19e84d7c71571a751a213b906522b29c
             https://github.com/geany/geany/commit/4d252c7a19e84d7c71571a751a213b906522b29c

Log Message:
-----------
Merge pull request #1799 from b4n/plugin-manager/selection-on-double-click

Fix PM button desynchronization and possible crash


Modified Paths:
--------------
    src/plugins.c

Modified: src/plugins.c
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -1767,7 +1767,7 @@ static gboolean pm_tree_filter_func(GtkTreeModel *model, GtkTreeIter *iter, gpoi
 	gtk_tree_model_get(model, iter, PLUGIN_COLUMN_PLUGIN, &plugin, -1);
 
 	if (!plugin)
-		return FALSE;
+		return TRUE;
 	key = gtk_entry_get_text(GTK_ENTRY(pm_widgets.filter_entry));
 
 	filename = g_path_get_basename(plugin->filename);
@@ -1865,7 +1865,10 @@ static void pm_on_plugin_button_clicked(G_GNUC_UNUSED GtkButton *button, gpointe
 			if (GPOINTER_TO_INT(user_data) == PM_BUTTON_CONFIGURE)
 				plugin_show_configure(&p->public);
 			else if (GPOINTER_TO_INT(user_data) == PM_BUTTON_HELP)
+			{
+				g_return_if_fail(p->cbs.help != NULL);
 				p->cbs.help(&p->public, p->cb_data);
+			}
 			else if (GPOINTER_TO_INT(user_data) == PM_BUTTON_KEYBINDINGS && p->key_group && p->key_group->plugin_key_count > 0)
 				keybindings_dialog_show_prefs_scroll(p->info.name);
 		}



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list