diff options
Diffstat (limited to 'plugins/nokia')
| -rw-r--r-- | plugins/nokia/mm-plugin-nokia.c | 24 | ||||
| -rw-r--r-- | plugins/nokia/mm-plugin-nokia.h | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/plugins/nokia/mm-plugin-nokia.c b/plugins/nokia/mm-plugin-nokia.c index 56b649bd..e4ad853f 100644 --- a/plugins/nokia/mm-plugin-nokia.c +++ b/plugins/nokia/mm-plugin-nokia.c @@ -24,7 +24,7 @@ #include "mm-plugin-nokia.h" #include "mm-broadband-modem-nokia.h" -G_DEFINE_TYPE (MMPluginNokia, mm_plugin_nokia, MM_TYPE_PLUGIN_BASE) +G_DEFINE_TYPE (MMPluginNokia, mm_plugin_nokia, MM_TYPE_PLUGIN) int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION; int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION; @@ -42,7 +42,7 @@ static const MMPortProbeAtCommand custom_init[] = { /*****************************************************************************/ static MMBaseModem * -create_modem (MMPluginBase *plugin, +create_modem (MMPlugin *self, const gchar *sysfs_path, const gchar *driver, guint16 vendor, @@ -52,13 +52,13 @@ create_modem (MMPluginBase *plugin, { return MM_BASE_MODEM (mm_broadband_modem_nokia_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) @@ -101,11 +101,11 @@ mm_plugin_create (void) return MM_PLUGIN ( g_object_new (MM_TYPE_PLUGIN_NOKIA, - MM_PLUGIN_BASE_NAME, "Nokia", - MM_PLUGIN_BASE_ALLOWED_SUBSYSTEMS, subsystems, - MM_PLUGIN_BASE_ALLOWED_VENDOR_IDS, vendor_ids, - MM_PLUGIN_BASE_CUSTOM_INIT, custom_init, - MM_PLUGIN_BASE_ALLOWED_SINGLE_AT, TRUE, /* only 1 AT port expected! */ + MM_PLUGIN_NAME, "Nokia", + MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems, + MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids, + MM_PLUGIN_CUSTOM_INIT, custom_init, + MM_PLUGIN_ALLOWED_SINGLE_AT, TRUE, /* only 1 AT port expected! */ NULL)); } @@ -117,8 +117,8 @@ mm_plugin_nokia_init (MMPluginNokia *self) static void mm_plugin_nokia_class_init (MMPluginNokiaClass *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/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); |