diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mm-bearer.h | 3 | ||||
-rw-r--r-- | src/mm-manager.c | 2 | ||||
-rw-r--r-- | src/mm-sim.h | 3 |
3 files changed, 1 insertions, 7 deletions
diff --git a/src/mm-bearer.h b/src/mm-bearer.h index 732446ab..962bbff3 100644 --- a/src/mm-bearer.h +++ b/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, diff --git a/src/mm-manager.c b/src/mm-manager.c index 5768e0b8..e3a793b6 100644 --- a/src/mm-manager.c +++ b/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, diff --git a/src/mm-sim.h b/src/mm-sim.h index a01e6561..dce22200 100644 --- a/src/mm-sim.h +++ b/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; |