From e5e46f489e9d89bdecb4c4948b0d9627e33555cc Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 10 Jul 2012 11:15:23 +0200 Subject: core: merge `MMPluginBase' and `MMPlugin' There's no real point in maintaining a separate `MMPlugin' interface, as all the plugins will inherit from `MMPluginBase', so just merge them and simplify everything. --- plugins/generic/mm-plugin-generic.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'plugins/generic/mm-plugin-generic.h') diff --git a/plugins/generic/mm-plugin-generic.h b/plugins/generic/mm-plugin-generic.h index 8d05689f..12f9dd9d 100644 --- a/plugins/generic/mm-plugin-generic.h +++ b/plugins/generic/mm-plugin-generic.h @@ -17,7 +17,6 @@ #define MM_PLUGIN_GENERIC_H #include "mm-plugin.h" -#include "mm-plugin-base.h" #define MM_TYPE_PLUGIN_GENERIC (mm_plugin_generic_get_type ()) #define MM_PLUGIN_GENERIC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_GENERIC, MMPluginGeneric)) @@ -27,11 +26,11 @@ #define MM_PLUGIN_GENERIC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_PLUGIN_GENERIC, MMPluginGenericClass)) typedef struct { - MMPluginBase parent; + MMPlugin parent; } MMPluginGeneric; typedef struct { - MMPluginBaseClass parent; + MMPluginClass parent; } MMPluginGenericClass; GType mm_plugin_generic_get_type (void); -- cgit v1.2.3-70-g09d2