pidgin/pidgin

Fix a handful of issues found in review

19 months ago, Gary Kramlich
6b658d1458c8
Parents 10206095ed25
Children b6f1592a07ec
Fix a handful of issues found in review
--- 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 @@
endif
#######################################################################
-# Check for GPlugin 0.28.2
+# Check for GPlugin
#######################################################################
gplugin_dep = dependency('gplugin', version : '>= 0.29.0', required : false)
if gplugin_dep.found()
--- 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 @@
va_list var_args;
/* at least ID is required */
- if (!first_property)
+ if (!first_property) {
return NULL;
+ }
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;
- gboolean ret;
g_return_val_if_fail(GPLUGIN_IS_PLUGIN(plugin), FALSE);
@@ -82,10 +81,8 @@
return FALSE;
}
- 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));
-
- return ret;
}
static GPluginPlugin *