summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2015-08-10 13:47:03 +0200
committerLubomir Rintel <lkundrak@v3.sk>2015-08-10 13:47:03 +0200
commit3dd0f2e976f13eff0c14280ab467dfa2cffb6181 (patch)
treee8c232159d28a131f84a0e2bc23b7da3b72189bc
parentb997805689cfe2613d84141a5bf6e8f723bb8093 (diff)
downloadNetworkManager-3dd0f2e976f13eff0c14280ab467dfa2cffb6181.tar.gz
fixup! activation-request: cease using the secrets if the original connection changed
-rw-r--r--include/nm-glib.h5
-rw-r--r--src/nm-activation-request.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/include/nm-glib.h b/include/nm-glib.h
index b46feb7666..2cd0f5d268 100644
--- a/include/nm-glib.h
+++ b/include/nm-glib.h
@@ -258,4 +258,9 @@ _g_key_file_save_to_file (GKeyFile *key_file,
#endif
+#if !GLIB_CHECK_VERSION (2, 44, 0)
+#define G_IO_ERROR_NOT_CONNECTED ((GIOErrorEnum) 45)
+#endif
+
+
#endif /* __NM_GLIB_H__ */
diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c
index 82326e884c..37052d9f6f 100644
--- a/src/nm-activation-request.c
+++ b/src/nm-activation-request.c
@@ -35,6 +35,7 @@
#include "nm-active-connection.h"
#include "nm-settings-connection.h"
#include "nm-auth-subject.h"
+#include "nm-glib.h"
G_DEFINE_TYPE (NMActRequest, nm_act_request, NM_TYPE_ACTIVE_CONNECTION)