--- a/meson.build Thu Nov 14 22:02:36 2019 -0600
+++ b/meson.build Fri Nov 15 00:23:41 2019 -0600
@@ -617,7 +617,7 @@
#######################################################################
-# Check for GPlugin 0.28.2
#######################################################################
gplugin_dep = dependency('gplugin', version : '>= 0.29.0', required : false)
--- a/pidgin/pidginplugininfo.c Thu Nov 14 22:02:36 2019 -0600
+++ b/pidgin/pidginplugininfo.c Fri Nov 15 00:23:41 2019 -0600
@@ -47,8 +47,9 @@
/* at least ID is required */
va_start(var_args, first_property);
info = g_object_new_valist(PIDGIN_TYPE_PLUGIN_INFO, first_property,
--- a/pidgin/pidginplugininfo.h Thu Nov 14 22:02:36 2019 -0600
+++ b/pidgin/pidginplugininfo.h Fri Nov 15 00:23:41 2019 -0600
@@ -36,7 +36,7 @@
* pidgin_plugin_info_new:
* @first_property: The first property name
* @...: The value of the first property, followed optionally by more
- * name/value pairs, followed by %NULL
+ * name/value pairs, followed by %NULL * Creates a new #PidginPluginInfo instance to be returned from
* #plugin_query of a pidgin plugin, using the provided name/value
--- a/pidgin/pidginpluginsdialog.c Thu Nov 14 22:02:36 2019 -0600
+++ b/pidgin/pidginpluginsdialog.c Fri Nov 15 00:23:41 2019 -0600
@@ -72,7 +72,6 @@
GPluginPluginInfo *ginfo = gplugin_plugin_get_info(plugin);
PurplePluginInfo *info = PURPLE_PLUGIN_INFO(ginfo);
GPluginPluginState state;
g_return_val_if_fail(GPLUGIN_IS_PLUGIN(plugin), FALSE);
@@ -82,10 +81,8 @@
- ret = (purple_plugin_info_get_pref_frame_cb(info) ||
+ return (purple_plugin_info_get_pref_frame_cb(info) || purple_plugin_info_get_pref_request_cb(info));