Hello community,
here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at 2013-10-14 09:30:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes 2013-10-08 10:59:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.NetworkManager.new/NetworkManager.changes 2013-10-14 09:30:11.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Oct 11 15:31:54 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 0.9.8.8 (bnc#845542):
+ + Fixes to the BlueZ code.
+ + A few memory leak fixes.
+ + Minor docs fixes.
+
+-------------------------------------------------------------------
+Thu Oct 10 11:48:13 UTC 2013 - rmilasan@suse.com
+
+- Switch to systemd check for the nfs script if enabled or not.
+ Also do not exit with error code if nfs script is not enabled.
+
+-------------------------------------------------------------------
Old:
----
NetworkManager-0.9.8.6.tar.xz
New:
----
NetworkManager-0.9.8.8.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.RmtgY4/_old 2013-10-14 09:30:17.000000000 +0200
+++ /var/tmp/diff_new_pack.RmtgY4/_new 2013-10-14 09:30:17.000000000 +0200
@@ -22,7 +22,7 @@
Name: NetworkManager
Url: http://www.gnome.org/projects/NetworkManager/
-Version: 0.9.8.6
+Version: 0.9.8.8
Release: 0
Summary: Network Link Manager and User Applications
License: GPL-2.0+
++++++ NetworkManager-0.9.8.6.tar.xz -> NetworkManager-0.9.8.8.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/NEWS new/NetworkManager-0.9.8.8/NEWS
--- old/NetworkManager-0.9.8.6/NEWS 2013-09-30 17:43:20.000000000 +0200
+++ new/NetworkManager-0.9.8.8/NEWS 2013-10-10 17:30:00.000000000 +0200
@@ -1,4 +1,15 @@
================================================
+NetworkManager-0.9.8.8
+Overview of changes since NetworkManager-0.9.8.6
+================================================
+
+This is a new stable release of NetworkManager. Notable changes include:
+
+* Fixes to the BlueZ code
+* A few memory leak fixes
+* Minor docs fixes
+
+================================================
NetworkManager-0.9.8.6
Overview of changes since NetworkManager-0.9.8.4
================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/configure new/NetworkManager-0.9.8.8/configure
--- old/NetworkManager-0.9.8.6/configure 2013-09-30 17:45:26.000000000 +0200
+++ new/NetworkManager-0.9.8.8/configure 2013-10-10 17:33:19.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for NetworkManager 0.9.8.6.
+# Generated by GNU Autoconf 2.69 for NetworkManager 0.9.8.8.
#
# Report bugs to http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='NetworkManager'
PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='0.9.8.6'
-PACKAGE_STRING='NetworkManager 0.9.8.6'
+PACKAGE_VERSION='0.9.8.8'
+PACKAGE_STRING='NetworkManager 0.9.8.8'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
PACKAGE_URL=''
@@ -1605,7 +1605,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures NetworkManager 0.9.8.6 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 0.9.8.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1675,7 +1675,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of NetworkManager 0.9.8.6:";;
+ short | recursive ) echo "Configuration of NetworkManager 0.9.8.8:";;
esac
cat <<\_ACEOF
@@ -1909,7 +1909,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-NetworkManager configure 0.9.8.6
+NetworkManager configure 0.9.8.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2453,7 +2453,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by NetworkManager $as_me 0.9.8.6, which was
+It was created by NetworkManager $as_me 0.9.8.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3322,7 +3322,7 @@
# Define the identity of the package.
PACKAGE='NetworkManager'
- VERSION='0.9.8.6'
+ VERSION='0.9.8.8'
cat >>confdefs.h <<_ACEOF
@@ -16569,7 +16569,7 @@
NM_MAJOR_VERSION=0
NM_MINOR_VERSION=9
NM_MICRO_VERSION=8
-NM_VERSION=0.9.8.6
+NM_VERSION=0.9.8.8
@@ -24178,7 +24178,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by NetworkManager $as_me 0.9.8.6, which was
+This file was extended by NetworkManager $as_me 0.9.8.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24244,7 +24244,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-NetworkManager config.status 0.9.8.6
+NetworkManager config.status 0.9.8.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/configure.ac new/NetworkManager-0.9.8.8/configure.ac
--- old/NetworkManager-0.9.8.6/configure.ac 2013-09-30 17:44:11.000000000 +0200
+++ new/NetworkManager-0.9.8.8/configure.ac 2013-10-10 17:30:56.000000000 +0200
@@ -4,7 +4,7 @@
m4_define([nm_major_version], [0])
m4_define([nm_minor_version], [9])
m4_define([nm_micro_version], [8])
-m4_define([nm_nano_version], [6])
+m4_define([nm_nano_version], [8])
m4_define([nm_version],
[nm_major_version.nm_minor_version.nm_micro_version.nm_nano_version])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/docs/api/html/index.html new/NetworkManager-0.9.8.8/docs/api/html/index.html
--- old/NetworkManager-0.9.8.6/docs/api/html/index.html 2013-09-30 17:47:17.000000000 +0200
+++ new/NetworkManager-0.9.8.8/docs/api/html/index.html 2013-10-10 17:38:04.000000000 +0200
@@ -14,7 +14,7 @@
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">NetworkManager D-Bus Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">Version 0.9.8.6
+<div><p class="releaseinfo">Version 0.9.8.8
</p></div>
<div><p class="copyright">Copyright © 2012 The NetworkManager Authors</p></div>
<div><div class="legalnotice">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/docs/api/html/spec.html new/NetworkManager-0.9.8.8/docs/api/html/spec.html
--- old/NetworkManager-0.9.8.6/docs/api/html/spec.html 2013-09-30 17:47:17.000000000 +0200
+++ new/NetworkManager-0.9.8.8/docs/api/html/spec.html 2013-10-10 17:38:04.000000000 +0200
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 0.9.8.6</title><style type="text/css">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 0.9.8.8</title><style type="text/css">
body {
font-family: sans-serif;
@@ -97,7 +97,7 @@
margin-right: 4em;
}
- </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.9.8.6</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license">
+ </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.9.8.8</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license">
<p>This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -1358,7 +1358,11 @@
<code>o</code> -
<code>(read)</code></dt><dd>The path of the connection.</dd><dt><code>SpecificObject</code> -
<code>o</code> -
- <code>(read)</code></dt><dd>A specific object associated with the active connection.</dd><dt><code>Uuid</code> -
+ <code>(read)</code></dt><dd>
+ A specific object associated with the active connection. This property
+ reflects the specific object used during connection activation, and will
+ not change over the lifetime of the ActiveConnection once set.
+ </dd><dt><code>Uuid</code> -
<code>s</code> -
<code>(read)</code></dt><dd>
The UUID of the connection, provided as a convenience so that clients
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/docs/api/spec.html new/NetworkManager-0.9.8.8/docs/api/spec.html
--- old/NetworkManager-0.9.8.6/docs/api/spec.html 2013-09-30 17:47:13.000000000 +0200
+++ new/NetworkManager-0.9.8.8/docs/api/spec.html 2013-10-10 17:37:37.000000000 +0200
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 0.9.8.6</title><style type="text/css">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ascii" /><title>NetworkManager D-Bus Interface Specification version 0.9.8.8</title><style type="text/css">
body {
font-family: sans-serif;
@@ -97,7 +97,7 @@
margin-right: 4em;
}
- </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.9.8.6</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license">
+ </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.9.8.8</h2><div>Copyright (C) 2008 - 2011 Red Hat, Inc.</div><div>Copyright (C) 2008 - 2009 Novell, Inc.</div><div class="license">
<p>This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -1358,7 +1358,11 @@
<code>o</code> -
<code>(read)</code></dt><dd>The path of the connection.</dd><dt><code>SpecificObject</code> -
<code>o</code> -
- <code>(read)</code></dt><dd>A specific object associated with the active connection.</dd><dt><code>Uuid</code> -
+ <code>(read)</code></dt><dd>
+ A specific object associated with the active connection. This property
+ reflects the specific object used during connection activation, and will
+ not change over the lifetime of the ActiveConnection once set.
+ </dd><dt><code>Uuid</code> -
<code>s</code> -
<code>(read)</code></dt><dd>
The UUID of the connection, provided as a convenience so that clients
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/docs/api/version.xml new/NetworkManager-0.9.8.8/docs/api/version.xml
--- old/NetworkManager-0.9.8.6/docs/api/version.xml 2013-09-30 17:45:34.000000000 +0200
+++ new/NetworkManager-0.9.8.8/docs/api/version.xml 2013-10-10 17:33:28.000000000 +0200
@@ -1 +1 @@
-0.9.8.6
+0.9.8.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/docs/libnm-glib/html/annotation-glossary.html new/NetworkManager-0.9.8.8/docs/libnm-glib/html/annotation-glossary.html
--- old/NetworkManager-0.9.8.6/docs/libnm-glib/html/annotation-glossary.html 2013-09-30 17:47:17.000000000 +0200
+++ new/NetworkManager-0.9.8.8/docs/libnm-glib/html/annotation-glossary.html 2013-10-10 17:38:04.000000000 +0200
@@ -20,11 +20,15 @@
<td> </td>
</tr>
<tr><td colspan="5" class="shortcuts">
-<a class="shortcut" href="#glsA">A</a>
+<a class="shortcut" href="#glsC">C</a>
|
- <a class="shortcut" href="#glsE">E</a>
+ <a class="shortcut" href="#glsT">T</a>
|
- <a class="shortcut" href="#glsO">O</a>
+ <a class="shortcut" href="#glsA">A</a>
+ |
+ <a class="shortcut" href="#glsS">S</a>
+ |
+ <a class="shortcut" href="#glsE">E</a>
|
<a class="shortcut" href="#glsT">T</a>
|
@@ -32,9 +36,7 @@
|
<a class="shortcut" href="#glsT">T</a>
|
- <a class="shortcut" href="#glsC">C</a>
- |
- <a class="shortcut" href="#glsS">S</a>
+ <a class="shortcut" href="#glsO">O</a>
|
<a class="shortcut" href="#glsT">T</a>
</td></tr>
@@ -42,35 +44,36 @@
<div class="glossary">
<div class="titlepage"><div><div><h1 class="title">
<a name="annotation-glossary"></a>Annotation Glossary</h1></div></div></div>
-<a name="glsA"></a><h3 class="title">A</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-array"></a>array</span></dt>
-<dd class="glossdef"><p>Parameter points to an array of items.</p></dd>
-<a name="glsE"></a><h3 class="title">E</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt>
-<dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd>
-<a name="glsO"></a><h3 class="title">O</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-out"></a>out</span></dt>
-<dd class="glossdef"><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
+<a name="glsC"></a><h3 class="title">C</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-closure"></a>closure</span></dt>
+<dd class="glossdef"><p>This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.</p></dd>
<a name="glsT"></a><h3 class="title">T</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20full"></a>transfer full</span></dt>
-<dd class="glossdef"><p>Free data after the code is done.</p></dd>
<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20container"></a>transfer container</span></dt>
<dd class="glossdef"><p>Free data container after the code is done.</p></dd>
<a name="glsA"></a><h3 class="title">A</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-allow-none"></a>allow-none</span></dt>
<dd class="glossdef"><p>NULL is ok, both for passing and for returning.</p></dd>
-<a name="glsT"></a><h3 class="title">T</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-type"></a>type</span></dt>
-<dd class="glossdef"><p>Override the parsed C type with given type.</p></dd>
-<a name="glsC"></a><h3 class="title">C</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-closure"></a>closure</span></dt>
-<dd class="glossdef"><p>This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.</p></dd>
<a name="glsS"></a><h3 class="title">S</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-scope%20async"></a>scope async</span></dt>
<dd class="glossdef"><p>The callback is valid until first called.</p></dd>
+<a name="glsE"></a><h3 class="title">E</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt>
+<dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd>
<a name="glsT"></a><h3 class="title">T</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20none"></a>transfer none</span></dt>
<dd class="glossdef"><p>Don't free data after the code is done.</p></dd>
+<a name="glsA"></a><h3 class="title">A</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-array"></a>array</span></dt>
+<dd class="glossdef"><p>Parameter points to an array of items.</p></dd>
+<a name="glsT"></a><h3 class="title">T</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-type"></a>type</span></dt>
+<dd class="glossdef"><p>Override the parsed C type with given type.</p></dd>
+<a name="glsO"></a><h3 class="title">O</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-out"></a>out</span></dt>
+<dd class="glossdef"><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
+<a name="glsT"></a><h3 class="title">T</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20full"></a>transfer full</span></dt>
+<dd class="glossdef"><p>Free data after the code is done.</p></dd>
</div>
<div class="footer">
<hr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/docs/libnm-glib/html/index.html new/NetworkManager-0.9.8.8/docs/libnm-glib/html/index.html
--- old/NetworkManager-0.9.8.6/docs/libnm-glib/html/index.html 2013-09-30 17:47:17.000000000 +0200
+++ new/NetworkManager-0.9.8.8/docs/libnm-glib/html/index.html 2013-10-10 17:38:04.000000000 +0200
@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-glib Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
- for libnm-glib 0.9.8.6
+ for libnm-glib 0.9.8.8
The latest version of this documentation can be found on-line at
<a class="ulink" href="http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/" target="_top">http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/</a>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/docs/libnm-glib/html/index.sgml new/NetworkManager-0.9.8.8/docs/libnm-glib/html/index.sgml
--- old/NetworkManager-0.9.8.6/docs/libnm-glib/html/index.sgml 2013-09-30 17:47:17.000000000 +0200
+++ new/NetworkManager-0.9.8.8/docs/libnm-glib/html/index.sgml 2013-10-10 17:38:04.000000000 +0200
@@ -913,13 +913,13 @@
<ANCHOR id="libnm-glib-nm-vpn-plugin-utils.details" href="libnm-glib/libnm-glib-nm-vpn-plugin-utils.html#libnm-glib-nm-vpn-plugin-utils.details">
<ANCHOR id="nm-vpn-plugin-utils-read-vpn-details" href="libnm-glib/libnm-glib-nm-vpn-plugin-utils.html#nm-vpn-plugin-utils-read-vpn-details">
<ANCHOR id="nm-vpn-plugin-utils-get-secret-flags" href="libnm-glib/libnm-glib-nm-vpn-plugin-utils.html#nm-vpn-plugin-utils-get-secret-flags">
-<ANCHOR id="annotation-glossterm-array" href="libnm-glib/annotation-glossary.html#annotation-glossterm-array">
-<ANCHOR id="annotation-glossterm-element-type" href="libnm-glib/annotation-glossary.html#annotation-glossterm-element-type">
-<ANCHOR id="annotation-glossterm-out" href="libnm-glib/annotation-glossary.html#annotation-glossterm-out">
-<ANCHOR id="annotation-glossterm-transfer full" href="libnm-glib/annotation-glossary.html#annotation-glossterm-transfer full">
+<ANCHOR id="annotation-glossterm-closure" href="libnm-glib/annotation-glossary.html#annotation-glossterm-closure">
<ANCHOR id="annotation-glossterm-transfer container" href="libnm-glib/annotation-glossary.html#annotation-glossterm-transfer container">
<ANCHOR id="annotation-glossterm-allow-none" href="libnm-glib/annotation-glossary.html#annotation-glossterm-allow-none">
-<ANCHOR id="annotation-glossterm-type" href="libnm-glib/annotation-glossary.html#annotation-glossterm-type">
-<ANCHOR id="annotation-glossterm-closure" href="libnm-glib/annotation-glossary.html#annotation-glossterm-closure">
<ANCHOR id="annotation-glossterm-scope async" href="libnm-glib/annotation-glossary.html#annotation-glossterm-scope async">
+<ANCHOR id="annotation-glossterm-element-type" href="libnm-glib/annotation-glossary.html#annotation-glossterm-element-type">
<ANCHOR id="annotation-glossterm-transfer none" href="libnm-glib/annotation-glossary.html#annotation-glossterm-transfer none">
+<ANCHOR id="annotation-glossterm-array" href="libnm-glib/annotation-glossary.html#annotation-glossterm-array">
+<ANCHOR id="annotation-glossterm-type" href="libnm-glib/annotation-glossary.html#annotation-glossterm-type">
+<ANCHOR id="annotation-glossterm-out" href="libnm-glib/annotation-glossary.html#annotation-glossterm-out">
+<ANCHOR id="annotation-glossterm-transfer full" href="libnm-glib/annotation-glossary.html#annotation-glossterm-transfer full">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/docs/libnm-glib/version.xml new/NetworkManager-0.9.8.8/docs/libnm-glib/version.xml
--- old/NetworkManager-0.9.8.6/docs/libnm-glib/version.xml 2013-09-30 17:45:34.000000000 +0200
+++ new/NetworkManager-0.9.8.8/docs/libnm-glib/version.xml 2013-10-10 17:33:28.000000000 +0200
@@ -1 +1 @@
-0.9.8.6
+0.9.8.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/docs/libnm-util/html/annotation-glossary.html new/NetworkManager-0.9.8.8/docs/libnm-util/html/annotation-glossary.html
--- old/NetworkManager-0.9.8.6/docs/libnm-util/html/annotation-glossary.html 2013-09-30 17:47:17.000000000 +0200
+++ new/NetworkManager-0.9.8.8/docs/libnm-util/html/annotation-glossary.html 2013-10-10 17:38:04.000000000 +0200
@@ -22,17 +22,19 @@
<tr><td colspan="5" class="shortcuts">
<a class="shortcut" href="#glsI">I</a>
|
+ <a class="shortcut" href="#glsA">A</a>
+ |
<a class="shortcut" href="#glsT">T</a>
|
- <a class="shortcut" href="#glsE">E</a>
+ <a class="shortcut" href="#glsO">O</a>
|
- <a class="shortcut" href="#glsA">A</a>
+ <a class="shortcut" href="#glsS">S</a>
|
<a class="shortcut" href="#glsT">T</a>
|
- <a class="shortcut" href="#glsS">S</a>
+ <a class="shortcut" href="#glsE">E</a>
|
- <a class="shortcut" href="#glsO">O</a>
+ <a class="shortcut" href="#glsT">T</a>
</td></tr>
</table>
<div class="glossary">
@@ -41,26 +43,27 @@
<a name="glsI"></a><h3 class="title">I</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-inout"></a>inout</span></dt>
<dd class="glossdef"><p>Parameter for input and for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
-<a name="glsT"></a><h3 class="title">T</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20none"></a>transfer none</span></dt>
-<dd class="glossdef"><p>Don't free data after the code is done.</p></dd>
-<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20full"></a>transfer full</span></dt>
-<dd class="glossdef"><p>Free data after the code is done.</p></dd>
-<a name="glsE"></a><h3 class="title">E</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt>
-<dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd>
<a name="glsA"></a><h3 class="title">A</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-allow-none"></a>allow-none</span></dt>
<dd class="glossdef"><p>NULL is ok, both for passing and for returning.</p></dd>
<a name="glsT"></a><h3 class="title">T</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20container"></a>transfer container</span></dt>
<dd class="glossdef"><p>Free data container after the code is done.</p></dd>
-<a name="glsS"></a><h3 class="title">S</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-scope%20call"></a>scope call</span></dt>
-<dd class="glossdef"><p>The callback is valid only during the call to the method.</p></dd>
<a name="glsO"></a><h3 class="title">O</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-out"></a>out</span></dt>
<dd class="glossdef"><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
+<a name="glsS"></a><h3 class="title">S</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-scope%20call"></a>scope call</span></dt>
+<dd class="glossdef"><p>The callback is valid only during the call to the method.</p></dd>
+<a name="glsT"></a><h3 class="title">T</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20none"></a>transfer none</span></dt>
+<dd class="glossdef"><p>Don't free data after the code is done.</p></dd>
+<a name="glsE"></a><h3 class="title">E</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt>
+<dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd>
+<a name="glsT"></a><h3 class="title">T</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20full"></a>transfer full</span></dt>
+<dd class="glossdef"><p>Free data after the code is done.</p></dd>
</div>
<div class="footer">
<hr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/docs/libnm-util/html/index.html new/NetworkManager-0.9.8.8/docs/libnm-util/html/index.html
--- old/NetworkManager-0.9.8.6/docs/libnm-util/html/index.html 2013-09-30 17:47:17.000000000 +0200
+++ new/NetworkManager-0.9.8.8/docs/libnm-util/html/index.html 2013-10-10 17:38:04.000000000 +0200
@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-util Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
- for libnm-util 0.9.8.6
+ for libnm-util 0.9.8.8
The latest version of this documentation can be found on-line at
<a class="ulink" href="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/" target="_top">http://projects.gnome.org/NetworkManager/developers/libnm-util/09/</a>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/docs/libnm-util/html/index.sgml new/NetworkManager-0.9.8.8/docs/libnm-util/html/index.sgml
--- old/NetworkManager-0.9.8.6/docs/libnm-util/html/index.sgml 2013-09-30 17:47:17.000000000 +0200
+++ new/NetworkManager-0.9.8.8/docs/libnm-util/html/index.sgml 2013-10-10 17:38:04.000000000 +0200
@@ -1425,10 +1425,10 @@
<ANCHOR id="nm-utils-iface-valid-name" href="libnm-util/libnm-util-nm-utils.html#nm-utils-iface-valid-name">
<ANCHOR id="nm-utils-is-uuid" href="libnm-util/libnm-util-nm-utils.html#nm-utils-is-uuid">
<ANCHOR id="annotation-glossterm-inout" href="libnm-util/annotation-glossary.html#annotation-glossterm-inout">
-<ANCHOR id="annotation-glossterm-transfer none" href="libnm-util/annotation-glossary.html#annotation-glossterm-transfer none">
-<ANCHOR id="annotation-glossterm-transfer full" href="libnm-util/annotation-glossary.html#annotation-glossterm-transfer full">
-<ANCHOR id="annotation-glossterm-element-type" href="libnm-util/annotation-glossary.html#annotation-glossterm-element-type">
<ANCHOR id="annotation-glossterm-allow-none" href="libnm-util/annotation-glossary.html#annotation-glossterm-allow-none">
<ANCHOR id="annotation-glossterm-transfer container" href="libnm-util/annotation-glossary.html#annotation-glossterm-transfer container">
-<ANCHOR id="annotation-glossterm-scope call" href="libnm-util/annotation-glossary.html#annotation-glossterm-scope call">
<ANCHOR id="annotation-glossterm-out" href="libnm-util/annotation-glossary.html#annotation-glossterm-out">
+<ANCHOR id="annotation-glossterm-scope call" href="libnm-util/annotation-glossary.html#annotation-glossterm-scope call">
+<ANCHOR id="annotation-glossterm-transfer none" href="libnm-util/annotation-glossary.html#annotation-glossterm-transfer none">
+<ANCHOR id="annotation-glossterm-element-type" href="libnm-util/annotation-glossary.html#annotation-glossterm-element-type">
+<ANCHOR id="annotation-glossterm-transfer full" href="libnm-util/annotation-glossary.html#annotation-glossterm-transfer full">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/docs/libnm-util/version.xml new/NetworkManager-0.9.8.8/docs/libnm-util/version.xml
--- old/NetworkManager-0.9.8.6/docs/libnm-util/version.xml 2013-09-30 17:45:34.000000000 +0200
+++ new/NetworkManager-0.9.8.8/docs/libnm-util/version.xml 2013-10-10 17:33:28.000000000 +0200
@@ -1 +1 @@
-0.9.8.6
+0.9.8.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/introspection/nm-active-connection.xml new/NetworkManager-0.9.8.8/introspection/nm-active-connection.xml
--- old/NetworkManager-0.9.8.6/introspection/nm-active-connection.xml 2013-09-30 17:26:04.000000000 +0200
+++ new/NetworkManager-0.9.8.8/introspection/nm-active-connection.xml 2013-10-10 17:27:16.000000000 +0200
@@ -14,7 +14,11 @@
tp:docstringThe path of the connection.
</property>
<property name="SpecificObject" type="o" access="read">
- tp:docstringA specific object associated with the active connection.
+ tp:docstring
+ A specific object associated with the active connection. This property
+ reflects the specific object used during connection activation, and will
+ not change over the lifetime of the ActiveConnection once set.
+
</property>
<property name="Uuid" type="s" access="read">
tp:docstring
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/libnm-glib/nm-client.c new/NetworkManager-0.9.8.8/libnm-glib/nm-client.c
--- old/NetworkManager-0.9.8.6/libnm-glib/nm-client.c 2013-09-30 17:26:04.000000000 +0200
+++ new/NetworkManager-0.9.8.8/libnm-glib/nm-client.c 2013-10-10 17:23:40.000000000 +0200
@@ -473,7 +473,7 @@
recheck_pending_activations (NMClient *self, const char *failed_path, GError *error)
{
NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (self);
- GSList *iter;
+ GSList *iter, *next;
const GPtrArray *active_connections;
gboolean found_in_active = FALSE;
gboolean found_in_pending = FALSE;
@@ -488,9 +488,11 @@
* If the connection to activate doesn't make it to active_connections,
* due to an error, we have to call the callback for failed_path.
*/
- for (iter = priv->pending_activations; iter; iter = g_slist_next (iter)) {
+ for (iter = priv->pending_activations; iter; iter = next) {
ActivateInfo *info = iter->data;
+ next = g_slist_next (iter);
+
if (!found_in_pending && failed_path && g_strcmp0 (failed_path, info->active_path) == 0) {
found_in_pending = TRUE;
ainfo = info;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/libnm-glib/nm-device.c new/NetworkManager-0.9.8.8/libnm-glib/nm-device.c
--- old/NetworkManager-0.9.8.6/libnm-glib/nm-device.c 2013-09-30 17:26:04.000000000 +0200
+++ new/NetworkManager-0.9.8.8/libnm-glib/nm-device.c 2013-10-10 17:23:44.000000000 +0200
@@ -205,6 +205,11 @@
NMDevice *self = NM_DEVICE (object);
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
StateChangeData *data = user_data;
+ NMDeviceState old_state = data->old_state;
+ NMDeviceState new_state = data->new_state;
+ NMDeviceStateReason reason = data->reason;
+
+ g_slice_free (StateChangeData, data);
_nm_object_reload_properties_finish (NM_OBJECT (object), result, NULL);
@@ -213,17 +218,16 @@
* they'll finish in the right order. In that case, only emit the signal
* for the last one.
*/
- if (priv->last_seen_state != data->new_state)
+ if (priv->last_seen_state != new_state)
return;
/* Ensure that nm_device_get_state() will return the right value even if
* we haven't processed the corresponding PropertiesChanged yet.
*/
- priv->state = data->new_state;
+ priv->state = new_state;
g_signal_emit (self, signals[STATE_CHANGED], 0,
- data->new_state, data->old_state, data->reason);
- g_slice_free (StateChangeData, data);
+ new_state, old_state, reason);
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/libnm-glib/nm-object.c new/NetworkManager-0.9.8.8/libnm-glib/nm-object.c
--- old/NetworkManager-0.9.8.6/libnm-glib/nm-object.c 2013-09-30 17:26:04.000000000 +0200
+++ new/NetworkManager-0.9.8.8/libnm-glib/nm-object.c 2013-10-10 17:23:40.000000000 +0200
@@ -645,8 +645,10 @@
if (obj != NULL) {
for (i = 0; i < array->len; i++) {
- if (g_ptr_array_index (array, i) == obj)
+ if (g_ptr_array_index (array, i) == obj) {
+ g_object_unref (obj);
return;
+ }
}
g_ptr_array_add (array, obj);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/libnm-util/nm-setting-bond.c new/NetworkManager-0.9.8.8/libnm-util/nm-setting-bond.c
--- old/NetworkManager-0.9.8.6/libnm-util/nm-setting-bond.c 2013-09-30 17:26:04.000000000 +0200
+++ new/NetworkManager-0.9.8.8/libnm-util/nm-setting-bond.c 2013-10-10 17:26:36.000000000 +0200
@@ -257,10 +257,12 @@
g_hash_table_insert (priv->options, g_strdup (name), g_strdup (value));
- if (!strcmp (name, NM_SETTING_BOND_OPTION_MIIMON)) {
+ if ( !strcmp (name, NM_SETTING_BOND_OPTION_MIIMON)
+ && strcmp (value, "0") != 0) {
g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_ARP_INTERVAL);
g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_ARP_IP_TARGET);
- } else if (!strcmp (name, NM_SETTING_BOND_OPTION_ARP_INTERVAL)) {
+ } else if ( !strcmp (name, NM_SETTING_BOND_OPTION_ARP_INTERVAL)
+ && strcmp (value, "0") != 0) {
g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_MIIMON);
g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_DOWNDELAY);
g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_UPDELAY);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/libnm-util/nm-setting-connection.c new/NetworkManager-0.9.8.8/libnm-util/nm-setting-connection.c
--- old/NetworkManager-0.9.8.6/libnm-util/nm-setting-connection.c 2013-09-30 17:26:04.000000000 +0200
+++ new/NetworkManager-0.9.8.8/libnm-util/nm-setting-connection.c 2013-10-10 17:23:40.000000000 +0200
@@ -773,6 +773,7 @@
g_free (priv->master);
g_free (priv->slave_type);
nm_utils_slist_free (priv->permissions, (GDestroyNotify) permission_free);
+ nm_utils_slist_free (priv->secondaries, g_free);
G_OBJECT_CLASS (nm_setting_connection_parent_class)->finalize (object);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/libnm-util/nm-setting-vlan.c new/NetworkManager-0.9.8.8/libnm-util/nm-setting-vlan.c
--- old/NetworkManager-0.9.8.6/libnm-util/nm-setting-vlan.c 2013-09-30 17:26:04.000000000 +0200
+++ new/NetworkManager-0.9.8.8/libnm-util/nm-setting-vlan.c 2013-10-10 17:23:40.000000000 +0200
@@ -636,6 +636,8 @@
g_free (priv->parent);
nm_utils_slist_free (priv->ingress_priority_map, g_free);
nm_utils_slist_free (priv->egress_priority_map, g_free);
+
+ G_OBJECT_CLASS (nm_setting_vlan_parent_class)->finalize (object);
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/man/nmcli.1.in new/NetworkManager-0.9.8.8/man/nmcli.1.in
--- old/NetworkManager-0.9.8.6/man/nmcli.1.in 2013-09-30 17:26:04.000000000 +0200
+++ new/NetworkManager-0.9.8.8/man/nmcli.1.in 2013-10-10 17:23:44.000000000 +0200
@@ -24,7 +24,7 @@
.TH NMCLI "1" "17 January 2013"
.SH NAME
-nmcli \(en command\(hyline tool for controlling NetworkManager
+nmcli \- command\(hyline tool for controlling NetworkManager
.SH SYNOPSIS
.ad l
.B nmcli
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/src/bluez-manager/nm-bluez-device.c new/NetworkManager-0.9.8.8/src/bluez-manager/nm-bluez-device.c
--- old/NetworkManager-0.9.8.6/src/bluez-manager/nm-bluez-device.c 2013-09-30 17:26:11.000000000 +0200
+++ new/NetworkManager-0.9.8.8/src/bluez-manager/nm-bluez-device.c 2013-10-10 17:23:44.000000000 +0200
@@ -99,6 +99,7 @@
static void cp_connection_added (NMConnectionProvider *provider,
NMConnection *connection, NMBluezDevice *self);
+static gboolean connection_compatible (NMBluezDevice *self, NMConnection *connection);
/***********************************************************/
@@ -247,8 +248,10 @@
g_signal_handlers_unblock_by_func (priv->provider, cp_connection_added, self);
if (added) {
- g_assert (g_slist_find (priv->connections, added));
+ g_assert (!g_slist_find (priv->connections, added));
+ g_assert (connection_compatible (self, added));
+ priv->connections = g_slist_prepend (priv->connections, g_object_ref (added));
priv->pan_connection = added;
nm_log_dbg (LOGD_SETTINGS, "added new Bluetooth connection for NAP device '%s': '%s' (%s)", priv->path, id, uuid);
} else {
@@ -468,7 +471,8 @@
gpointer user_data)
{
GSimpleAsyncResult *result = G_SIMPLE_ASYNC_RESULT (user_data);
- NMBluezDevice *self = NM_BLUEZ_DEVICE (g_async_result_get_source_object (G_ASYNC_RESULT (result)));
+ GObject *result_object = g_async_result_get_source_object (G_ASYNC_RESULT (result));
+ NMBluezDevice *self = NM_BLUEZ_DEVICE (result_object);
NMBluezDevicePrivate *priv = NM_BLUEZ_DEVICE_GET_PRIVATE (self);
GError *error = NULL;
char *device;
@@ -490,6 +494,7 @@
g_simple_async_result_complete (result);
g_object_unref (result);
+ g_object_unref (result_object);
}
void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/src/generated/nm-enum-types.c new/NetworkManager-0.9.8.8/src/generated/nm-enum-types.c
--- old/NetworkManager-0.9.8.6/src/generated/nm-enum-types.c 2013-09-30 17:46:00.000000000 +0200
+++ new/NetworkManager-0.9.8.8/src/generated/nm-enum-types.c 2013-10-10 17:36:45.000000000 +0200
@@ -5,52 +5,52 @@
#include "nm-enum-types.h"
+#include "nm-manager.h"
+#include "nm-types.h"
+#include "nm-system.h"
#include "nm-hostname-provider.h"
+#include "nm-manager-auth.h"
+#include "nm-netlink-utils.h"
+#include "nm-netlink-monitor.h"
+#include "nm-connectivity.h"
+#include "nm-device-vlan.h"
+#include "nm-ip4-config.h"
#include "nm-sleep-monitor.h"
-#include "nm-device-factory.h"
-#include "nm-rfkill.h"
-#include "NetworkManagerUtils.h"
+#include "nm-device.h"
+#include "nm-device-olpc-mesh.h"
+#include "nm-device-bridge.h"
+#include "nm-device-private.h"
+#include "nm-dhcp6-config.h"
+#include "nm-ip6-config.h"
+#include "nm-device-bond.h"
+#include "nm-wifi-ap-utils.h"
+#include "nm-device-adsl.h"
+#include "nm-policy.h"
+#include "nm-device-modem.h"
+#include "nm-activation-request.h"
+#include "nm-policy-hostname.h"
#include "nm-properties-changed-signal.h"
#include "nm-wifi-ap.h"
-#include "nm-device-bt.h"
-#include "nm-device-bond.h"
-#include "nm-dbus-manager.h"
+#include "nm-config.h"
#include "nm-device-wired.h"
+#include "nm-rfkill.h"
+#include "NetworkManagerUtils.h"
+#include "nm-device-factory.h"
#include "nm-active-connection.h"
-#include "nm-device-bridge.h"
-#include "nm-system.h"
-#include "nm-dhcp6-config.h"
+#include "nm-device-bt.h"
+#include "nm-device-infiniband.h"
+#include "nm-device-wifi.h"
+#include "nm-dbus-manager.h"
+#include "nm-dhcp4-config.h"
#include "nm-session-utils.h"
#include "nm-netlink-compat.h"
#include "nm-session-monitor.h"
#include "nm-connection-provider.h"
#include "nm-device-ethernet.h"
#include "nm-call-store.h"
-#include "nm-manager.h"
-#include "nm-dispatcher.h"
-#include "nm-ip4-config.h"
-#include "nm-device-modem.h"
-#include "nm-activation-request.h"
-#include "nm-wifi-ap-utils.h"
-#include "nm-device-adsl.h"
-#include "nm-device.h"
-#include "nm-types.h"
-#include "nm-device-olpc-mesh.h"
-#include "nm-device-infiniband.h"
-#include "nm-ip6-config.h"
-#include "nm-device-private.h"
-#include "nm-policy.h"
-#include "nm-manager-auth.h"
-#include "nm-device-wifi.h"
-#include "nm-config.h"
-#include "nm-policy-hostname.h"
-#include "nm-netlink-utils.h"
-#include "nm-dhcp4-config.h"
#include "nm-policy-hosts.h"
+#include "nm-dispatcher.h"
#include "nm-udev-manager.h"
-#include "nm-connectivity.h"
-#include "nm-netlink-monitor.h"
-#include "nm-device-vlan.h"
#include "nm-logging.h"
#include "nm-dns-utils.h"
#include "nm-dns-plugin.h"
@@ -101,464 +101,464 @@
#include "nm-wimax-nsp.h"
GType
-nm_rf_kill_state_get_type (void)
+nm_manager_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { RFKILL_UNBLOCKED, "RFKILL_UNBLOCKED", "unblocked" },
- { RFKILL_SOFT_BLOCKED, "RFKILL_SOFT_BLOCKED", "soft-blocked" },
- { RFKILL_HARD_BLOCKED, "RFKILL_HARD_BLOCKED", "hard-blocked" },
+ { NM_MANAGER_ERROR_UNKNOWN_CONNECTION, "NM_MANAGER_ERROR_UNKNOWN_CONNECTION", "UnknownConnection" },
+ { NM_MANAGER_ERROR_UNKNOWN_DEVICE, "NM_MANAGER_ERROR_UNKNOWN_DEVICE", "UnknownDevice" },
+ { NM_MANAGER_ERROR_UNMANAGED_DEVICE, "NM_MANAGER_ERROR_UNMANAGED_DEVICE", "UnmanagedDevice" },
+ { NM_MANAGER_ERROR_SYSTEM_CONNECTION, "NM_MANAGER_ERROR_SYSTEM_CONNECTION", "SystemConnection" },
+ { NM_MANAGER_ERROR_PERMISSION_DENIED, "NM_MANAGER_ERROR_PERMISSION_DENIED", "PermissionDenied" },
+ { NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE, "NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE", "ConnectionNotActive" },
+ { NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE, "NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE", "AlreadyAsleepOrAwake" },
+ { NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED, "NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED", "AlreadyEnabledOrDisabled" },
+ { NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE, "NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE", "UnsupportedConnectionType" },
+ { NM_MANAGER_ERROR_DEPENDENCY_FAILED, "NM_MANAGER_ERROR_DEPENDENCY_FAILED", "DependencyFailed" },
+ { NM_MANAGER_ERROR_AUTOCONNECT_NOT_ALLOWED, "NM_MANAGER_ERROR_AUTOCONNECT_NOT_ALLOWED", "AutoconnectNotAllowed" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("RfKillState"), values);
+ g_enum_register_static (g_intern_static_string ("NMManagerError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_rf_kill_type_get_type (void)
+nm_auth_call_result_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { RFKILL_TYPE_WLAN, "RFKILL_TYPE_WLAN", "wlan" },
- { RFKILL_TYPE_WWAN, "RFKILL_TYPE_WWAN", "wwan" },
- { RFKILL_TYPE_WIMAX, "RFKILL_TYPE_WIMAX", "wimax" },
- { RFKILL_TYPE_UNKNOWN, "RFKILL_TYPE_UNKNOWN", "unknown" },
- { RFKILL_TYPE_MAX, "RFKILL_TYPE_MAX", "max" },
+ { NM_AUTH_CALL_RESULT_UNKNOWN, "NM_AUTH_CALL_RESULT_UNKNOWN", "unknown" },
+ { NM_AUTH_CALL_RESULT_YES, "NM_AUTH_CALL_RESULT_YES", "yes" },
+ { NM_AUTH_CALL_RESULT_AUTH, "NM_AUTH_CALL_RESULT_AUTH", "auth" },
+ { NM_AUTH_CALL_RESULT_NO, "NM_AUTH_CALL_RESULT_NO", "no" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("RfKillType"), values);
+ g_enum_register_static (g_intern_static_string ("NMAuthCallResult"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_bt_error_get_type (void)
+nm_nm_nl_prop_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_BT_ERROR_CONNECTION_NOT_BT, "NM_BT_ERROR_CONNECTION_NOT_BT", "ConnectionNotBt" },
- { NM_BT_ERROR_CONNECTION_INVALID, "NM_BT_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
- { NM_BT_ERROR_CONNECTION_INCOMPATIBLE, "NM_BT_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+ { NMNL_PROP_INVALID, "NMNL_PROP_INVALID", "invalid" },
+ { NMNL_PROP_PROT, "NMNL_PROP_PROT", "prot" },
+ { NMNL_PROP_SCOPE, "NMNL_PROP_SCOPE", "scope" },
+ { NMNL_PROP_TABLE, "NMNL_PROP_TABLE", "table" },
+ { NMNL_PROP_PRIO, "NMNL_PROP_PRIO", "prio" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMBtError"), values);
+ g_enum_register_static (g_intern_static_string ("NmNlProp"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_bond_error_get_type (void)
+nm_netlink_monitor_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_BOND_ERROR_CONNECTION_NOT_BOND, "NM_BOND_ERROR_CONNECTION_NOT_BOND", "ConnectionNotBond" },
- { NM_BOND_ERROR_CONNECTION_INVALID, "NM_BOND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
- { NM_BOND_ERROR_CONNECTION_INCOMPATIBLE, "NM_BOND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+ { NM_NETLINK_MONITOR_ERROR_GENERIC, "NM_NETLINK_MONITOR_ERROR_GENERIC", "generic" },
+ { NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_HANDLE, "NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_HANDLE", "netlink-alloc-handle" },
+ { NM_NETLINK_MONITOR_ERROR_NETLINK_CONNECT, "NM_NETLINK_MONITOR_ERROR_NETLINK_CONNECT", "netlink-connect" },
+ { NM_NETLINK_MONITOR_ERROR_NETLINK_JOIN_GROUP, "NM_NETLINK_MONITOR_ERROR_NETLINK_JOIN_GROUP", "netlink-join-group" },
+ { NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_LINK_CACHE, "NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_LINK_CACHE", "netlink-alloc-link-cache" },
+ { NM_NETLINK_MONITOR_ERROR_PROCESSING_MESSAGE, "NM_NETLINK_MONITOR_ERROR_PROCESSING_MESSAGE", "processing-message" },
+ { NM_NETLINK_MONITOR_ERROR_BAD_ALLOC, "NM_NETLINK_MONITOR_ERROR_BAD_ALLOC", "bad-alloc" },
+ { NM_NETLINK_MONITOR_ERROR_WAITING_FOR_SOCKET_DATA, "NM_NETLINK_MONITOR_ERROR_WAITING_FOR_SOCKET_DATA", "waiting-for-socket-data" },
+ { NM_NETLINK_MONITOR_ERROR_LINK_CACHE_UPDATE, "NM_NETLINK_MONITOR_ERROR_LINK_CACHE_UPDATE", "link-cache-update" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMBondError"), values);
+ g_enum_register_static (g_intern_static_string ("NMNetlinkMonitorError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_bridge_error_get_type (void)
+nm_vlan_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE, "NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE", "ConnectionNotBridge" },
- { NM_BRIDGE_ERROR_CONNECTION_INVALID, "NM_BRIDGE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
- { NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE, "NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+ { NM_VLAN_ERROR_CONNECTION_NOT_VLAN, "NM_VLAN_ERROR_CONNECTION_NOT_VLAN", "ConnectionNotVlan" },
+ { NM_VLAN_ERROR_CONNECTION_INVALID, "NM_VLAN_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+ { NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE, "NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMBridgeError"), values);
+ g_enum_register_static (g_intern_static_string ("NMVlanError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_session_monitor_error_get_type (void)
+nm_ip4_config_compare_flags_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_SESSION_MONITOR_ERROR_IO_ERROR, "NM_SESSION_MONITOR_ERROR_IO_ERROR", "IOError" },
- { NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, "NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE", "MalformedDatabase" },
- { NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, "NM_SESSION_MONITOR_ERROR_UNKNOWN_USER", "UnknownUser" },
- { NM_SESSION_MONITOR_ERROR_NO_DATABASE, "NM_SESSION_MONITOR_ERROR_NO_DATABASE", "NoDatabase" },
+ { NM_IP4_COMPARE_FLAG_NONE, "NM_IP4_COMPARE_FLAG_NONE", "none" },
+ { NM_IP4_COMPARE_FLAG_ADDRESSES, "NM_IP4_COMPARE_FLAG_ADDRESSES", "addresses" },
+ { NM_IP4_COMPARE_FLAG_PTP_ADDRESS, "NM_IP4_COMPARE_FLAG_PTP_ADDRESS", "ptp-address" },
+ { NM_IP4_COMPARE_FLAG_NAMESERVERS, "NM_IP4_COMPARE_FLAG_NAMESERVERS", "nameservers" },
+ { NM_IP4_COMPARE_FLAG_ROUTES, "NM_IP4_COMPARE_FLAG_ROUTES", "routes" },
+ { NM_IP4_COMPARE_FLAG_DOMAINS, "NM_IP4_COMPARE_FLAG_DOMAINS", "domains" },
+ { NM_IP4_COMPARE_FLAG_SEARCHES, "NM_IP4_COMPARE_FLAG_SEARCHES", "searches" },
+ { NM_IP4_COMPARE_FLAG_MTU, "NM_IP4_COMPARE_FLAG_MTU", "mtu" },
+ { NM_IP4_COMPARE_FLAG_MSS, "NM_IP4_COMPARE_FLAG_MSS", "mss" },
+ { NM_IP4_COMPARE_FLAG_WINS_SERVERS, "NM_IP4_COMPARE_FLAG_WINS_SERVERS", "wins-servers" },
+ { NM_IP4_COMPARE_FLAG_NIS_SERVERS, "NM_IP4_COMPARE_FLAG_NIS_SERVERS", "nis-servers" },
+ { NM_IP4_COMPARE_FLAG_NIS_DOMAIN, "NM_IP4_COMPARE_FLAG_NIS_DOMAIN", "nis-domain" },
+ { NM_IP4_COMPARE_FLAG_ALL, "NM_IP4_COMPARE_FLAG_ALL", "all" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMSessionMonitorError"), values);
+ g_enum_register_static (g_intern_static_string ("NMIP4ConfigCompareFlags"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_ethernet_error_get_type (void)
+nm_device_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED, "NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED", "ConnectionNotWired" },
- { NM_ETHERNET_ERROR_CONNECTION_INVALID, "NM_ETHERNET_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
- { NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE, "NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+ { NM_DEVICE_ERROR_CONNECTION_ACTIVATING, "NM_DEVICE_ERROR_CONNECTION_ACTIVATING", "ConnectionActivating" },
+ { NM_DEVICE_ERROR_CONNECTION_INVALID, "NM_DEVICE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+ { NM_DEVICE_ERROR_NOT_ACTIVE, "NM_DEVICE_ERROR_NOT_ACTIVE", "NotActive" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMEthernetError"), values);
+ g_enum_register_static (g_intern_static_string ("NMDeviceError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_manager_error_get_type (void)
+nm_olpc_mesh_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_MANAGER_ERROR_UNKNOWN_CONNECTION, "NM_MANAGER_ERROR_UNKNOWN_CONNECTION", "UnknownConnection" },
- { NM_MANAGER_ERROR_UNKNOWN_DEVICE, "NM_MANAGER_ERROR_UNKNOWN_DEVICE", "UnknownDevice" },
- { NM_MANAGER_ERROR_UNMANAGED_DEVICE, "NM_MANAGER_ERROR_UNMANAGED_DEVICE", "UnmanagedDevice" },
- { NM_MANAGER_ERROR_SYSTEM_CONNECTION, "NM_MANAGER_ERROR_SYSTEM_CONNECTION", "SystemConnection" },
- { NM_MANAGER_ERROR_PERMISSION_DENIED, "NM_MANAGER_ERROR_PERMISSION_DENIED", "PermissionDenied" },
- { NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE, "NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE", "ConnectionNotActive" },
- { NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE, "NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE", "AlreadyAsleepOrAwake" },
- { NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED, "NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED", "AlreadyEnabledOrDisabled" },
- { NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE, "NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE", "UnsupportedConnectionType" },
- { NM_MANAGER_ERROR_DEPENDENCY_FAILED, "NM_MANAGER_ERROR_DEPENDENCY_FAILED", "DependencyFailed" },
- { NM_MANAGER_ERROR_AUTOCONNECT_NOT_ALLOWED, "NM_MANAGER_ERROR_AUTOCONNECT_NOT_ALLOWED", "AutoconnectNotAllowed" },
+ { NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH, "NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH", "ConnectionNotMesh" },
+ { NM_OLPC_MESH_ERROR_CONNECTION_INVALID, "NM_OLPC_MESH_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+ { NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE, "NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMManagerError"), values);
+ g_enum_register_static (g_intern_static_string ("NMOlpcMeshError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_dispatcher_action_get_type (void)
+nm_bridge_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { DISPATCHER_ACTION_HOSTNAME, "DISPATCHER_ACTION_HOSTNAME", "hostname" },
- { DISPATCHER_ACTION_UP, "DISPATCHER_ACTION_UP", "up" },
- { DISPATCHER_ACTION_PRE_DOWN, "DISPATCHER_ACTION_PRE_DOWN", "pre-down" },
- { DISPATCHER_ACTION_DOWN, "DISPATCHER_ACTION_DOWN", "down" },
- { DISPATCHER_ACTION_VPN_UP, "DISPATCHER_ACTION_VPN_UP", "vpn-up" },
- { DISPATCHER_ACTION_VPN_PRE_DOWN, "DISPATCHER_ACTION_VPN_PRE_DOWN", "vpn-pre-down" },
- { DISPATCHER_ACTION_VPN_DOWN, "DISPATCHER_ACTION_VPN_DOWN", "vpn-down" },
- { DISPATCHER_ACTION_DHCP4_CHANGE, "DISPATCHER_ACTION_DHCP4_CHANGE", "dhcp4-change" },
- { DISPATCHER_ACTION_DHCP6_CHANGE, "DISPATCHER_ACTION_DHCP6_CHANGE", "dhcp6-change" },
+ { NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE, "NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE", "ConnectionNotBridge" },
+ { NM_BRIDGE_ERROR_CONNECTION_INVALID, "NM_BRIDGE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+ { NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE, "NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("DispatcherAction"), values);
+ g_enum_register_static (g_intern_static_string ("NMBridgeError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_ip4_config_compare_flags_get_type (void)
+nm_ip6_config_compare_flags_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_IP4_COMPARE_FLAG_NONE, "NM_IP4_COMPARE_FLAG_NONE", "none" },
- { NM_IP4_COMPARE_FLAG_ADDRESSES, "NM_IP4_COMPARE_FLAG_ADDRESSES", "addresses" },
- { NM_IP4_COMPARE_FLAG_PTP_ADDRESS, "NM_IP4_COMPARE_FLAG_PTP_ADDRESS", "ptp-address" },
- { NM_IP4_COMPARE_FLAG_NAMESERVERS, "NM_IP4_COMPARE_FLAG_NAMESERVERS", "nameservers" },
- { NM_IP4_COMPARE_FLAG_ROUTES, "NM_IP4_COMPARE_FLAG_ROUTES", "routes" },
- { NM_IP4_COMPARE_FLAG_DOMAINS, "NM_IP4_COMPARE_FLAG_DOMAINS", "domains" },
- { NM_IP4_COMPARE_FLAG_SEARCHES, "NM_IP4_COMPARE_FLAG_SEARCHES", "searches" },
- { NM_IP4_COMPARE_FLAG_MTU, "NM_IP4_COMPARE_FLAG_MTU", "mtu" },
- { NM_IP4_COMPARE_FLAG_MSS, "NM_IP4_COMPARE_FLAG_MSS", "mss" },
- { NM_IP4_COMPARE_FLAG_WINS_SERVERS, "NM_IP4_COMPARE_FLAG_WINS_SERVERS", "wins-servers" },
- { NM_IP4_COMPARE_FLAG_NIS_SERVERS, "NM_IP4_COMPARE_FLAG_NIS_SERVERS", "nis-servers" },
- { NM_IP4_COMPARE_FLAG_NIS_DOMAIN, "NM_IP4_COMPARE_FLAG_NIS_DOMAIN", "nis-domain" },
- { NM_IP4_COMPARE_FLAG_ALL, "NM_IP4_COMPARE_FLAG_ALL", "all" },
+ { NM_IP6_COMPARE_FLAG_NONE, "NM_IP6_COMPARE_FLAG_NONE", "none" },
+ { NM_IP6_COMPARE_FLAG_ADDRESSES, "NM_IP6_COMPARE_FLAG_ADDRESSES", "addresses" },
+ { NM_IP6_COMPARE_FLAG_PTP_ADDRESS, "NM_IP6_COMPARE_FLAG_PTP_ADDRESS", "ptp-address" },
+ { NM_IP6_COMPARE_FLAG_NAMESERVERS, "NM_IP6_COMPARE_FLAG_NAMESERVERS", "nameservers" },
+ { NM_IP6_COMPARE_FLAG_ROUTES, "NM_IP6_COMPARE_FLAG_ROUTES", "routes" },
+ { NM_IP6_COMPARE_FLAG_DOMAINS, "NM_IP6_COMPARE_FLAG_DOMAINS", "domains" },
+ { NM_IP6_COMPARE_FLAG_SEARCHES, "NM_IP6_COMPARE_FLAG_SEARCHES", "searches" },
+ { NM_IP6_COMPARE_FLAG_MSS, "NM_IP6_COMPARE_FLAG_MSS", "mss" },
+ { NM_IP6_COMPARE_FLAG_ALL, "NM_IP6_COMPARE_FLAG_ALL", "all" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMIP4ConfigCompareFlags"), values);
+ g_enum_register_static (g_intern_static_string ("NMIP6ConfigCompareFlags"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_adsl_error_get_type (void)
+nm_bond_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_ADSL_ERROR_CONNECTION_NOT_ADSL, "NM_ADSL_ERROR_CONNECTION_NOT_ADSL", "ConnectionNotAdsl" },
- { NM_ADSL_ERROR_CONNECTION_INVALID, "NM_ADSL_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
- { NM_ADSL_ERROR_CONNECTION_INCOMPATIBLE, "NM_ADSL_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+ { NM_BOND_ERROR_CONNECTION_NOT_BOND, "NM_BOND_ERROR_CONNECTION_NOT_BOND", "ConnectionNotBond" },
+ { NM_BOND_ERROR_CONNECTION_INVALID, "NM_BOND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+ { NM_BOND_ERROR_CONNECTION_INCOMPATIBLE, "NM_BOND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMAdslError"), values);
+ g_enum_register_static (g_intern_static_string ("NMBondError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_device_error_get_type (void)
+nm_adsl_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_DEVICE_ERROR_CONNECTION_ACTIVATING, "NM_DEVICE_ERROR_CONNECTION_ACTIVATING", "ConnectionActivating" },
- { NM_DEVICE_ERROR_CONNECTION_INVALID, "NM_DEVICE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
- { NM_DEVICE_ERROR_NOT_ACTIVE, "NM_DEVICE_ERROR_NOT_ACTIVE", "NotActive" },
+ { NM_ADSL_ERROR_CONNECTION_NOT_ADSL, "NM_ADSL_ERROR_CONNECTION_NOT_ADSL", "ConnectionNotAdsl" },
+ { NM_ADSL_ERROR_CONNECTION_INVALID, "NM_ADSL_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+ { NM_ADSL_ERROR_CONNECTION_INCOMPATIBLE, "NM_ADSL_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMDeviceError"), values);
+ g_enum_register_static (g_intern_static_string ("NMAdslError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_olpc_mesh_error_get_type (void)
+nm_config_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH, "NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH", "ConnectionNotMesh" },
- { NM_OLPC_MESH_ERROR_CONNECTION_INVALID, "NM_OLPC_MESH_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
- { NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE, "NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+ { NM_CONFIG_ERROR_NO_MEMORY, "NM_CONFIG_ERROR_NO_MEMORY", "NoMemory" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMOlpcMeshError"), values);
+ g_enum_register_static (g_intern_static_string ("NMConfigError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_infiniband_error_get_type (void)
+nm_rf_kill_state_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND, "NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND", "ConnectionNotInfiniband" },
- { NM_INFINIBAND_ERROR_CONNECTION_INVALID, "NM_INFINIBAND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
- { NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE, "NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+ { RFKILL_UNBLOCKED, "RFKILL_UNBLOCKED", "unblocked" },
+ { RFKILL_SOFT_BLOCKED, "RFKILL_SOFT_BLOCKED", "soft-blocked" },
+ { RFKILL_HARD_BLOCKED, "RFKILL_HARD_BLOCKED", "hard-blocked" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMInfinibandError"), values);
+ g_enum_register_static (g_intern_static_string ("RfKillState"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_ip6_config_compare_flags_get_type (void)
+nm_rf_kill_type_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_IP6_COMPARE_FLAG_NONE, "NM_IP6_COMPARE_FLAG_NONE", "none" },
- { NM_IP6_COMPARE_FLAG_ADDRESSES, "NM_IP6_COMPARE_FLAG_ADDRESSES", "addresses" },
- { NM_IP6_COMPARE_FLAG_PTP_ADDRESS, "NM_IP6_COMPARE_FLAG_PTP_ADDRESS", "ptp-address" },
- { NM_IP6_COMPARE_FLAG_NAMESERVERS, "NM_IP6_COMPARE_FLAG_NAMESERVERS", "nameservers" },
- { NM_IP6_COMPARE_FLAG_ROUTES, "NM_IP6_COMPARE_FLAG_ROUTES", "routes" },
- { NM_IP6_COMPARE_FLAG_DOMAINS, "NM_IP6_COMPARE_FLAG_DOMAINS", "domains" },
- { NM_IP6_COMPARE_FLAG_SEARCHES, "NM_IP6_COMPARE_FLAG_SEARCHES", "searches" },
- { NM_IP6_COMPARE_FLAG_MSS, "NM_IP6_COMPARE_FLAG_MSS", "mss" },
- { NM_IP6_COMPARE_FLAG_ALL, "NM_IP6_COMPARE_FLAG_ALL", "all" },
+ { RFKILL_TYPE_WLAN, "RFKILL_TYPE_WLAN", "wlan" },
+ { RFKILL_TYPE_WWAN, "RFKILL_TYPE_WWAN", "wwan" },
+ { RFKILL_TYPE_WIMAX, "RFKILL_TYPE_WIMAX", "wimax" },
+ { RFKILL_TYPE_UNKNOWN, "RFKILL_TYPE_UNKNOWN", "unknown" },
+ { RFKILL_TYPE_MAX, "RFKILL_TYPE_MAX", "max" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMIP6ConfigCompareFlags"), values);
+ g_enum_register_static (g_intern_static_string ("RfKillType"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_auth_call_result_get_type (void)
+nm_bt_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_AUTH_CALL_RESULT_UNKNOWN, "NM_AUTH_CALL_RESULT_UNKNOWN", "unknown" },
- { NM_AUTH_CALL_RESULT_YES, "NM_AUTH_CALL_RESULT_YES", "yes" },
- { NM_AUTH_CALL_RESULT_AUTH, "NM_AUTH_CALL_RESULT_AUTH", "auth" },
- { NM_AUTH_CALL_RESULT_NO, "NM_AUTH_CALL_RESULT_NO", "no" },
+ { NM_BT_ERROR_CONNECTION_NOT_BT, "NM_BT_ERROR_CONNECTION_NOT_BT", "ConnectionNotBt" },
+ { NM_BT_ERROR_CONNECTION_INVALID, "NM_BT_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+ { NM_BT_ERROR_CONNECTION_INCOMPATIBLE, "NM_BT_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMAuthCallResult"), values);
+ g_enum_register_static (g_intern_static_string ("NMBtError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_wifi_error_get_type (void)
+nm_infiniband_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_WIFI_ERROR_CONNECTION_NOT_WIRELESS, "NM_WIFI_ERROR_CONNECTION_NOT_WIRELESS", "ConnectionNotWireless" },
- { NM_WIFI_ERROR_CONNECTION_INVALID, "NM_WIFI_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
- { NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE, "NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
- { NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND, "NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND", "AccessPointNotFound" },
- { NM_WIFI_ERROR_SCAN_NOT_ALLOWED, "NM_WIFI_ERROR_SCAN_NOT_ALLOWED", "ScanNotAllowed" },
- { NM_WIFI_ERROR_AP_MODE_UNSUPPORTED, "NM_WIFI_ERROR_AP_MODE_UNSUPPORTED", "ApModeUnsupported" },
- { NM_WIFI_ERROR_ADHOC_MODE_UNSUPPORTED, "NM_WIFI_ERROR_ADHOC_MODE_UNSUPPORTED", "AdhocModeUnsupported" },
+ { NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND, "NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND", "ConnectionNotInfiniband" },
+ { NM_INFINIBAND_ERROR_CONNECTION_INVALID, "NM_INFINIBAND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+ { NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE, "NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMWifiError"), values);
+ g_enum_register_static (g_intern_static_string ("NMInfinibandError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_config_error_get_type (void)
+nm_wifi_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_CONFIG_ERROR_NO_MEMORY, "NM_CONFIG_ERROR_NO_MEMORY", "NoMemory" },
+ { NM_WIFI_ERROR_CONNECTION_NOT_WIRELESS, "NM_WIFI_ERROR_CONNECTION_NOT_WIRELESS", "ConnectionNotWireless" },
+ { NM_WIFI_ERROR_CONNECTION_INVALID, "NM_WIFI_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+ { NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE, "NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+ { NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND, "NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND", "AccessPointNotFound" },
+ { NM_WIFI_ERROR_SCAN_NOT_ALLOWED, "NM_WIFI_ERROR_SCAN_NOT_ALLOWED", "ScanNotAllowed" },
+ { NM_WIFI_ERROR_AP_MODE_UNSUPPORTED, "NM_WIFI_ERROR_AP_MODE_UNSUPPORTED", "ApModeUnsupported" },
+ { NM_WIFI_ERROR_ADHOC_MODE_UNSUPPORTED, "NM_WIFI_ERROR_ADHOC_MODE_UNSUPPORTED", "AdhocModeUnsupported" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMConfigError"), values);
+ g_enum_register_static (g_intern_static_string ("NMWifiError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_nm_nl_prop_get_type (void)
+nm_session_monitor_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NMNL_PROP_INVALID, "NMNL_PROP_INVALID", "invalid" },
- { NMNL_PROP_PROT, "NMNL_PROP_PROT", "prot" },
- { NMNL_PROP_SCOPE, "NMNL_PROP_SCOPE", "scope" },
- { NMNL_PROP_TABLE, "NMNL_PROP_TABLE", "table" },
- { NMNL_PROP_PRIO, "NMNL_PROP_PRIO", "prio" },
+ { NM_SESSION_MONITOR_ERROR_IO_ERROR, "NM_SESSION_MONITOR_ERROR_IO_ERROR", "IOError" },
+ { NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, "NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE", "MalformedDatabase" },
+ { NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, "NM_SESSION_MONITOR_ERROR_UNKNOWN_USER", "UnknownUser" },
+ { NM_SESSION_MONITOR_ERROR_NO_DATABASE, "NM_SESSION_MONITOR_ERROR_NO_DATABASE", "NoDatabase" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NmNlProp"), values);
+ g_enum_register_static (g_intern_static_string ("NMSessionMonitorError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_netlink_monitor_error_get_type (void)
+nm_ethernet_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_NETLINK_MONITOR_ERROR_GENERIC, "NM_NETLINK_MONITOR_ERROR_GENERIC", "generic" },
- { NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_HANDLE, "NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_HANDLE", "netlink-alloc-handle" },
- { NM_NETLINK_MONITOR_ERROR_NETLINK_CONNECT, "NM_NETLINK_MONITOR_ERROR_NETLINK_CONNECT", "netlink-connect" },
- { NM_NETLINK_MONITOR_ERROR_NETLINK_JOIN_GROUP, "NM_NETLINK_MONITOR_ERROR_NETLINK_JOIN_GROUP", "netlink-join-group" },
- { NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_LINK_CACHE, "NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_LINK_CACHE", "netlink-alloc-link-cache" },
- { NM_NETLINK_MONITOR_ERROR_PROCESSING_MESSAGE, "NM_NETLINK_MONITOR_ERROR_PROCESSING_MESSAGE", "processing-message" },
- { NM_NETLINK_MONITOR_ERROR_BAD_ALLOC, "NM_NETLINK_MONITOR_ERROR_BAD_ALLOC", "bad-alloc" },
- { NM_NETLINK_MONITOR_ERROR_WAITING_FOR_SOCKET_DATA, "NM_NETLINK_MONITOR_ERROR_WAITING_FOR_SOCKET_DATA", "waiting-for-socket-data" },
- { NM_NETLINK_MONITOR_ERROR_LINK_CACHE_UPDATE, "NM_NETLINK_MONITOR_ERROR_LINK_CACHE_UPDATE", "link-cache-update" },
+ { NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED, "NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED", "ConnectionNotWired" },
+ { NM_ETHERNET_ERROR_CONNECTION_INVALID, "NM_ETHERNET_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+ { NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE, "NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMNetlinkMonitorError"), values);
+ g_enum_register_static (g_intern_static_string ("NMEthernetError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
GType
-nm_vlan_error_get_type (void)
+nm_dispatcher_action_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const GEnumValue values[] = {
- { NM_VLAN_ERROR_CONNECTION_NOT_VLAN, "NM_VLAN_ERROR_CONNECTION_NOT_VLAN", "ConnectionNotVlan" },
- { NM_VLAN_ERROR_CONNECTION_INVALID, "NM_VLAN_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
- { NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE, "NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+ { DISPATCHER_ACTION_HOSTNAME, "DISPATCHER_ACTION_HOSTNAME", "hostname" },
+ { DISPATCHER_ACTION_UP, "DISPATCHER_ACTION_UP", "up" },
+ { DISPATCHER_ACTION_PRE_DOWN, "DISPATCHER_ACTION_PRE_DOWN", "pre-down" },
+ { DISPATCHER_ACTION_DOWN, "DISPATCHER_ACTION_DOWN", "down" },
+ { DISPATCHER_ACTION_VPN_UP, "DISPATCHER_ACTION_VPN_UP", "vpn-up" },
+ { DISPATCHER_ACTION_VPN_PRE_DOWN, "DISPATCHER_ACTION_VPN_PRE_DOWN", "vpn-pre-down" },
+ { DISPATCHER_ACTION_VPN_DOWN, "DISPATCHER_ACTION_VPN_DOWN", "vpn-down" },
+ { DISPATCHER_ACTION_DHCP4_CHANGE, "DISPATCHER_ACTION_DHCP4_CHANGE", "dhcp4-change" },
+ { DISPATCHER_ACTION_DHCP6_CHANGE, "DISPATCHER_ACTION_DHCP6_CHANGE", "dhcp6-change" },
{ 0, NULL, NULL }
};
GType g_define_type_id =
- g_enum_register_static (g_intern_static_string ("NMVlanError"), values);
+ g_enum_register_static (g_intern_static_string ("DispatcherAction"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.6/src/generated/nm-enum-types.h new/NetworkManager-0.9.8.8/src/generated/nm-enum-types.h
--- old/NetworkManager-0.9.8.6/src/generated/nm-enum-types.h 2013-09-30 17:46:00.000000000 +0200
+++ new/NetworkManager-0.9.8.8/src/generated/nm-enum-types.h 2013-10-10 17:36:45.000000000 +0200
@@ -9,48 +9,48 @@
#include