Hello community,
here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at 2014-04-26 10:08:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-04-08 11:45:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.NetworkManager.new/NetworkManager.changes 2014-04-26 10:08:44.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Apr 25 07:15:03 UTC 2014 - dimstar@opensuse.org
+
+- Update to version 0.9.8.10:
+ + Fixed a bug that allowed a user to disconnect a connection that
+ they didn't have permissions on.
+
+-------------------------------------------------------------------
Old:
----
NetworkManager-0.9.8.9.tar.xz
New:
----
NetworkManager-0.9.8.10.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.nXH2nz/_old 2014-04-26 10:08:45.000000000 +0200
+++ /var/tmp/diff_new_pack.nXH2nz/_new 2014-04-26 10:08:45.000000000 +0200
@@ -22,7 +22,7 @@
Name: NetworkManager
Url: http://www.gnome.org/projects/NetworkManager/
-Version: 0.9.8.9
+Version: 0.9.8.10
Release: 0
Summary: Network Link Manager and User Applications
License: GPL-2.0+
++++++ NetworkManager-0.9.8.9.tar.xz -> NetworkManager-0.9.8.10.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/NEWS new/NetworkManager-0.9.8.10/NEWS
--- old/NetworkManager-0.9.8.9/NEWS 2014-04-02 19:45:36.000000000 +0200
+++ new/NetworkManager-0.9.8.10/NEWS 2014-04-24 17:20:40.000000000 +0200
@@ -1,14 +1,15 @@
================================================
-NetworkManager-0.9.8.9
+NetworkManager-0.9.8.10
Overview of changes since NetworkManager-0.9.8.8
================================================
-This is a prerelease of an upcoming stable release of NetworkManager.
-Notable changes include:
+This is a new stable release of NetworkManager. Notable changes include:
* Fixed two problems that could result in gnome-shell showing
incorrect icons. (In particular, fixed the problem where the network
icon would disappear when certain VPNs were activated.)
+* Fixed a bug that allowed a user to disconnect a connection that
+ they didn't have permissions on.
* Dispatcher scripts now receive correct IPv6 addresses, and also
correct DHCP information on lease-change events.
* NetworkManager no longer tries to start ModemManager itself on
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/configure new/NetworkManager-0.9.8.10/configure
--- old/NetworkManager-0.9.8.9/configure 2014-04-02 20:57:53.000000000 +0200
+++ new/NetworkManager-0.9.8.10/configure 2014-04-24 17:24:18.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.9.
+# Generated by GNU Autoconf 2.69 for NetworkManager 0.9.8.10.
#
# 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.9'
-PACKAGE_STRING='NetworkManager 0.9.8.9'
+PACKAGE_VERSION='0.9.8.10'
+PACKAGE_STRING='NetworkManager 0.9.8.10'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
PACKAGE_URL=''
@@ -1610,7 +1610,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.9 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 0.9.8.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1680,7 +1680,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of NetworkManager 0.9.8.9:";;
+ short | recursive ) echo "Configuration of NetworkManager 0.9.8.10:";;
esac
cat <<\_ACEOF
@@ -1916,7 +1916,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-NetworkManager configure 0.9.8.9
+NetworkManager configure 0.9.8.10
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2460,7 +2460,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.9, which was
+It was created by NetworkManager $as_me 0.9.8.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3329,7 +3329,7 @@
# Define the identity of the package.
PACKAGE='NetworkManager'
- VERSION='0.9.8.9'
+ VERSION='0.9.8.10'
cat >>confdefs.h <<_ACEOF
@@ -16582,8 +16582,8 @@
NM_MAJOR_VERSION=0
NM_MINOR_VERSION=9
NM_MICRO_VERSION=8
-NM_VERSION=0.9.8.9
-NM_GIT_SHA=76a9c6e0fb7cfd95f08106afa09fd592170eb43c
+NM_VERSION=0.9.8.10
+NM_GIT_SHA=b784f9700adc363b077d26e5ac6412ff7c410b22
@@ -24332,7 +24332,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.9, which was
+This file was extended by NetworkManager $as_me 0.9.8.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24398,7 +24398,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.9
+NetworkManager config.status 0.9.8.10
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.9/configure.ac new/NetworkManager-0.9.8.10/configure.ac
--- old/NetworkManager-0.9.8.9/configure.ac 2014-04-02 19:45:43.000000000 +0200
+++ new/NetworkManager-0.9.8.10/configure.ac 2014-04-24 17:21:27.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], [9])
+m4_define([nm_nano_version], [10])
m4_define([nm_version],
[nm_major_version.nm_minor_version.nm_micro_version.nm_nano_version])
m4_define([nm_git_sha], [m4_esyscmd([ ( [[ -d ./.git/ && "$(realpath ./.git/)" = "$(realpath "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ]] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/api/html/index.html new/NetworkManager-0.9.8.10/docs/api/html/index.html
--- old/NetworkManager-0.9.8.9/docs/api/html/index.html 2014-04-02 21:06:09.000000000 +0200
+++ new/NetworkManager-0.9.8.10/docs/api/html/index.html 2014-04-24 17:25:55.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.9
+<div><p class="releaseinfo">Version 0.9.8.10
</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.9/docs/api/html/spec.html new/NetworkManager-0.9.8.10/docs/api/html/spec.html
--- old/NetworkManager-0.9.8.9/docs/api/html/spec.html 2014-04-02 21:06:09.000000000 +0200
+++ new/NetworkManager-0.9.8.10/docs/api/html/spec.html 2014-04-24 17:25:55.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.9</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.10</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.9</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.10</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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/api/spec.html new/NetworkManager-0.9.8.10/docs/api/spec.html
--- old/NetworkManager-0.9.8.9/docs/api/spec.html 2014-04-02 20:59:16.000000000 +0200
+++ new/NetworkManager-0.9.8.10/docs/api/spec.html 2014-04-24 17:25:42.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.9</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.10</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.9</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.10</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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/api/version.xml new/NetworkManager-0.9.8.10/docs/api/version.xml
--- old/NetworkManager-0.9.8.9/docs/api/version.xml 2014-04-02 20:58:02.000000000 +0200
+++ new/NetworkManager-0.9.8.10/docs/api/version.xml 2014-04-24 17:24:27.000000000 +0200
@@ -1 +1 @@
-0.9.8.9
+0.9.8.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/libnm-glib/html/index.html new/NetworkManager-0.9.8.10/docs/libnm-glib/html/index.html
--- old/NetworkManager-0.9.8.9/docs/libnm-glib/html/index.html 2014-04-02 21:06:09.000000000 +0200
+++ new/NetworkManager-0.9.8.10/docs/libnm-glib/html/index.html 2014-04-24 17:25:55.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.9
+ for libnm-glib 0.9.8.10
The latest version of this documentation can be found on-line at
<a class="ulink" href="https://developer.gnome.org/libnm-glib/0.9/" target="_top">https://developer.gnome.org/libnm-glib/0.9/</a>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/libnm-glib/version.xml new/NetworkManager-0.9.8.10/docs/libnm-glib/version.xml
--- old/NetworkManager-0.9.8.9/docs/libnm-glib/version.xml 2014-04-02 20:58:02.000000000 +0200
+++ new/NetworkManager-0.9.8.10/docs/libnm-glib/version.xml 2014-04-24 17:24:27.000000000 +0200
@@ -1 +1 @@
-0.9.8.9
+0.9.8.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/libnm-util/html/index.html new/NetworkManager-0.9.8.10/docs/libnm-util/html/index.html
--- old/NetworkManager-0.9.8.9/docs/libnm-util/html/index.html 2014-04-02 21:06:09.000000000 +0200
+++ new/NetworkManager-0.9.8.10/docs/libnm-util/html/index.html 2014-04-24 17:25:55.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.9
+ for libnm-util 0.9.8.10
The latest version of this documentation can be found on-line at
<a class="ulink" href="https://developer.gnome.org/libnm-util/0.9/" target="_top">https://developer.gnome.org/libnm-util/0.9/</a>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/docs/libnm-util/version.xml new/NetworkManager-0.9.8.10/docs/libnm-util/version.xml
--- old/NetworkManager-0.9.8.9/docs/libnm-util/version.xml 2014-04-02 20:58:02.000000000 +0200
+++ new/NetworkManager-0.9.8.10/docs/libnm-util/version.xml 2014-04-24 17:24:27.000000000 +0200
@@ -1 +1 @@
-0.9.8.9
+0.9.8.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetworkManager-0.9.8.9/src/generated/nm-enum-types.c new/NetworkManager-0.9.8.10/src/generated/nm-enum-types.c
--- old/NetworkManager-0.9.8.9/src/generated/nm-enum-types.c 2014-04-02 20:58:19.000000000 +0200
+++ new/NetworkManager-0.9.8.10/src/generated/nm-enum-types.c 2014-04-24 17:24:49.000000000 +0200
@@ -5,21 +5,12 @@
#include "nm-enum-types.h"
-#include "nm-ip4-config.h"
-#include "nm-hostname-provider.h"
-#include "nm-sleep-monitor.h"
-#include "nm-device-factory.h"
-#include "nm-rfkill.h"
-#include "NetworkManagerUtils.h"
-#include "nm-properties-changed-signal.h"
+#include "nm-active-connection.h"
#include "nm-wifi-ap.h"
#include "nm-device-bt.h"
+#include "nm-device-infiniband.h"
#include "nm-device-bond.h"
-#include "nm-dbus-manager.h"
#include "nm-device-wired.h"
-#include "nm-active-connection.h"
-#include "nm-device-bridge.h"
-#include "nm-system.h"
#include "nm-dhcp6-config.h"
#include "nm-session-utils.h"
#include "nm-netlink-compat.h"
@@ -27,30 +18,39 @@
#include "nm-connection-provider.h"
#include "nm-device-ethernet.h"
#include "nm-call-store.h"
+#include "nm-config.h"
+#include "nm-policy-hosts.h"
+#include "nm-rfkill.h"
#include "nm-dispatcher.h"
+#include "nm-ip4-config.h"
#include "nm-manager.h"
#include "nm-device-modem.h"
#include "nm-activation-request.h"
#include "nm-wifi-ap-utils.h"
-#include "nm-device-adsl.h"
+#include "nm-dbus-manager.h"
+#include "nm-policy-hostname.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-system.h"
#include "nm-policy.h"
#include "nm-manager-auth.h"
+#include "nm-device-bridge.h"
#include "nm-device-wifi.h"
-#include "nm-config.h"
-#include "nm-policy-hostname.h"
+#include "nm-device-private.h"
#include "nm-netlink-utils.h"
#include "nm-dhcp4-config.h"
-#include "nm-policy-hosts.h"
#include "nm-udev-manager.h"
#include "nm-connectivity.h"
-#include "nm-netlink-monitor.h"
#include "nm-device-vlan.h"
+#include "nm-netlink-monitor.h"
+#include "nm-device-olpc-mesh.h"
+#include "nm-hostname-provider.h"
+#include "nm-sleep-monitor.h"
+#include "nm-device-factory.h"
+#include "NetworkManagerUtils.h"
+#include "nm-device-adsl.h"
+#include "nm-properties-changed-signal.h"
#include "nm-logging.h"
#include "nm-dns-utils.h"
#include "nm-dns-plugin.h"
@@ -86,10 +86,10 @@
#include "nm-bluez4-adapter.h"
#include "nm-firewall-manager.h"
#include "nm-settings-connection.h"
+#include "nm-settings.h"
#include "nm-default-wired-connection.h"
#include "nm-system-config-interface.h"
#include "nm-settings-utils.h"
-#include "nm-settings.h"
#include "nm-settings-error.h"
#include "nm-agent-manager.h"
#include "nm-inotify-helper.h"
@@ -101,173 +101,161 @@
#include "nm-wimax-nsp.h"
GType
-nm_ip4_config_compare_flags_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_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_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 ("NMIP4ConfigCompareFlags"), 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_rf_kill_state_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[] = {
- { RFKILL_UNBLOCKED, "RFKILL_UNBLOCKED", "unblocked" },
- { RFKILL_SOFT_BLOCKED, "RFKILL_SOFT_BLOCKED", "soft-blocked" },
- { RFKILL_HARD_BLOCKED, "RFKILL_HARD_BLOCKED", "hard-blocked" },
+ { 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 ("RfKillState"), 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_rf_kill_type_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[] = {
- { 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_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 ("RfKillType"), 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_bt_error_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[] = {
- { 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" },
+ { 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 ("NMBtError"), 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_bond_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_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_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 ("NMBondError"), 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_bridge_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_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_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 ("NMBridgeError"), 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_session_monitor_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_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" },
+ { 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 ("NMSessionMonitorError"), 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_ethernet_error_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_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" },
+ { 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 ("NMEthernetError"), values);
+ g_enum_register_static (g_intern_static_string ("RfKillType"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
@@ -300,48 +288,58 @@
return g_define_type_id__volatile;
}
GType
-nm_manager_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_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_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 ("NMManagerError"), 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_adsl_error_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[] = {
- { 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_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 ("NMAdslError"), values);
+ g_enum_register_static (g_intern_static_string ("NMManagerError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
@@ -368,46 +366,6 @@
return g_define_type_id__volatile;
}
GType
-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_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 ("NMOlpcMeshError"), 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)
-{
- 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" },
- { 0, NULL, NULL }
- };
- GType g_define_type_id =
- 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_ip6_config_compare_flags_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
@@ -455,6 +413,26 @@
return g_define_type_id__volatile;
}
GType
+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[] = {
+ { 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 ("NMBridgeError"), 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)
{
static volatile gsize g_define_type_id__volatile = 0;
@@ -479,40 +457,42 @@
return g_define_type_id__volatile;
}
GType
-nm_config_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_CONFIG_ERROR_NO_MEMORY, "NM_CONFIG_ERROR_NO_MEMORY", "NoMemory" },
+ { 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 ("NMConfigError"), 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_nm_nl_prop_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[] = {
- { 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_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 ("NmNlProp"), values);
+ g_enum_register_static (g_intern_static_string ("NMVlanError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
@@ -545,20 +525,40 @@
return g_define_type_id__volatile;
}
GType
-nm_vlan_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_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" },
+ { 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 ("NMVlanError"), 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_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_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 ("NMAdslError"), 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.9/src/generated/nm-enum-types.h new/NetworkManager-0.9.8.10/src/generated/nm-enum-types.h
--- old/NetworkManager-0.9.8.9/src/generated/nm-enum-types.h 2014-04-02 20:58:19.000000000 +0200
+++ new/NetworkManager-0.9.8.10/src/generated/nm-enum-types.h 2014-04-24 17:24:49.000000000 +0200
@@ -9,48 +9,48 @@
#include