diff options
| author | Michael Biebl <biebl@debian.org> | 2017-02-16 00:01:12 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-02-16 00:01:12 +0100 |
| commit | ecb2fdd2c959a2a53fa9ce961203d363f86b389b (patch) | |
| tree | 681cfa4e900d09fa9af89cac3cec4e34568b11c0 /src/nm-active-connection.c | |
| parent | 01f15cee9ceeb145ca7d328b255fbce2b4eacce5 (diff) | |
| parent | a222e56e103f949b148a6942e385ccca2c26d9f3 (diff) | |
Merge tag 'upstream/1.6.2'
Upstream version 1.6.2
Diffstat (limited to 'src/nm-active-connection.c')
| -rw-r--r-- | src/nm-active-connection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index 38aadd27..068bc85e 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -567,7 +567,7 @@ nm_active_connection_set_device (NMActiveConnection *self, NMDevice *device) G_CALLBACK (device_metered_changed), self); if (!priv->assumed) { - priv->pending_activation_id = g_strdup_printf ("activation::%p", (void *)self); + priv->pending_activation_id = g_strdup_printf (NM_PENDING_ACTIONPREFIX_ACTIVATION"%p", (void *)self); nm_device_add_pending_action (device, priv->pending_activation_id, TRUE); } } else { |