diff options
Diffstat (limited to 'plugins/anydata')
| -rw-r--r-- | plugins/anydata/mm-plugin-anydata.c | 24 | ||||
| -rw-r--r-- | plugins/anydata/mm-plugin-anydata.h | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/plugins/anydata/mm-plugin-anydata.c b/plugins/anydata/mm-plugin-anydata.c index 9d7304e7..b0c3a897 100644 --- a/plugins/anydata/mm-plugin-anydata.c +++ b/plugins/anydata/mm-plugin-anydata.c @@ -24,7 +24,7 @@ #include "mm-plugin-anydata.h" #include "mm-broadband-modem-anydata.h" -G_DEFINE_TYPE (MMPluginAnydata, mm_plugin_anydata, MM_TYPE_PLUGIN_BASE) +G_DEFINE_TYPE (MMPluginAnydata, mm_plugin_anydata, MM_TYPE_PLUGIN) int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION; int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION; @@ -32,7 +32,7 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION; /*****************************************************************************/ static MMBaseModem * -create_modem (MMPluginBase *plugin, +create_modem (MMPlugin *self, const gchar *sysfs_path, const gchar *driver, guint16 vendor, @@ -42,13 +42,13 @@ create_modem (MMPluginBase *plugin, { return MM_BASE_MODEM (mm_broadband_modem_anydata_new (sysfs_path, driver, - mm_plugin_get_name (MM_PLUGIN (plugin)), + mm_plugin_get_name (self), vendor, product)); } static gboolean -grab_port (MMPluginBase *base, +grab_port (MMPlugin *self, MMBaseModem *modem, MMPortProbe *probe, GError **error) @@ -71,11 +71,11 @@ mm_plugin_create (void) return MM_PLUGIN ( g_object_new (MM_TYPE_PLUGIN_ANYDATA, - MM_PLUGIN_BASE_NAME, "AnyDATA", - MM_PLUGIN_BASE_ALLOWED_SUBSYSTEMS, subsystems, - MM_PLUGIN_BASE_ALLOWED_VENDOR_IDS, vendor_ids, - MM_PLUGIN_BASE_ALLOWED_AT, TRUE, - MM_PLUGIN_BASE_ALLOWED_QCDM, TRUE, + MM_PLUGIN_NAME, "AnyDATA", + MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems, + MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids, + MM_PLUGIN_ALLOWED_AT, TRUE, + MM_PLUGIN_ALLOWED_QCDM, TRUE, NULL)); } @@ -87,8 +87,8 @@ mm_plugin_anydata_init (MMPluginAnydata *self) static void mm_plugin_anydata_class_init (MMPluginAnydataClass *klass) { - MMPluginBaseClass *pb_class = MM_PLUGIN_BASE_CLASS (klass); + MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass); - pb_class->create_modem = create_modem; - pb_class->grab_port = grab_port; + plugin_class->create_modem = create_modem; + plugin_class->grab_port = grab_port; } diff --git a/plugins/anydata/mm-plugin-anydata.h b/plugins/anydata/mm-plugin-anydata.h index fa84a41d..765c19a5 100644 --- a/plugins/anydata/mm-plugin-anydata.h +++ b/plugins/anydata/mm-plugin-anydata.h @@ -19,7 +19,7 @@ #ifndef MM_PLUGIN_ANYDATA_H #define MM_PLUGIN_ANYDATA_H -#include "mm-plugin-base.h" +#include "mm-plugin.h" #define MM_TYPE_PLUGIN_ANYDATA (mm_plugin_anydata_get_type ()) #define MM_PLUGIN_ANYDATA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_ANYDATA, MMPluginAnydata)) @@ -29,11 +29,11 @@ #define MM_PLUGIN_ANYDATA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_PLUGIN_ANYDATA, MMPluginAnydataClass)) typedef struct { - MMPluginBase parent; + MMPlugin parent; } MMPluginAnydata; typedef struct { - MMPluginBaseClass parent; + MMPluginClass parent; } MMPluginAnydataClass; GType mm_plugin_anydata_get_type (void); |