Mercurial > pidgin3 / changeset

--- a/libpurple/plugins.c	Sat Jan 26 19:18:59 2019 +0000
+++ b/libpurple/plugins.c	Sat Jan 26 19:20:11 2019 +0000
@@ -224,7 +224,7 @@
 }
 
 gboolean
-purple_plugin_is_loaded(const PurplePlugin *plugin)
+purple_plugin_is_loaded(PurplePlugin *plugin)
 {
 	g_return_val_if_fail(plugin != NULL, FALSE);
 
@@ -232,7 +232,7 @@
 }
 
 const gchar *
-purple_plugin_get_filename(const PurplePlugin *plugin)
+purple_plugin_get_filename(PurplePlugin *plugin)
 {
 	g_return_val_if_fail(plugin != NULL, NULL);
 
@@ -240,7 +240,7 @@
 }
 
 PurplePluginInfo *
-purple_plugin_get_info(const PurplePlugin *plugin)
+purple_plugin_get_info(PurplePlugin *plugin)
 {
 	GPluginPluginInfo *info;
 
@@ -274,10 +274,10 @@
                             const gchar *name, const GTypeInfo *info,
                             GTypeFlags flags)
 {
-	g_return_val_if_fail(GPLUGIN_IS_NATIVE_PLUGIN(plugin), G_TYPE_INVALID);
+	g_return_val_if_fail(G_IS_TYPE_MODULE(plugin), G_TYPE_INVALID);
 
-	return gplugin_native_plugin_register_type(GPLUGIN_NATIVE_PLUGIN(plugin),
-	                                           parent, name, info, flags);
+	return g_type_module_register_type(G_TYPE_MODULE(plugin),
+	                                   parent, name, info, flags);
 }
 
 void
@@ -285,15 +285,15 @@
                             GType interface_type,
                             const GInterfaceInfo *interface_info)
 {
-	g_return_if_fail(GPLUGIN_IS_NATIVE_PLUGIN(plugin));
+	g_return_if_fail(G_IS_TYPE_MODULE(plugin));
 
-	gplugin_native_plugin_add_interface(GPLUGIN_NATIVE_PLUGIN(plugin),
-	                                    instance_type, interface_type,
-	                                    interface_info);
+	g_type_module_add_interface(G_TYPE_MODULE(plugin),
+	                            instance_type, interface_type,
+	                            interface_info);
 }
 
 gboolean
-purple_plugin_is_internal(const PurplePlugin *plugin)
+purple_plugin_is_internal(PurplePlugin *plugin)
 {
 	PurplePluginInfo *info;
 
@@ -308,7 +308,7 @@
 }
 
 GSList *
-purple_plugin_get_dependent_plugins(const PurplePlugin *plugin)
+purple_plugin_get_dependent_plugins(PurplePlugin *plugin)
 {
 #warning TODO: Implement this when GPlugin can return dependent plugins.
 	return NULL;

--- a/libpurple/plugins.h	Sat Jan 26 19:18:59 2019 +0000
+++ b/libpurple/plugins.h	Sat Jan 26 19:20:11 2019 +0000
@@ -40,10 +40,8 @@
 
 #define PURPLE_TYPE_PLUGIN             GPLUGIN_TYPE_PLUGIN
 #define PURPLE_PLUGIN(obj)             GPLUGIN_PLUGIN(obj)
-#define PURPLE_PLUGIN_CLASS(klass)     GPLUGIN_PLUGIN_CLASS(klass)
 #define PURPLE_IS_PLUGIN(obj)          GPLUGIN_IS_PLUGIN(obj)
-#define PURPLE_IS_PLUGIN_CLASS(klass)  GPLUGIN_IS_PLUGIN_CLASS(klass)
-#define PURPLE_PLUGIN_GET_CLASS(obj)   GPLUGIN_PLUGIN_GET_CLASS(obj)
+#define PURPLE_PLUGIN_GET_IFACE(obj)   GPLUGIN_PLUGIN_GET_IFACE(obj)
 
 /**
  * PurplePlugin:
@@ -53,7 +51,7 @@
  */
 typedef GPluginPlugin PurplePlugin;
 
-typedef GPluginPluginClass PurplePluginClass;
+typedef GPluginPluginInterface PurplePluginInterface;
 
 #define PURPLE_TYPE_PLUGIN_INFO             (purple_plugin_info_get_type())
 #define PURPLE_PLUGIN_INFO(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_PLUGIN_INFO, PurplePluginInfo))
@@ -373,7 +371,7 @@
  *
  * Returns: %TRUE if loaded, or %FALSE otherwise.
  */
-gboolean purple_plugin_is_loaded(const PurplePlugin *plugin);
+gboolean purple_plugin_is_loaded(PurplePlugin *plugin);
 
 /**
  * purple_plugin_get_filename:
@@ -383,7 +381,7 @@
  *
  * Returns: The plugin's filename.
  */
-const gchar *purple_plugin_get_filename(const PurplePlugin *plugin);
+const gchar *purple_plugin_get_filename(PurplePlugin *plugin);
 
 /**
  * purple_plugin_get_info:
@@ -397,7 +395,7 @@
  * where we use the plugin info. The plugin info instance is guaranteed to
  * exist as long as the plugin exists.
  */
-PurplePluginInfo *purple_plugin_get_info(const PurplePlugin *plugin);
+PurplePluginInfo *purple_plugin_get_info(PurplePlugin *plugin);
 
 /**
  * purple_plugin_disable:
@@ -453,7 +451,7 @@
  *
  * Returns: %TRUE if the plugin is an internal plugin, %FALSE otherwise.
  */
-gboolean purple_plugin_is_internal(const PurplePlugin *plugin);
+gboolean purple_plugin_is_internal(PurplePlugin *plugin);
 
 /**
  * purple_plugin_get_dependent_plugins:
@@ -464,7 +462,7 @@
  * Returns: (element-type PurplePlugin) (transfer none): The list of a plugins that depend on the specified
  *                           plugin.
  */
-GSList *purple_plugin_get_dependent_plugins(const PurplePlugin *plugin);
+GSList *purple_plugin_get_dependent_plugins(PurplePlugin *plugin);
 
 /**************************************************************************/
 /* PluginInfo API                                                         */

--- a/meson.build	Sat Jan 26 19:18:59 2019 +0000
+++ b/meson.build	Sat Jan 26 19:20:11 2019 +0000
@@ -757,9 +757,9 @@
 endif
 
 #######################################################################
-# Check for GPlugin 0.0.17
+# Check for GPlugin 0.28.0
 #######################################################################
-gplugin = dependency('gplugin', version : '>= 0.0.17')
+gplugin = dependency('gplugin', version : '>= 0.28.0')
 
 #######################################################################
 # Check for GObject Introspection