fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 21:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: remember the caller's GMainContext when creating NMClient

Browse source 
We will require this later. The NMClient shall be tied to the GMainContext
at the moment when the instance gets created. This allows the user to have
multiple, indendent NMClient instances (on different threads and GMainContext).

Currently this is still unused, it will be later.
This commit is contained in:
Thomas Haller 2019-10-12 14:17:16 +02:00
parent ec63919818
commit fe24797241
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libnm/nm-client.c
View file

@ -135,6 +135,7 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
typedef struct {
GMainContext *main_context;
NMManager *manager;
NMRemoteSettings *settings;
NMDnsManager *dns_manager;
@ -3660,7 +3661,7 @@ init_finish (GAsyncInitable *initable, GAsyncResult *result, GError **error)
/*****************************************************************************/
static void
nm_client_init (NMClient *client)
nm_client_init (NMClient *self)
{
}
@ -3750,6 +3751,17 @@ nm_client_new_finish (GAsyncResult *result, GError **error)
return g_object_ref (g_simple_async_result_get_op_res_gpointer (simple));
}
static void
constructed (GObject *object)
{
NMClient *self = NM_CLIENT (object);
NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (self);
priv->main_context = g_main_context_ref_thread_default ();
G_OBJECT_CLASS (nm_client_parent_class)->constructed (object);
}
static void
dispose (GObject *object)
{
@ -3787,10 +3799,9 @@ dispose (GObject *object)
G_OBJECT_CLASS (nm_client_parent_class)->dispose (object);
if (priv->udev) {
udev_unref (priv->udev);
priv->udev = NULL;
}
nm_clear_pointer (&priv->udev, udev_unref);
nm_clear_pointer (&priv->main_context, g_main_context_unref);
nm_clear_g_free (&priv->name_owner_cached);
}
@ -3804,6 +3815,7 @@ nm_client_class_init (NMClientClass *client_class)
object_class->get_property = get_property;
object_class->set_property = set_property;
object_class->constructed = constructed;
object_class->dispose = dispose;
/**