api,header: define common object prefixes in the daemon header

build-aux/header-generator.xsl

@@ -118,8 +118,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  * Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2008 - 2009 Novell, Inc.
- * Copyright (C) 2009 - 2011 Red Hat, Inc.
- * Copyright (C) 2011 Google, Inc.
+ * Copyright (C) 2009 - 2012 Red Hat, Inc.
+ * Copyright (C) 2011 - 2012 Google, Inc.
  */
 
 #ifndef _MODEM_MANAGER_NAMES_H_
@@ -128,6 +128,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define MM_DBUS_PATH    "/org/freedesktop/ModemManager1"
 #define MM_DBUS_SERVICE "org.freedesktop.ModemManager1"
 
+/* Prefix for object paths */
+#define MM_DBUS_MODEM_PREFIX  MM_DBUS_PATH "/Modem"
+#define MM_DBUS_BEARER_PREFIX MM_DBUS_PATH "/Bearer"
+#define MM_DBUS_SIM_PREFIX    MM_DBUS_PATH "/SIM"
+
 /**************
  * Interfaces *
  **************/

src/mm-bearer.h

@@ -41,9 +41,6 @@ typedef struct _MMBearerPrivate MMBearerPrivate;
 #define MM_BEARER_MODEM      "bearer-modem"
 #define MM_BEARER_STATUS     "bearer-status"
 
-/* Prefix for all bearer object paths */
-#define MM_DBUS_BEARER_PREFIX MM_DBUS_PATH "/Bearers"
-
 typedef enum { /*< underscore_name=mm_bearer_status >*/
     MM_BEARER_STATUS_DISCONNECTED,
     MM_BEARER_STATUS_DISCONNECTING,

src/mm-manager.c

@@ -211,7 +211,7 @@ check_export_modem (MMManager *self,
     }
 
     /* No outstanding port tasks, so if the modem is valid we can export it */
-    path = g_strdup_printf (MM_DBUS_PATH"/Modems/%d", id++);
+    path = g_strdup_printf (MM_DBUS_MODEM_PREFIX "/%d", id++);
     g_object_set (modem,
                   "g-object-path", path,
                   MM_BASE_MODEM_CONNECTION, self->priv->connection,

src/mm-sim.h

@@ -39,9 +39,6 @@ typedef struct _MMSimPrivate MMSimPrivate;
 #define MM_SIM_CONNECTION     "sim-connection"
 #define MM_SIM_MODEM          "sim-modem"
 
-/* Prefix for all SIM object paths */
-#define MM_DBUS_SIM_PREFIX MM_DBUS_PATH "/SIMs"
-
 struct _MMSim {
     MmGdbusSimSkeleton parent;
     MMSimPrivate *priv;