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/nokia/mm-plugin-nokia.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/nokia/mm-plugin-nokia.h') diff --git a/plugins/nokia/mm-plugin-nokia.h b/plugins/nokia/mm-plugin-nokia.h index fdc0f417..e2f3589b 100644 --- a/plugins/nokia/mm-plugin-nokia.h +++ b/plugins/nokia/mm-plugin-nokia.h @@ -17,7 +17,7 @@ #ifndef MM_PLUGIN_NOKIA_H #define MM_PLUGIN_NOKIA_H -#include "mm-plugin-base.h" +#include "mm-plugin.h" #define MM_TYPE_PLUGIN_NOKIA (mm_plugin_nokia_get_type ()) #define MM_PLUGIN_NOKIA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_NOKIA, MMPluginNokia)) @@ -27,11 +27,11 @@ #define MM_PLUGIN_NOKIA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_PLUGIN_NOKIA, MMPluginNokiaClass)) typedef struct { - MMPluginBase parent; + MMPlugin parent; } MMPluginNokia; typedef struct { - MMPluginBaseClass parent; + MMPluginClass parent; } MMPluginNokiaClass; GType mm_plugin_nokia_get_type (void); -- cgit v1.2.3-70-g09d2