diff options
| author | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
| commit | 34b1c46437df982495d08a8bbb8bd0b262d8af48 (patch) | |
| tree | 1db29ec39d9f733922b3a33cabcc8e6486fa06aa /introspection | |
| parent | 50fc50153b0036516b853aa576dc435bd53ce736 (diff) | |
| parent | 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 (diff) | |
Merge tag 'upstream/1.0.4'
Upstream version 1.0.4
Diffstat (limited to 'introspection')
| -rw-r--r-- | introspection/Makefile.in | 2 | ||||
| -rw-r--r-- | introspection/nm-device.xml | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/introspection/Makefile.in b/introspection/Makefile.in index 1f358d47..d9f37a99 100644 --- a/introspection/Makefile.in +++ b/introspection/Makefile.in @@ -198,6 +198,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -311,6 +312,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml index 0c2a330c..e405a384 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -637,6 +637,21 @@ The SIM PIN was incorrect. </tp:docstring> </tp:enumvalue> + <tp:enumvalue suffix="NEW_ACTIVATION" value="60"> + <tp:docstring> + A new connection activation was enqueued. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="PARENT_CHANGED" value="61"> + <tp:docstring> + The device's parent changed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="PARENT_MANAGED_CHANGED" value="62"> + <tp:docstring> + The device parent's management changed. + </tp:docstring> + </tp:enumvalue> </tp:enum> <tp:struct name="NM_DEVICE_STATE_REASON_STRUCT"> |