plugins: setup new helper macros to define plugins

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

2 files changed, 6 insertions, 54 deletions

diff --git a/src/plugins/thuraya/mm-plugin-thuraya.c b/src/plugins/thuraya/mm-plugin-thuraya.c
index 5097e24e..e8d4149b 100644
--- a/src/plugins/thuraya/mm-plugin-thuraya.c
+++ b/src/plugins/thuraya/mm-plugin-thuraya.c
@@ -27,15 +27,15 @@
 #define _LIBMM_INSIDE_MM
 #include <libmm-glib.h>
 
-#include "mm-plugin-thuraya.h"
+#include "mm-plugin-common.h"
 #include "mm-broadband-modem.h"
 #include "mm-broadband-modem-thuraya.h"
 #include "mm-private-boxed-types.h"
 
-G_DEFINE_TYPE (MMPluginThuraya, mm_plugin_thuraya, MM_TYPE_PLUGIN)
+#define MM_TYPE_PLUGIN_THURAYA mm_plugin_thuraya_get_type ()
+MM_DEFINE_PLUGIN (THURAYA, thuraya, Thuraya)
 
-MM_PLUGIN_DEFINE_MAJOR_VERSION
-MM_PLUGIN_DEFINE_MINOR_VERSION
+/*****************************************************************************/
 
 static MMBaseModem *
 create_modem (MMPlugin *self,
@@ -56,8 +56,8 @@ create_modem (MMPlugin *self,
 
 /*****************************************************************************/
 
-G_MODULE_EXPORT MMPlugin *
-mm_plugin_create (void)
+MM_PLUGIN_NAMED_CREATOR_SCOPE MMPlugin *
+mm_plugin_create_thuraya (void)
 {
     static const gchar *subsystems[] = { "tty", NULL };
     static const guint16 vendor_ids[] = { 0x1a26, 0 };
diff --git a/src/plugins/thuraya/mm-plugin-thuraya.h b/src/plugins/thuraya/mm-plugin-thuraya.h
deleted file mode 100644
index fb86090d..00000000
--- a/src/plugins/thuraya/mm-plugin-thuraya.h
+++ /dev/null
@@ -1,48 +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.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Copyright (C) 2011 - 2012 Ammonit Measurement GmbH
- * Author: Aleksander Morgado <aleksander@lanedo.com>
- * Copyright (C) 2016 Thomas Sailer <t.sailer@alumni.ethz.ch>
- */
-
-#ifndef MM_PLUGIN_THURAYA_H
-#define MM_PLUGIN_THURAYA_H
-
-#include "mm-plugin.h"
-
-#define MM_TYPE_PLUGIN_THURAYA            (mm_plugin_thuraya_get_type ())
-#define MM_PLUGIN_THURAYA(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_THURAYA, MMPluginThuraya))
-#define MM_PLUGIN_THURAYA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_PLUGIN_THURAYA, MMPluginThurayaClass))
-#define MM_IS_PLUGIN_THURAYA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_THURAYA))
-#define MM_IS_PLUGIN_THURAYA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_PLUGIN_THURAYA))
-#define MM_PLUGIN_THURAYA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_PLUGIN_THURAYA, MMPluginThurayaClass))
-
-typedef struct {
-    MMPlugin parent;
-} MMPluginThuraya;
-
-typedef struct {
-    MMPluginClass parent;
-} MMPluginThurayaClass;
-
-GType mm_plugin_thuraya_get_type (void);
-
-G_MODULE_EXPORT MMPlugin *mm_plugin_create (void);
-
-#endif /* MM_PLUGIN_THURAYA_H */