manager: rename 'MMManager' to 'MMBaseManager'

Just so that we don't have same header names in src/ and /libmm-glib.

5 files changed, 132 insertions, 132 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 5d67e058..bda13e1f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -169,8 +169,8 @@ ModemManager_SOURCES = \
 	mm-auth.c \
 	mm-auth-provider.h \
 	mm-auth-provider.c \
-	mm-manager.c \
-	mm-manager.h \
+	mm-base-manager.c \
+	mm-base-manager.h \
 	mm-device.c \
 	mm-device.h \
 	mm-plugin-manager.c \
diff --git a/src/main.c b/src/main.c
index 9762dab0..f44a2c66 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,7 +26,7 @@
 
 #include "ModemManager.h"
 
-#include "mm-manager.h"
+#include "mm-base-manager.h"
 #include "mm-log.h"
 #include "mm-context.h"
 
@@ -38,7 +38,7 @@
 #define MAX_SHUTDOWN_TIME_SECS 20
 
 static GMainLoop *loop;
-static MMManager *manager;
+static MMBaseManager *manager;
 
 static gboolean
 quit_cb (gpointer user_data)
@@ -46,7 +46,7 @@ quit_cb (gpointer user_data)
     mm_info ("Caught signal, shutting down...");
 
     if (manager)
-        g_object_set (manager, MM_MANAGER_CONNECTION, NULL, NULL);
+        g_object_set (manager, MM_BASE_MANAGER_CONNECTION, NULL, NULL);
 
     if (loop)
         g_idle_add ((GSourceFunc) g_main_loop_quit, loop);
