colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-sim: set dbus id as soon as object is created

Browse Source
This commit is contained in:
Aleksander Morgado
2020-03-29 19:34:18 +02:00
parent 6c0d9e5a1b
commit 7e5af3b38d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mm-base-sim.c
View File

@@ -57,6 +57,8 @@ static GParamSpec *properties[PROP_LAST];
struct _MMBaseSimPrivate { struct _MMBaseSimPrivate {
/* The connection to the system bus */ /* The connection to the system bus */
GDBusConnection *connection; GDBusConnection *connection;
guint dbus_id;
/* The modem which owns this SIM */ /* The modem which owns this SIM */
MMBaseModem *modem; MMBaseModem *modem;
/* The path where the SIM object is exported */ /* The path where the SIM object is exported */
@@ -70,10 +72,9 @@ static guint signals[SIGNAL_LAST] = { 0 };
void void
mm_base_sim_export (MMBaseSim *self) mm_base_sim_export (MMBaseSim *self)
{ {
static guint id = 0;
gchar *path; gchar *path;
path = g_strdup_printf (MM_DBUS_SIM_PREFIX "/%d", id++); path = g_strdup_printf (MM_DBUS_SIM_PREFIX "/%d", self->priv->dbus_id);
g_object_set (self, g_object_set (self,
MM_BASE_SIM_PATH, path, MM_BASE_SIM_PATH, path,
NULL); NULL);
@@ -1811,8 +1812,13 @@ get_property (GObject *object,
static void static void
mm_base_sim_init (MMBaseSim *self) mm_base_sim_init (MMBaseSim *self)
{ {
static guint id = 0;
/* Initialize private data */ /* Initialize private data */
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, MM_TYPE_BASE_SIM, MMBaseSimPrivate); self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, MM_TYPE_BASE_SIM, MMBaseSimPrivate);
/* Each SIM is given a unique id to build its own DBus path */
self->priv->dbus_id = id++;
} }
static void static void