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/samsung/mm-plugin-samsung.c b/src/plugins/samsung/mm-plugin-samsung.c
index 3ce64d73..ee16a09f 100644
--- a/src/plugins/samsung/mm-plugin-samsung.c
+++ b/src/plugins/samsung/mm-plugin-samsung.c
@@ -24,14 +24,14 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include "mm-plugin-samsung.h"
+#include "mm-plugin-common.h"
 #include "mm-private-boxed-types.h"
 #include "mm-broadband-modem-samsung.h"
 
-G_DEFINE_TYPE (MMPluginSamsung, mm_plugin_samsung, MM_TYPE_PLUGIN)
+#define MM_TYPE_PLUGIN_SAMSUNG mm_plugin_samsung_get_type ()
+MM_DEFINE_PLUGIN (SAMSUNG, samsung, Samsung)
 
-MM_PLUGIN_DEFINE_MAJOR_VERSION
-MM_PLUGIN_DEFINE_MINOR_VERSION
+/*****************************************************************************/
 
 static MMBaseModem *
 create_modem (MMPlugin *self,
@@ -52,8 +52,8 @@ create_modem (MMPlugin *self,
 
 /*****************************************************************************/
 
-G_MODULE_EXPORT MMPlugin *
-mm_plugin_create (void)
+MM_PLUGIN_NAMED_CREATOR_SCOPE MMPlugin *
+mm_plugin_create_samsung (void)
 {
     static const gchar *subsystems[] = { "tty", "net", NULL };
     static const mm_uint16_pair products[] = { { 0x04e8, 0x6872 },
diff --git a/src/plugins/samsung/mm-plugin-samsung.h b/src/plugins/samsung/mm-plugin-samsung.h
deleted file mode 100644
index 85f32028..00000000
--- a/src/plugins/samsung/mm-plugin-samsung.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 Samsung Electronics, Inc.
- * Copyright (C) 2012 Google Inc.
- * Author: Nathan Williams <njw@google.com>
- */
-
-#ifndef MM_PLUGIN_SAMSUNG_H
-#define MM_PLUGIN_SAMSUNG_H
-
-#include "mm-plugin.h"
-
-#define MM_TYPE_PLUGIN_SAMSUNG            (mm_plugin_samsung_get_type ())
-#define MM_PLUGIN_SAMSUNG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_SAMSUNG, MMPluginSamsung))
-#define MM_PLUGIN_SAMSUNG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_PLUGIN_SAMSUNG, MMPluginSamsungClass))
-#define MM_IS_PLUGIN_SAMSUNG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_SAMSUNG))
-#define MM_IS_PLUGIN_SAMSUNG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_PLUGIN_SAMSUNG))
-#define MM_PLUGIN_SAMSUNG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_PLUGIN_SAMSUNG, MMPluginSamsungClass))
-
-typedef struct {
-    MMPlugin parent;
-} MMPluginSamsung;
-
-typedef struct {
-    MMPluginClass parent;
-} MMPluginSamsungClass;
-
-GType mm_plugin_samsung_get_type (void);
-
-G_MODULE_EXPORT MMPlugin *mm_plugin_create (void);
-
-#endif /* MM_PLUGIN_SAMSUNG_H */