plugins: setup new helper macros to define plugins

We also remove the plugin headers completely as they are not really
required anywhere.

4 files changed, 10 insertions, 96 deletions

diff --git a/src/plugins/nokia/mm-plugin-nokia-icera.c b/src/plugins/nokia/mm-plugin-nokia-icera.c
index 78c8fd4c..bd5c7518 100644
--- a/src/plugins/nokia/mm-plugin-nokia-icera.c
+++ b/src/plugins/nokia/mm-plugin-nokia-icera.c
@@ -20,13 +20,11 @@
 #define _LIBMM_INSIDE_MM
 #include <libmm-glib.h>
 
-#include "mm-plugin-nokia-icera.h"
+#include "mm-plugin-common.h"
 #include "mm-broadband-modem-icera.h"
 
-G_DEFINE_TYPE (MMPluginNokiaIcera, mm_plugin_nokia_icera, MM_TYPE_PLUGIN)
-
-MM_PLUGIN_DEFINE_MAJOR_VERSION
-MM_PLUGIN_DEFINE_MINOR_VERSION
+#define MM_TYPE_PLUGIN_NOKIA_ICERA mm_plugin_nokia_icera_get_type ()
+MM_DEFINE_PLUGIN (NOKIA_ICERA, nokia_icera, NokiaIcera)
 
 /*****************************************************************************/
 /* Custom commands for AT probing */
@@ -59,8 +57,8 @@ create_modem (MMPlugin *self,
 
 /*****************************************************************************/
 
-G_MODULE_EXPORT MMPlugin *
-mm_plugin_create (void)
+MM_PLUGIN_NAMED_CREATOR_SCOPE MMPlugin *
+mm_plugin_create_nokia_icera (void)
 {
     static const gchar *subsystems[] = { "tty", "net", NULL };
     static const guint16 vendor_ids[] = { 0x0421, 0 };
diff --git a/src/plugins/nokia/mm-plugin-nokia-icera.h b/src/plugins/nokia/mm-plugin-nokia-icera.h
deleted file mode 100644
index 137692fb..00000000
--- a/src/plugins/nokia/mm-plugin-nokia-icera.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details:
- *
- * Copyright (C) 2009 - 2012 Red Hat, Inc.
- * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
- */
-
-#ifndef MM_PLUGIN_NOKIA_ICERA_H
-#define MM_PLUGIN_NOKIA_ICERA_H
-
-#include "mm-plugin.h"
-
-#define MM_TYPE_PLUGIN_NOKIA_ICERA            (mm_plugin_nokia_icera_get_type ())
-#define MM_PLUGIN_NOKIA_ICERA(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_NOKIA_ICERA, MMPluginNokiaIcera))
-#define MM_PLUGIN_NOKIA_ICERA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_PLUGIN_NOKIA_ICERA, MMPluginNokiaIceraClass))
-#define MM_IS_PLUGIN_NOKIA_ICERA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_NOKIA_ICERA))
-#define MM_IS_PLUGIN_NOKIA_ICERA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_PLUGIN_NOKIA_ICERA))
-#define MM_PLUGIN_NOKIA_ICERA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_PLUGIN_NOKIA_ICERA, MMPluginNokiaIceraClass))
-
-typedef struct {
-    MMPlugin parent;
-} MMPluginNokiaIcera;
-
-typedef struct {
-    MMPluginClass parent;
-} MMPluginNokiaIceraClass;
-
-GType mm_plugin_nokia_icera_get_type (void);
-
-G_MODULE_EXPORT MMPlugin *mm_plugin_create (void);
-
-#endif /* MM_PLUGIN_NOKIA_ICERA_H */
diff --git a/src/plugins/nokia/mm-plugin-nokia.c b/src/plugins/nokia/mm-plugin-nokia.c
index b2700b70..261b3aa4 100644
--- a/src/plugins/nokia/mm-plugin-nokia.c
+++ b/src/plugins/nokia/mm-plugin-nokia.c
@@ -21,13 +21,11 @@
 #define _LIBMM_INSIDE_MM
 #include <libmm-glib.h>
 
-#include "mm-plugin-nokia.h"
+#include "mm-plugin-common.h"
 #include "mm-broadband-modem-nokia.h"
 
-G_DEFINE_TYPE (MMPluginNokia, mm_plugin_nokia, MM_TYPE_PLUGIN)
-
-MM_PLUGIN_DEFINE_MAJOR_VERSION
-MM_PLUGIN_DEFINE_MINOR_VERSION
+#define MM_TYPE_PLUGIN_NOKIA mm_plugin_nokia_get_type ()
+MM_DEFINE_PLUGIN (NOKIA, nokia, Nokia)
 
 /*****************************************************************************/
 /* Custom commands for AT probing */
@@ -60,8 +58,8 @@ create_modem (MMPlugin *self,
 
 /*****************************************************************************/
 
-G_MODULE_EXPORT MMPlugin *
-mm_plugin_create (void)
+MM_PLUGIN_NAMED_CREATOR_SCOPE MMPlugin *
+mm_plugin_create_nokia (void)
 {
     static const gchar *subsystems[] = { "tty", NULL };
     static const guint16 vendor_ids[] = { 0x0421, 0 };
diff --git a/src/plugins/nokia/mm-plugin-nokia.h b/src/plugins/nokia/mm-plugin-nokia.h
deleted file mode 100644
index e2f3589b..00000000
--- a/src/plugins/nokia/mm-plugin-nokia.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details:
- *
- * Copyright (C) 2008 - 2009 Novell, Inc.
- * Copyright (C) 2009 Red Hat, Inc.
- */
-
-#ifndef MM_PLUGIN_NOKIA_H
-#define MM_PLUGIN_NOKIA_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))
-#define MM_PLUGIN_NOKIA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_PLUGIN_NOKIA, MMPluginNokiaClass))
-#define MM_IS_PLUGIN_NOKIA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_NOKIA))
-#define MM_IS_PLUGIN_NOKIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_PLUGIN_NOKIA))
-#define MM_PLUGIN_NOKIA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_PLUGIN_NOKIA, MMPluginNokiaClass))
-
-typedef struct {
-    MMPlugin parent;
-} MMPluginNokia;
-
-typedef struct {
-    MMPluginClass parent;
-} MMPluginNokiaClass;
-
-GType mm_plugin_nokia_get_type (void);
-
-G_MODULE_EXPORT MMPlugin *mm_plugin_create (void);
-
-#endif /* MM_PLUGIN_NOKIA_H */