@@ -66,11 +66,11 @@ bus_acquired_cb (GDBusConnection *connection,
 
     /* Create Manager object */
     g_assert (!manager);
-    manager = mm_manager_new (connection,
-                              mm_context_get_test_plugin_dir (),
-                              !mm_context_get_test_no_auto_scan (),
-                              mm_context_get_test_enable (),
-                              &error);
+    manager = mm_base_manager_new (connection,
+                                   mm_context_get_test_plugin_dir (),
+                                   !mm_context_get_test_no_auto_scan (),
+                                   mm_context_get_test_enable (),
+                                   &error);
     if (!manager) {
         mm_warn ("Could not create manager: %s", error->message);
         g_error_free (error);
@@ -88,7 +88,7 @@ name_acquired_cb (GDBusConnection *connection,
 
     /* Launch automatic scan for devices */
     g_assert (manager);
-    mm_manager_start (manager, FALSE);
+    mm_base_manager_start (manager, FALSE);
 }
 
 static void
@@ -105,7 +105,7 @@ name_lost_cb (GDBusConnection *connection,
         mm_warn ("Could not acquire the '%s' service name", name);
 
     if (manager)
-        g_object_set (manager, MM_MANAGER_CONNECTION, NULL, NULL);
+        g_object_set (manager, MM_BASE_MANAGER_CONNECTION, NULL, NULL);
 
     g_main_loop_quit (loop);
 }
@@ -161,13 +161,13 @@ main (int argc, char *argv[])
     if (manager) {
         GTimer *timer;
 
-        mm_manager_shutdown (manager);
+        mm_base_manager_shutdown (manager);
 
         /* Wait for all modems to be disabled and removed, but don't wait
          * forever: if disabling the modems takes longer than 20s, just
          * shutdown anyway. */
         timer = g_timer_new ();
-        while (mm_manager_num_modems (manager) &&
+        while (mm_base_manager_num_modems (manager) &&
                g_timer_elapsed (timer, NULL) < (gdouble)MAX_SHUTDOWN_TIME_SECS) {
             GMainContext *ctx = g_main_loop_get_context (inner);
 
@@ -175,10 +175,10 @@ main (int argc, char *argv[])
             g_usleep (50);
         }
 
-        if (mm_manager_num_modems (manager))
+        if (mm_base_manager_num_modems (manager))
             mm_warn ("Disabling modems took too long, "
                      "shutting down with '%u' modems around",
-                     mm_manager_num_modems (manager));
+                     mm_base_manager_num_modems (manager));
 
         g_object_unref (manager);
         g_timer_destroy (timer);
diff --git a/src/mm-manager.c b/src/mm-base-manager.c
index 05aef126..3900af5b 100644
--- a/src/mm-manager.c
+++ b/src/mm-base-manager.c
@@ -27,7 +27,7 @@
 #include <mm-gdbus-manager.h>
 #include <mm-gdbus-test.h>
 
-#include "mm-manager.h"
+#include "mm-base-manager.h"
 #include "mm-device.h"
 #include "mm-plugin-manager.h"
 #include "mm-auth.h"
@@ -36,7 +36,7 @@
 
 static void initable_iface_init (GInitableIface *iface);
 
-G_DEFINE_TYPE_EXTENDED (MMManager, mm_manager, MM_GDBUS_TYPE_ORG_FREEDESKTOP_MODEM_MANAGER1_SKELETON, 0,
+G_DEFINE_TYPE_EXTENDED (MMBaseManager, mm_base_manager, MM_GDBUS_TYPE_ORG_FREEDESKTOP_MODEM_MANAGER1_SKELETON, 0,
                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
                                                initable_iface_init));
 
@@ -49,7 +49,7 @@ enum {
     LAST_PROP
 };
 
-struct _MMManagerPrivate {
+struct _MMBaseManagerPrivate {
     /* The connection to the system bus */
     GDBusConnection *connection;
     /* Whether auto-scanning is enabled */
@@ -77,7 +77,7 @@ struct _MMManagerPrivate {
 /*****************************************************************************/
 
 static MMDevice *
-find_device_by_modem (MMManager *manager,
+find_device_by_modem (MMBaseManager *manager,
                       MMBaseModem *modem)
 {
     GHashTableIter iter;
@@ -94,7 +94,7 @@ find_device_by_modem (MMManager *manager,
 }
 
 static MMDevice *
-find_device_by_port (MMManager *manager,
+find_device_by_port (MMBaseManager *manager,
                      GUdevDevice *port)
 {
     GHashTableIter iter;
@@ -111,7 +111,7 @@ find_device_by_port (MMManager *manager,
 }
 
 static MMDevice *
-find_device_by_sysfs_path (MMManager *self,
+find_device_by_sysfs_path (MMBaseManager *self,
                            const gchar *sysfs_path)
 {
     return g_hash_table_lookup (self->priv->devices,
@@ -119,7 +119,7 @@ find_device_by_sysfs_path (MMManager *self,
 }
 
 static MMDevice *
-find_device_by_udev_device (MMManager *manager,
+find_device_by_udev_device (MMBaseManager *manager,
                             GUdevDevice *udev_device)
 {
     return find_device_by_sysfs_path (manager, g_udev_device_get_sysfs_path (udev_device));
@@ -128,7 +128,7 @@ find_device_by_udev_device (MMManager *manager,
 /*****************************************************************************/
 
 typedef struct {
-    MMManager *self;
+    MMBaseManager *self;
     MMDevice *device;
 } FindDeviceSupportContext;
 
@@ -240,7 +240,7 @@ find_physical_device (GUdevDevice *child)
 }
 
 static void
-device_added (MMManager *manager,
+device_added (MMBaseManager *manager,
               GUdevDevice *port,
               gboolean hotplugged,
               gboolean manual_scan)
@@ -352,7 +352,7 @@ out:
 }
 
 static void
-device_removed (MMManager *self,
+device_removed (MMBaseManager *self,
                 GUdevDevice *udev_device)
 {
     MMDevice *device;
@@ -412,7 +412,7 @@ handle_uevent (GUdevClient *client,
                GUdevDevice *device,
                gpointer user_data)
 {
-    MMManager *self = MM_MANAGER (user_data);
+    MMBaseManager *self = MM_BASE_MANAGER (user_data);
     const gchar *subsys;
     const gchar *name;
 
@@ -435,7 +435,7 @@ handle_uevent (GUdevClient *client,
 }
 
 typedef struct {
-    MMManager *self;
+    MMBaseManager *self;
     GUdevDevice *device;
     gboolean manual_scan;
 } StartDeviceAdded;
@@ -451,7 +451,7 @@ start_device_added_idle (StartDeviceAdded *ctx)
 }
 
 static void
-start_device_added (MMManager *self,
+start_device_added (MMBaseManager *self,
                     GUdevDevice *device,
                     gboolean manual_scan)
 {
@@ -465,13 +465,13 @@ start_device_added (MMManager *self,
 }
 
 void
-mm_manager_start (MMManager *manager,
-                  gboolean manual_scan)
+mm_base_manager_start (MMBaseManager *manager,
+                       gboolean manual_scan)
 {
     GList *devices, *iter;
 
     g_return_if_fail (manager != NULL);
-    g_return_if_fail (MM_IS_MANAGER (manager));
+    g_return_if_fail (MM_IS_BASE_MANAGER (manager));
 
     if (!manager->priv->auto_scan && !manual_scan)
         return;
@@ -523,7 +523,7 @@ mm_manager_start (MMManager *manager,
 static void
 remove_disable_ready (MMBaseModem *modem,
                       GAsyncResult *res,
-                      MMManager *self)
+                      MMBaseManager *self)
 {
     MMDevice *device;
 
@@ -540,7 +540,7 @@ remove_disable_ready (MMBaseModem *modem,
 static void
 foreach_disable (gpointer key,
                  MMDevice *device,
-                 MMManager *self)
+                 MMBaseManager *self)
 {
     MMBaseModem *modem;
 
@@ -550,10 +550,10 @@ foreach_disable (gpointer key,
 }
 
 void
-mm_manager_shutdown (MMManager *self)
+mm_base_manager_shutdown (MMBaseManager *self)
 {
     g_return_if_fail (self != NULL);
-    g_return_if_fail (MM_IS_MANAGER (self));
+    g_return_if_fail (MM_IS_BASE_MANAGER (self));
 
     /* Cancel all ongoing auth requests */
     g_cancellable_cancel (self->priv->authp_cancellable);
@@ -567,14 +567,14 @@ mm_manager_shutdown (MMManager *self)
 }
 
 guint32
-mm_manager_num_modems (MMManager *self)
+mm_base_manager_num_modems (MMBaseManager *self)
 {
     GHashTableIter iter;
     gpointer key, value;
     guint32 n;
 
     g_return_val_if_fail (self != NULL, 0);
-    g_return_val_if_fail (MM_IS_MANAGER (self), 0);
+    g_return_val_if_fail (MM_IS_BASE_MANAGER (self), 0);
 
     n = 0;
     g_hash_table_iter_init (&iter, self->priv->devices);
@@ -589,7 +589,7 @@ mm_manager_num_modems (MMManager *self)
 /* Set logging */
 
 typedef struct {
-    MMManager *self;
+    MMBaseManager *self;
     GDBusMethodInvocation *invocation;
     gchar *level;
 } SetLoggingContext;
@@ -649,7 +649,7 @@ handle_set_logging (MmGdbusOrgFreedesktopModemManager1 *manager,
 /* Manual scan */
 
 typedef struct {
-    MMManager *self;
+    MMBaseManager *self;
     GDBusMethodInvocation *invocation;
 } ScanDevicesContext;
 
@@ -672,7 +672,7 @@ scan_devices_auth_ready (MMAuthProvider *authp,
         g_dbus_method_invocation_take_error (ctx->invocation, error);
     else {
         /* Otherwise relaunch device scan */
-        mm_manager_start (MM_MANAGER (ctx->self), TRUE);
+        mm_base_manager_start (MM_BASE_MANAGER (ctx->self), TRUE);
         mm_gdbus_org_freedesktop_modem_manager1_complete_scan_devices (
             MM_GDBUS_ORG_FREEDESKTOP_MODEM_MANAGER1 (ctx->self),
             ctx->invocation);
@@ -709,7 +709,7 @@ handle_set_profile (MmGdbusTest *skeleton,
                     const gchar *id,
                     const gchar *plugin_name,
                     const gchar *const *ports,
-                    MMManager *self)
+                    MMBaseManager *self)
 {
     MMPlugin *plugin;
     MMDevice *device;
@@ -768,22 +768,22 @@ out:
 
 /*****************************************************************************/
 
-MMManager *
-mm_manager_new (GDBusConnection *connection,
-                const gchar *plugin_dir,
-                gboolean auto_scan,
-                gboolean enable_test,
-                GError **error)
+MMBaseManager *
+mm_base_manager_new (GDBusConnection *connection,
+                     const gchar *plugin_dir,
+                     gboolean auto_scan,
+                     gboolean enable_test,
+                     GError **error)
 {
     g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
 
-    return g_initable_new (MM_TYPE_MANAGER,
+    return g_initable_new (MM_TYPE_BASE_MANAGER,
                            NULL, /* cancellable */
                            error,
-                           MM_MANAGER_CONNECTION, connection,
-                           MM_MANAGER_PLUGIN_DIR, plugin_dir,
-                           MM_MANAGER_AUTO_SCAN, auto_scan,
-                           MM_MANAGER_ENABLE_TEST, enable_test,
+                           MM_BASE_MANAGER_CONNECTION, connection,
+                           MM_BASE_MANAGER_PLUGIN_DIR, plugin_dir,
+                           MM_BASE_MANAGER_AUTO_SCAN, auto_scan,
+                           MM_BASE_MANAGER_ENABLE_TEST, enable_test,
                            NULL);
 }
 
@@ -793,7 +793,7 @@ set_property (GObject *object,
               const GValue *value,
               GParamSpec *pspec)
 {
-    MMManagerPrivate *priv = MM_MANAGER (object)->priv;
+    MMBaseManagerPrivate *priv = MM_BASE_MANAGER (object)->priv;
 
     switch (prop_id) {
     case PROP_CONNECTION: {
@@ -840,7 +840,7 @@ get_property (GObject *object,
               GValue *value,
               GParamSpec *pspec)
 {
-    MMManagerPrivate *priv = MM_MANAGER (object)->priv;
+    MMBaseManagerPrivate *priv = MM_BASE_MANAGER (object)->priv;
 
     switch (prop_id) {
     case PROP_CONNECTION:
@@ -862,15 +862,15 @@ get_property (GObject *object,
 }
 
 static void
-mm_manager_init (MMManager *manager)
+mm_base_manager_init (MMBaseManager *manager)
 {
-    MMManagerPrivate *priv;
+    MMBaseManagerPrivate *priv;
     const gchar *subsys[5] = { "tty", "net", "usb", "usbmisc", NULL };
 
     /* Setup private data */
     manager->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
-                                                        MM_TYPE_MANAGER,
-                                                        MMManagerPrivate);
+                                                        MM_TYPE_BASE_MANAGER,
+                                                        MMBaseManagerPrivate);
 
     /* Setup authorization provider */
     priv->authp = mm_auth_get_provider ();
@@ -907,7 +907,7 @@ initable_init (GInitable *initable,
                GCancellable *cancellable,
                GError **error)
 {
-    MMManagerPrivate *priv = MM_MANAGER (initable)->priv;
+    MMBaseManagerPrivate *priv = MM_BASE_MANAGER (initable)->priv;
 
     /* If autoscan enabled, list for udev events */
     if (priv->auto_scan)
@@ -950,7 +950,7 @@ initable_init (GInitable *initable,
 static void
 finalize (GObject *object)
 {
-    MMManagerPrivate *priv = MM_MANAGER (object)->priv;
+    MMBaseManagerPrivate *priv = MM_BASE_MANAGER (object)->priv;
 
     g_free (priv->plugin_dir);
 
@@ -977,7 +977,7 @@ finalize (GObject *object)
     if (priv->authp_cancellable)
         g_object_unref (priv->authp_cancellable);
 
-    G_OBJECT_CLASS (mm_manager_parent_class)->finalize (object);
+    G_OBJECT_CLASS (mm_base_manager_parent_class)->finalize (object);
 }
 
 static void
@@ -987,11 +987,11 @@ initable_iface_init (GInitableIface *iface)
 }
 
 static void
-mm_manager_class_init (MMManagerClass *manager_class)
+mm_base_manager_class_init (MMBaseManagerClass *manager_class)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (manager_class);
 
-    g_type_class_add_private (object_class, sizeof (MMManagerPrivate));
+    g_type_class_add_private (object_class, sizeof (MMBaseManagerPrivate));
 
     /* Virtual methods */
     object_class->set_property = set_property;
@@ -1002,7 +1002,7 @@ mm_manager_class_init (MMManagerClass *manager_class)
 
     g_object_class_install_property
         (object_class, PROP_CONNECTION,
-         g_param_spec_object (MM_MANAGER_CONNECTION,
+         g_param_spec_object (MM_BASE_MANAGER_CONNECTION,
                               "Connection",
                               "GDBus connection to the system bus.",
                               G_TYPE_DBUS_CONNECTION,
@@ -1010,7 +1010,7 @@ mm_manager_class_init (MMManagerClass *manager_class)
 
     g_object_class_install_property
         (object_class, PROP_AUTO_SCAN,
-         g_param_spec_boolean (MM_MANAGER_AUTO_SCAN,
+         g_param_spec_boolean (MM_BASE_MANAGER_AUTO_SCAN,
                                "Auto scan",
                                "Automatically look for new devices",
                                TRUE,
@@ -1018,7 +1018,7 @@ mm_manager_class_init (MMManagerClass *manager_class)
 
     g_object_class_install_property
         (object_class, PROP_ENABLE_TEST,
-         g_param_spec_boolean (MM_MANAGER_ENABLE_TEST,
+         g_param_spec_boolean (MM_BASE_MANAGER_ENABLE_TEST,
                                "Enable tests",
                                "Enable the Test interface",
                                FALSE,
@@ -1026,7 +1026,7 @@ mm_manager_class_init (MMManagerClass *manager_class)
 
     g_object_class_install_property
         (object_class, PROP_PLUGIN_DIR,
-         g_param_spec_string (MM_MANAGER_PLUGIN_DIR,
+         g_param_spec_string (MM_BASE_MANAGER_PLUGIN_DIR,
                               "Plugin directory",
                               "Where to look for plugins",
                               NULL,
diff --git a/src/mm-base-manager.h b/src/mm-base-manager.h
new file mode 100644
index 00000000..0e4e97bd
--- /dev/null
+++ b/src/mm-base-manager.h
@@ -0,0 +1,64 @@
+/* -*- 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 - 2011 Red Hat, Inc.
+ * Copyright (C) 2011 Google, Inc.
+ */
+
+#ifndef MM_BASE_MANAGER_H
+#define MM_BASE_MANAGER_H
+
+#include <glib-object.h>
+#include <gio/gio.h>
+
+#include "mm-gdbus-manager.h"
+
+#define MM_TYPE_BASE_MANAGER            (mm_base_manager_get_type ())
+#define MM_BASE_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BASE_MANAGER, MMBaseManager))
+#define MM_BASE_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BASE_MANAGER, MMBaseManagerClass))
+#define MM_IS_BASE_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BASE_MANAGER))
+#define MM_IS_BASE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), MM_TYPE_BASE_MANAGER))
+#define MM_BASE_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BASE_MANAGER, MMBaseManagerClass))
+
+#define MM_BASE_MANAGER_CONNECTION  "connection"  /* Construct-only */
+#define MM_BASE_MANAGER_AUTO_SCAN   "auto-scan"   /* Construct-only */
+#define MM_BASE_MANAGER_ENABLE_TEST "enable-test" /* Construct-only */
+#define MM_BASE_MANAGER_PLUGIN_DIR  "plugin-dir"  /* Construct-only */
+
+typedef struct _MMBaseManagerPrivate MMBaseManagerPrivate;
+
+typedef struct {
+    MmGdbusOrgFreedesktopModemManager1Skeleton parent;
+    MMBaseManagerPrivate *priv;
+} MMBaseManager;
+
+typedef struct {
+    MmGdbusOrgFreedesktopModemManager1SkeletonClass parent;
+} MMBaseManagerClass;
+
+GType mm_base_manager_get_type (void);
+
+MMBaseManager   *mm_base_manager_new         (GDBusConnection *bus,
+                                              const gchar *plugin_dir,
+                                              gboolean auto_scan,
+                                              gboolean enable_test,
+                                              GError **error);
+
+void             mm_base_manager_start       (MMBaseManager *manager,
+                                              gboolean manual_scan);
+
+void             mm_base_manager_shutdown    (MMBaseManager *manager);
+
+guint32          mm_base_manager_num_modems  (MMBaseManager *manager);
+
+#endif /* MM_BASE_MANAGER_H */
diff --git a/src/mm-manager.h b/src/mm-manager.h
deleted file mode 100644
index 0165b0e1..00000000
--- a/src/mm-manager.h
+++ /dev/null
@@ -1,64 +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 - 2011 Red Hat, Inc.
- * Copyright (C) 2011 Google, Inc.
- */
-
-#ifndef MM_MANAGER_H
-#define MM_MANAGER_H
-
-#include <glib-object.h>
-#include <gio/gio.h>
-
-#include "mm-gdbus-manager.h"
-
-#define MM_TYPE_MANAGER            (mm_manager_get_type ())
-#define MM_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_MANAGER, MMManager))
-#define MM_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_MANAGER, MMManagerClass))
-#define MM_IS_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_MANAGER))
-#define MM_IS_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), MM_TYPE_MANAGER))
-#define MM_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_MANAGER, MMManagerClass))
-
-#define MM_MANAGER_CONNECTION  "connection"  /* Construct-only */
-#define MM_MANAGER_AUTO_SCAN   "auto-scan"   /* Construct-only */
-#define MM_MANAGER_ENABLE_TEST "enable-test" /* Construct-only */
-#define MM_MANAGER_PLUGIN_DIR  "plugin-dir"  /* Construct-only */
-
-typedef struct _MMManagerPrivate MMManagerPrivate;
-
-typedef struct {
-    MmGdbusOrgFreedesktopModemManager1Skeleton parent;
-    MMManagerPrivate *priv;
-} MMManager;
-
-typedef struct {
-    MmGdbusOrgFreedesktopModemManager1SkeletonClass parent;
-} MMManagerClass;
-
-GType mm_manager_get_type (void);
-
-MMManager       *mm_manager_new         (GDBusConnection *bus,
-                                         const gchar *plugin_dir,
-                                         gboolean auto_scan,
-                                         gboolean enable_test,
-                                         GError **error);
-
-void             mm_manager_start       (MMManager *manager,
-                                         gboolean manual_scan);
-
-void             mm_manager_shutdown    (MMManager *manager);
-
-guint32          mm_manager_num_modems  (MMManager *manager);
-
-#endif /* MM_MANAGER_H */