diff options
233 files changed, 2451 insertions, 872 deletions
@@ -19,6 +19,9 @@ This is a new stable release of NetworkManager. Notable changes include: * Fix various crashes and issues in the ifcfg-rh system settings plugin * Fix race with multiple interfaces running DHCP at the same time * Add Linux From Scratch (LFS) support +* Allow customized dnsmasq local caching nameserver config via /etc/NetworkManager/dnsmasq.d/ +* Fixes for VLAN and bonding when libnl2 or earlier are used +* D-Bus API, libnm-glib, libnm-util, and GObject Introspection documentation updates ============================================== @@ -157,7 +157,7 @@ un-authenticated connections and that additional credentials are required to successfully connect to this network. -* VPN re-connect +* VPN re-connect (bgo #349151) NM should remember whether a VPN was connected if a connection disconnects (like WiFi drops out or short carrier drop) or if the laptop goes to sleep. @@ -167,7 +167,7 @@ the VPN because WiFi choked for 10 seconds, but reconnect the VPN if it was connected before the drop. -* VPN autoconnect +* VPN autoconnect (bgo #560471) We should add a property to the NMSettingConnection object in libnm-util/nm-setting-connection.c called "vpns" that is a string list, diff --git a/cli/src/connections.c b/cli/src/connections.c index 8e6548646..4776e1a6a 100644 --- a/cli/src/connections.c +++ b/cli/src/connections.c @@ -1230,7 +1230,7 @@ find_device_for_connection (NmCli *nmc, active = nm_device_get_active_connection (*device); if (!active) { - g_set_error (error, 0, 0, _("no active connection on device '%s'"), iface); + g_set_error (error, NMCLI_ERROR, 0, _("no active connection on device '%s'"), iface); return FALSE; } *spec_object = nm_object_get_path (NM_OBJECT (active)); @@ -1238,7 +1238,7 @@ find_device_for_connection (NmCli *nmc, } else { active = get_default_active_connection (nmc, device); if (!active) { - g_set_error (error, 0, 0, _("no active connection or device")); + g_set_error_literal (error, NMCLI_ERROR, 0, _("no active connection or device")); return FALSE; } *spec_object = nm_object_get_path (NM_OBJECT (active)); @@ -1309,9 +1309,11 @@ find_device_for_connection (NmCli *nmc, return TRUE; } else { if (iface) - g_set_error (error, 0, 0, _("device '%s' not compatible with connection '%s'"), iface, nm_setting_connection_get_id (s_con)); + g_set_error (error, NMCLI_ERROR, 0, _("device '%s' not compatible with connection '%s'"), + iface, nm_setting_connection_get_id (s_con)); else - g_set_error (error, 0, 0, _("no device found for connection '%s'"), nm_setting_connection_get_id (s_con)); + g_set_error (error, NMCLI_ERROR, 0, _("no device found for connection '%s'"), + nm_setting_connection_get_id (s_con)); return FALSE; } } diff --git a/cli/src/nmcli.c b/cli/src/nmcli.c index f51779e6b..a7888aaa0 100644 --- a/cli/src/nmcli.c +++ b/cli/src/nmcli.c @@ -57,6 +57,18 @@ typedef struct { GMainLoop *loop = NULL; +/* Get an error quark for use with GError */ +GQuark +nmcli_error_quark (void) +{ + static GQuark error_quark = 0; + + if (G_UNLIKELY (error_quark == 0)) + error_quark = g_quark_from_static_string ("nmcli-error-quark"); + + return error_quark; +} + static void usage (const char *prog_name) { diff --git a/cli/src/nmcli.h b/cli/src/nmcli.h index 9ffa42edb..8928126b4 100644 --- a/cli/src/nmcli.h +++ b/cli/src/nmcli.h @@ -119,4 +119,8 @@ typedef struct _NmCli { gboolean nocheck_ver; /* Don't check nmcli and NM versions: option '--nocheck' */ } NmCli; +/* Error quark for GError domain */ +#define NMCLI_ERROR (nmcli_error_quark ()) +GQuark nmcli_error_quark (void); + #endif /* NMC_NMCLI_H */ diff --git a/cli/src/utils.c b/cli/src/utils.c index 8030d5e12..4054fe13b 100644 --- a/cli/src/utils.c +++ b/cli/src/utils.c @@ -100,7 +100,7 @@ nmc_ip4_address_as_string (guint32 ip, GError **error) if (inet_ntop (AF_INET, &tmp_addr, buf, INET_ADDRSTRLEN)) { return g_strdup (buf); } else { - g_set_error (error, 0, 0, _("Error converting IP4 address '0x%X' to text form"), + g_set_error (error, NMCLI_ERROR, 0, _("Error converting IP4 address '0x%X' to text form"), ntohl (tmp_addr.s_addr)); return NULL; } @@ -128,7 +128,7 @@ nmc_ip6_address_as_string (const struct in6_addr *ip, GError **error) g_string_append_printf (ip6_str, "%02X", ip->s6_addr[0]); for (j = 1; j < 16; j++) g_string_append_printf (ip6_str, " %02X", ip->s6_addr[j]); - g_set_error (error, 0, 0, _("Error converting IP6 address '%s' to text form"), + g_set_error (error, NMCLI_ERROR, 0, _("Error converting IP6 address '%s' to text form"), ip6_str->str); g_string_free (ip6_str, TRUE); } @@ -229,10 +229,10 @@ parse_output_fields (const char *fields_str, const NmcOutputField fields_array[] } if (fields_array[i].name == NULL) { if (!strcasecmp (*iter, "all") || !strcasecmp (*iter, "common")) - g_set_error (error, 0, 0, _("field '%s' has to be alone"), *iter); + g_set_error (error, NMCLI_ERROR, 0, _("field '%s' has to be alone"), *iter); else - g_set_error (error, 0, 1, _("invalid field '%s'"), *iter); + g_set_error (error, NMCLI_ERROR, 1, _("invalid field '%s'"), *iter); g_array_free (array, TRUE); array = NULL; goto done; @@ -251,11 +251,11 @@ nmc_terse_option_check (NMCPrintOutput print_output, const char *fields, GError if (print_output == NMC_PRINT_TERSE) { if (!fields) { - g_set_error (error, 0, 0, _("Option '--terse' requires specifying '--fields'")); + g_set_error_literal (error, NMCLI_ERROR, 0, _("Option '--terse' requires specifying '--fields'")); return FALSE; } else if ( !strcasecmp (fields, "all") || !strcasecmp (fields, "common")) { - g_set_error (error, 0, 0, _("Option '--terse' requires specific '--fields' option values , not '%s'"), fields); + g_set_error (error, NMCLI_ERROR, 0, _("Option '--terse' requires specific '--fields' option values , not '%s'"), fields); return FALSE; } } @@ -468,7 +468,7 @@ nmc_is_nm_running (NmCli *nmc, GError **error) g_string_printf (nmc->return_text, _("Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus")); nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; if (error) - g_set_error (error, 0, 0, "%s", nmc->return_text->str); + g_set_error_literal (error, NMCLI_ERROR, 0, nmc->return_text->str); goto done; } @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for NetworkManager 0.9.5.96. +# Generated by GNU Autoconf 2.68 for NetworkManager 0.9.6.0. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>. # @@ -571,8 +571,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='0.9.5.96' -PACKAGE_STRING='NetworkManager 0.9.5.96' +PACKAGE_VERSION='0.9.6.0' +PACKAGE_STRING='NetworkManager 0.9.6.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -1584,7 +1584,7 @@ if test "$ac_init_help" = "long"; then # 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.5.96 to adapt to many kinds of systems. +\`configure' configures NetworkManager 0.9.6.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1654,7 +1654,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 0.9.5.96:";; + short | recursive ) echo "Configuration of NetworkManager 0.9.6.0:";; esac cat <<\_ACEOF @@ -1880,7 +1880,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 0.9.5.96 +NetworkManager configure 0.9.6.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2424,7 +2424,7 @@ cat >config.log <<_ACEOF 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.5.96, which was +It was created by NetworkManager $as_me 0.9.6.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3245,7 +3245,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='0.9.5.96' + VERSION='0.9.6.0' cat >>confdefs.h <<_ACEOF @@ -16455,8 +16455,8 @@ fi NM_MAJOR_VERSION=0 NM_MINOR_VERSION=9 -NM_MICRO_VERSION=5 -NM_VERSION=0.9.5.96 +NM_MICRO_VERSION=6 +NM_VERSION=0.9.6.0 @@ -22870,7 +22870,9 @@ $as_echo "yes" >&6; } -Wdeclaration-after-statement \ -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \ -fno-strict-aliasing -Wno-unused-but-set-variable \ - -Wundef; do + -Wundef -Wimplicit-function-declaration \ + -Wpointer-arith -Winit-self \ + -Wmissing-include-dirs -Waggregate-return; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5 @@ -23497,7 +23499,7 @@ case $with_tests in esac -ac_config_files="$ac_config_files Makefile include/Makefile include/nm-version.h src/Makefile src/tests/Makefile src/generated/Makefile src/logging/Makefile src/posix-signals/Makefile src/dns-manager/Makefile src/vpn-manager/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/ip6-manager/Makefile src/supplicant-manager/Makefile src/supplicant-manager/tests/Makefile src/ppp-manager/Makefile src/dnsmasq-manager/Makefile src/modem-manager/Makefile src/bluez-manager/Makefile src/wifi/Makefile src/firewall-manager/Makefile src/settings/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ifcfg-suse/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/settings/tests/Makefile src/wimax/Makefile src/backends/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-util/tests/certs/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile cli/Makefile cli/src/Makefile test/Makefile initscript/Makefile initscript/RedHat/Makefile initscript/RedHat/NetworkManager initscript/Gentoo/Makefile initscript/Gentoo/NetworkManager initscript/Debian/Makefile initscript/Debian/NetworkManager initscript/Slackware/Makefile initscript/Slackware/rc.networkmanager initscript/SUSE/Makefile initscript/SUSE/networkmanager initscript/Arch/Makefile initscript/Arch/networkmanager initscript/paldo/Makefile initscript/paldo/NetworkManager initscript/Mandriva/Makefile initscript/Mandriva/networkmanager initscript/linexa/Makefile initscript/linexa/networkmanager introspection/Makefile introspection/all.xml man/Makefile man/NetworkManager.8 man/NetworkManager.conf.5 man/nm-system-settings.conf.5 man/nm-tool.1 man/nm-online.1 man/nmcli.1 po/Makefile.in policy/Makefile data/Makefile docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-util/Makefile NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/ruby/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile vapi/Makefile" +ac_config_files="$ac_config_files Makefile include/Makefile include/nm-version.h src/Makefile src/tests/Makefile src/generated/Makefile src/logging/Makefile src/posix-signals/Makefile src/dns-manager/Makefile src/vpn-manager/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/ip6-manager/Makefile src/supplicant-manager/Makefile src/supplicant-manager/tests/Makefile src/ppp-manager/Makefile src/dnsmasq-manager/Makefile src/modem-manager/Makefile src/bluez-manager/Makefile src/wifi/Makefile src/firewall-manager/Makefile src/settings/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ifcfg-suse/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/settings/tests/Makefile src/wimax/Makefile src/backends/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-util/tests/certs/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile cli/Makefile cli/src/Makefile test/Makefile initscript/Makefile initscript/RedHat/Makefile initscript/RedHat/NetworkManager initscript/Gentoo/Makefile initscript/Gentoo/NetworkManager initscript/Debian/Makefile initscript/Debian/NetworkManager initscript/Slackware/Makefile initscript/Slackware/rc.networkmanager initscript/SUSE/Makefile initscript/SUSE/networkmanager initscript/Arch/Makefile initscript/Arch/networkmanager initscript/paldo/Makefile initscript/paldo/NetworkManager initscript/Mandriva/Makefile initscript/Mandriva/networkmanager initscript/linexa/Makefile initscript/linexa/networkmanager introspection/Makefile introspection/all.xml man/Makefile man/NetworkManager.8 man/NetworkManager.conf.5 man/nm-system-settings.conf.5 man/nm-tool.1 man/nm-online.1 man/nmcli.1 po/Makefile.in policy/Makefile data/Makefile docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/ruby/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile vapi/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -24186,7 +24188,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # 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.5.96, which was +This file was extended by NetworkManager $as_me 0.9.6.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24252,7 +24254,7 @@ _ACEOF 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.5.96 +NetworkManager config.status 0.9.6.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -24854,7 +24856,9 @@ do "docs/api/Makefile") CONFIG_FILES="$CONFIG_FILES docs/api/Makefile" ;; "docs/api/version.xml") CONFIG_FILES="$CONFIG_FILES docs/api/version.xml" ;; "docs/libnm-glib/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libnm-glib/Makefile" ;; + "docs/libnm-glib/version.xml") CONFIG_FILES="$CONFIG_FILES docs/libnm-glib/version.xml" ;; "docs/libnm-util/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libnm-util/Makefile" ;; + "docs/libnm-util/version.xml") CONFIG_FILES="$CONFIG_FILES docs/libnm-util/version.xml" ;; "NetworkManager.pc") CONFIG_FILES="$CONFIG_FILES NetworkManager.pc" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "examples/shell/Makefile") CONFIG_FILES="$CONFIG_FILES examples/shell/Makefile" ;; diff --git a/configure.ac b/configure.ac index 87089c60a..7b0612c3e 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ AC_PREREQ([2.63]) dnl The NM version number m4_define([nm_major_version], [0]) m4_define([nm_minor_version], [9]) -m4_define([nm_micro_version], [5]) -m4_define([nm_nano_version], [96]) +m4_define([nm_micro_version], [6]) +m4_define([nm_nano_version], [0]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version.nm_nano_version]) @@ -828,7 +828,9 @@ docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile +docs/libnm-glib/version.xml docs/libnm-util/Makefile +docs/libnm-util/version.xml NetworkManager.pc examples/Makefile examples/shell/Makefile diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index afff285e2..fc52a922a 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="no"?> <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" ""> -<book xmlns="http://www.devhelp.net/book" title="NetworkManager D-Bus Reference Manual" link="index.html" author="Dan Williams" name="NetworkManager" version="2" language="c"> +<book xmlns="http://www.devhelp.net/book" title="NetworkManager D-Bus Reference Manual" link="index.html" author="" name="NetworkManager" version="2" language="c"> <chapters> <sub name="D-Bus API Reference" link="ref-dbus.html"/> <sub name="Network Configuration Setting Specification" link="ref-settings.html"> - <sub name="Configuration Settings" link="ref-settings.html#id437745"/> + <sub name="Configuration Settings" link="ref-settings.html#id480831"/> <sub name="Secret flag types" link="secrets-flags.html"/> </sub> <sub name="Migrating from NetworkManager 0.8 to NetworkManager 0.9" link="ref-migrating.html"> - <sub name="Architecture and D-Bus API Changes in 0.9" link="ref-migrating.html#id449785"> - <sub name="Elimination of the User Settings Service" link="ref-migrating.html#id446214"/> - <sub name="User Secret Agents" link="ref-migrating.html#id429971"/> - <sub name="Settings Service Interface Changes" link="ref-migrating.html#id429654"/> - <sub name="Connection Object Interface Changes" link="ref-migrating.html#id438294"/> - <sub name="Permissions Methods Consolidation" link="ref-migrating.html#id432724"/> - <sub name="AddConnection Returns Object Path of New Connection" link="ref-migrating.html#id431666"/> - <sub name="Support for WiMAX Devices" link="ref-migrating.html#id413984"/> - <sub name="New Device States" link="ref-migrating.html#id444778"/> - <sub name="New Active Connection State" link="ref-migrating.html#id448971"/> - <sub name="Consolidated Modem Devices" link="ref-migrating.html#id443548"/> - <sub name="Secret Property Flags" link="ref-migrating.html#id421190"/> - <sub name="Deprecated Methods Removed" link="ref-migrating.html#id420876"/> + <sub name="Architecture and D-Bus API Changes in 0.9" link="ref-migrating.html#id473771"> + <sub name="Elimination of the User Settings Service" link="ref-migrating.html#id488881"/> + <sub name="User Secret Agents" link="ref-migrating.html#id459804"/> + <sub name="Settings Service Interface Changes" link="ref-migrating.html#id471077"/> + <sub name="Connection Object Interface Changes" link="ref-migrating.html#id492108"/> + <sub name="Permissions Methods Consolidation" link="ref-migrating.html#id477672"/> + <sub name="AddConnection Returns Object Path of New Connection" link="ref-migrating.html#id483262"/> + <sub name="Support for WiMAX Devices" link="ref-migrating.html#id450653"/> + <sub name="New Device States" link="ref-migrating.html#id456786"/> + <sub name="New Active Connection State" link="ref-migrating.html#id486946"/> + <sub name="Consolidated Modem Devices" link="ref-migrating.html#id455331"/> + <sub name="Secret Property Flags" link="ref-migrating.html#id451364"/> + <sub name="Deprecated Methods Removed" link="ref-migrating.html#id456844"/> </sub> </sub> <sub name="Index" link="ix01.html"/> diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 573f364f6..f1188e1a7 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -14,19 +14,11 @@ <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><div class="authorgroup"><div class="author"> -<h3 class="author"> -<span class="firstname">Dan</span> <span class="surname">Williams</span> -</h3> -<div class="affiliation"><div class="address"><p><br> -     <code class="email"><<a class="email" href="mailto:dcbw@redhat.com">dcbw@redhat.com</a>></code><br> -   </p></div></div> -</div></div></div> -<div><p class="releaseinfo">Version 0.9.5.96 +<div><p class="releaseinfo">Version 0.9.6.0 </p></div> -<div><p class="copyright">Copyright © 2011 The NetworkManager Authors</p></div> +<div><p class="copyright">Copyright © 2012 The NetworkManager Authors</p></div> <div><div class="legalnotice"> -<a name="id368526"></a><p> +<a name="id409989"></a><p> Permission is granted to copy, distribute and/or modify this document under the terms of the <em class="citetitle">GNU Free Documentation License</em>, Version 1.1 or any later @@ -40,19 +32,12 @@ </p> <div class="address"><p><br>   The Free Software Foundation, Inc.,<br> -   <span class="street">59 Temple Place</span> - Suite 330,<br> -   <span class="city">Boston</span>, <span class="state">MA</span> <span class="postcode">02111-1307</span>,<br> +   <span class="street">51 Franklin Street</span> - Fifth Floor,<br> +   <span class="city">Boston</span>, <span class="state">MA</span> <span class="postcode">02110-1301</span>,<br>   <span class="country">USA</span><br> </p></div> <p> </p> -<p> - Many of the names used by companies to distinguish their - products and services are claimed as trademarks. Where those - names appear in any GNOME documentation, and those trademarks - are made aware to the members of the GNOME Documentation - Project, the names have been printed in caps or initial caps. - </p> </div></div> </div> <hr> @@ -61,25 +46,25 @@ <dt><span class="chapter"><a href="ref-dbus.html">D-Bus API Reference</a></span></dt> <dt><span class="chapter"><a href="ref-settings.html">Network Configuration Setting Specification</a></span></dt> <dd><dl> -<dt><span class="section"><a href="ref-settings.html#id437745">Configuration Settings</a></span></dt> +<dt><span class="section"><a href="ref-settings.html#id480831">Configuration Settings</a></span></dt> <dt><span class="section"><a href="secrets-flags.html">Secret flag types</a></span></dt> </dl></dd> <dt><span class="chapter"><a href="ref-migrating.html">Migrating from NetworkManager 0.8 to NetworkManager 0.9</a></span></dt> <dd><dl> -<dt><span class="section"><a href="ref-migrating.html#id449785">Architecture and D-Bus API Changes in 0.9</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id473771">Architecture and D-Bus API Changes in 0.9</a></span></dt> <dd><dl> -<dt><span class="section"><a href="ref-migrating.html#id446214">Elimination of the User Settings Service</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id429971">User Secret Agents</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id429654">Settings Service Interface Changes</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id438294">Connection Object Interface Changes</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id432724">Permissions Methods Consolidation</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id431666">AddConnection Returns Object Path of New Connection</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id413984">Support for WiMAX Devices</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id444778">New Device States</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id448971">New Active Connection State</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id443548">Consolidated Modem Devices</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id421190">Secret Property Flags</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id420876">Deprecated Methods Removed</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id488881">Elimination of the User Settings Service</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id459804">User Secret Agents</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id471077">Settings Service Interface Changes</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id492108">Connection Object Interface Changes</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id477672">Permissions Methods Consolidation</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id483262">AddConnection Returns Object Path of New Connection</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id450653">Support for WiMAX Devices</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id456786">New Device States</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id486946">New Active Connection State</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id455331">Consolidated Modem Devices</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id451364">Secret Property Flags</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id456844">Deprecated Methods Removed</a></span></dt> </dl></dd> </dl></dd> <dt><span class="index"><a href="ix01.html">Index</a></span></dt> diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index 816088298..9101be21e 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -21,7 +21,7 @@ </tr></table> <div class="index"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id398420"></a>Index</h2></div></div></div> +<a name="id406805"></a>Index</h2></div></div></div> <div class="index"></div> </div> <div class="footer"> diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html index 3dbedb5ee..9db380b99 100644 --- a/docs/api/html/ref-migrating.html +++ b/docs/api/html/ref-migrating.html @@ -23,20 +23,20 @@ <div class="titlepage"><div><div><h2 class="title"> <a name="ref-migrating"></a>Migrating from NetworkManager 0.8 to NetworkManager 0.9</h2></div></div></div> <div class="toc"><dl> -<dt><span class="section"><a href="ref-migrating.html#id449785">Architecture and D-Bus API Changes in 0.9</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id473771">Architecture and D-Bus API Changes in 0.9</a></span></dt> <dd><dl> -<dt><span class="section"><a href="ref-migrating.html#id446214">Elimination of the User Settings Service</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id429971">User Secret Agents</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id429654">Settings Service Interface Changes</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id438294">Connection Object Interface Changes</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id432724">Permissions Methods Consolidation</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id431666">AddConnection Returns Object Path of New Connection</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id413984">Support for WiMAX Devices</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id444778">New Device States</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id448971">New Active Connection State</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id443548">Consolidated Modem Devices</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id421190">Secret Property Flags</a></span></dt> -<dt><span class="section"><a href="ref-migrating.html#id420876">Deprecated Methods Removed</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id488881">Elimination of the User Settings Service</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id459804">User Secret Agents</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id471077">Settings Service Interface Changes</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id492108">Connection Object Interface Changes</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id477672">Permissions Methods Consolidation</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id483262">AddConnection Returns Object Path of New Connection</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id450653">Support for WiMAX Devices</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id456786">New Device States</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id486946">New Active Connection State</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id455331">Consolidated Modem Devices</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id451364">Secret Property Flags</a></span></dt> +<dt><span class="section"><a href="ref-migrating.html#id456844">Deprecated Methods Removed</a></span></dt> </dl></dd> </dl></div> <p> @@ -50,14 +50,14 @@ </p> <div class="section"> <div class="titlepage"><div><div><h2 class="title" style="clear: both"> -<a name="id449785"></a>Architecture and D-Bus API Changes in 0.9</h2></div></div></div> +<a name="id473771"></a>Architecture and D-Bus API Changes in 0.9</h2></div></div></div> <p> This section details the architectural and D-Bus API changes in NetworkManager 0.9. </p> <div class="section"> <div class="titlepage"><div><div><h3 class="title"> -<a name="id446214"></a>Elimination of the User Settings Service</h3></div></div></div> +<a name="id488881"></a>Elimination of the User Settings Service</h3></div></div></div> <p> Previously there were two "settings services", or D-Bus services that provided and saved network configuration information. NetworkManager @@ -103,7 +103,7 @@ </div> <div class="section"> <div class="titlepage"><div><div><h3 class="title"> -<a name="id429971"></a>User Secret Agents</h3></div></div></div> +<a name="id459804"></a>User Secret Agents</h3></div></div></div> <p> Even with the elimination of the user settings service, in some cases it is still desirable to store secrets in the user's session and not in @@ -152,7 +152,7 @@ </div> <div class="section"> <div class="titlepage"><div><div><h3 class="title"> -<a name="id429654"></a>Settings Service Interface Changes</h3></div></div></div> +<a name="id471077"></a>Settings Service Interface Changes</h3></div></div></div> <p> With the elimination of the user settings service, the old <code class="literal">org.freedesktop.NetworkManagerUserSettings</code> and @@ -190,7 +190,7 @@ </div> <div class="section"> <div class="titlepage"><div><div><h3 class="title"> -<a name="id438294"></a>Connection Object Interface Changes</h3></div></div></div> +<a name="id492108"></a>Connection Object Interface Changes</h3></div></div></div> <p> Consistent with the interface changes to the Settings object, the Connection object's D-Bus interface has changed to @@ -224,7 +224,7 @@ </div> <div class="section"> <div class="titlepage"><div><div><h3 class="title"> -<a name="id432724"></a>Permissions Methods Consolidation</h3></div></div></div> +<a name="id477672"></a>Permissions Methods Consolidation</h3></div></div></div> <p> Previously there were two D-Bus method calls to retrieve the list of operations that a user client could perform, and two signals notifying @@ -256,7 +256,7 @@ are now string-based permissions. The mapping is as follows: </p> <div class="table"> -<a name="id433760"></a><p class="title"><b>Table 20. </b></p> +<a name="id482461"></a><p class="title"><b>Table 20. </b></p> <div class="table-contents"><table border="1"> <colgroup> <col> @@ -307,7 +307,7 @@ </div> <div class="section"> <div class="titlepage"><div><div><h3 class="title"> -<a name="id431666"></a>AddConnection Returns Object Path of New Connection</h3></div></div></div> +<a name="id483262"></a>AddConnection Returns Object Path of New Connection</h3></div></div></div> <p> The <a class="ulink" href="spec.html#org.freedesktop.NetworkManager.Settings" target="_top"> <code class="literal">org.freedesktop.NetworkManager.Settings.AddConnection</code> @@ -325,7 +325,7 @@ </div> <div class="section"> <div class="titlepage"><div><div><h3 class="title"> -<a name="id413984"></a>Support for WiMAX Devices</h3></div></div></div> +<a name="id450653"></a>Support for WiMAX Devices</h3></div></div></div> <p> NetworkManager now supports Intel WiMAX mobile broadband devices. A corresponding device type (<code class="literal">NM_DEVICE_TYPE_WIMAX</code>) and @@ -348,7 +348,7 @@ </div> <div class="section"> <div class="titlepage"><div><div><h3 class="title"> -<a name="id444778"></a>New Device States</h3></div></div></div> +<a name="id456786"></a>New Device States</h3></div></div></div> <p> A few <a class="ulink" href="spec.html#type-NM_DEVICE_STATE" target="_top">new device states</a> have been added, and all device states have been renumbered for flexibility. @@ -363,7 +363,7 @@ </div> <div class="section"> <div class="titlepage"><div><div><h3 class="title"> -<a name="id448971"></a>New Active Connection State</h3></div></div></div> +<a name="id486946"></a>New Active Connection State</h3></div></div></div> <p> Along with the new device states, an <a class="ulink" href="spec.html#type-NM_ACTIVE_CONNECTION_STATE" target="_top">additional @@ -379,7 +379,7 @@ </div> <div class="section"> <div class="titlepage"><div><div><h3 class="title"> -<a name="id443548"></a>Consolidated Modem Devices</h3></div></div></div> +<a name="id455331"></a>Consolidated Modem Devices</h3></div></div></div> <p> Many new mobile broadband devices support multiple access families, like Qualcomm Gobi cards (CDMA/EVDO and GSM/UMTS), or multi-mode EVDO/LTE @@ -415,7 +415,7 @@ </div> <div class="section"> <div class="titlepage"><div><div><h3 class="title"> -<a name="id421190"></a>Secret Property Flags</h3></div></div></div> +<a name="id451364"></a>Secret Property Flags</h3></div></div></div> <p> In the Connection object's configuration properties, each setting's secret properties (like WiFi passphrases, or public key passwords, etc) now has @@ -424,7 +424,7 @@ following values: </p> <div class="table"> -<a name="id421198"></a><p class="title"><b>Table 21. </b></p> +<a name="id451372"></a><p class="title"><b>Table 21. </b></p> <div class="table-contents"><table border="1"> <colgroup> <col> @@ -486,7 +486,7 @@ </div> <div class="section"> <div class="titlepage"><div><div><h3 class="title"> -<a name="id420876"></a>Deprecated Methods Removed</h3></div></div></div> +<a name="id456844"></a>Deprecated Methods Removed</h3></div></div></div> <p> A few methods and signals of the <code class="literal">org.freedesktop.NetworkManager</code> interface deprecated in version 0.7 have been removed. All the @@ -496,7 +496,7 @@ their replacements: </p> <div class="table"> -<a name="id420890"></a><p class="title"><b>Table 22. </b></p> +<a name="id456858"></a><p class="title"><b>Table 22. </b></p> <div class="table-contents"><table border="1"> <colgroup> <col> diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index abdef1d7a..45929d629 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -23,7 +23,7 @@ <div class="titlepage"><div><div><h2 class="title"> <a name="ref-settings"></a>Network Configuration Setting Specification</h2></div></div></div> <div class="toc"><dl> -<dt><span class="section"><a href="ref-settings.html#id437745">Configuration Settings</a></span></dt> +<dt><span class="section"><a href="ref-settings.html#id480831">Configuration Settings</a></span></dt> <dt><span class="section"><a href="secrets-flags.html">Secret flag types</a></span></dt> </dl></div> <p> @@ -35,11 +35,11 @@ </p> <div class="section"> <div class="titlepage"><div><div><h2 class="title" style="clear: both"> -<a name="id437745"></a>Configuration Settings</h2></div></div></div> +<a name="id480831"></a>Configuration Settings</h2></div></div></div> <p> </p> <div class="table"> -<a name="id439177"></a><p class="title"><b>Table 1. 802-1x setting</b></p> +<a name="id455861"></a><p class="title"><b>Table 1. 802-1x setting</b></p> <div class="table-contents"><table summary="802-1x setting" border="1"> <colgroup> <col> @@ -246,7 +246,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id425896"></a><p class="title"><b>Table 2. bluetooth setting</b></p> +<a name="id464508"></a><p class="title"><b>Table 2. bluetooth setting</b></p> <div class="table-contents"><table summary="bluetooth setting" border="1"> <colgroup> <col> @@ -285,7 +285,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id426028"></a><p class="title"><b>Table 3. bond setting</b></p> +<a name="id464640"></a><p class="title"><b>Table 3. bond setting</b></p> <div class="table-contents"><table summary="bond setting" border="1"> <colgroup> <col> @@ -324,7 +324,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id426161"></a><p class="title"><b>Table 4. cdma setting</b></p> +<a name="id464773"></a><p class="title"><b>Table 4. cdma setting</b></p> <div class="table-contents"><table summary="cdma setting" border="1"> <colgroup> <col> @@ -375,7 +375,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id426359"></a><p class="title"><b>Table 5. connection setting</b></p> +<a name="id464971"></a><p class="title"><b>Table 5. connection setting</b></p> <div class="table-contents"><table summary="connection setting" border="1"> <colgroup> <col> @@ -462,7 +462,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id426751"></a><p class="title"><b>Table 6. gsm setting</b></p> +<a name="id465363"></a><p class="title"><b>Table 6. gsm setting</b></p> <div class="table-contents"><table summary="gsm setting" border="1"> <colgroup> <col> @@ -555,7 +555,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id456458"></a><p class="title"><b>Table 7. infiniband setting</b></p> +<a name="id495059"></a><p class="title"><b>Table 7. infiniband setting</b></p> <div class="table-contents"><table summary="infiniband setting" border="1"> <colgroup> <col> @@ -600,7 +600,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id456596"></a><p class="title"><b>Table 8. ipv4 setting</b></p> +<a name="id495198"></a><p class="title"><b>Table 8. ipv4 setting</b></p> <div class="table-contents"><table summary="ipv4 setting" border="1"> <colgroup> <col> @@ -699,7 +699,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id456993"></a><p class="title"><b>Table 9. ipv6 setting</b></p> +<a name="id495594"></a><p class="title"><b>Table 9. ipv6 setting</b></p> <div class="table-contents"><table summary="ipv6 setting" border="1"> <colgroup> <col> @@ -786,7 +786,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id457340"></a><p class="title"><b>Table 10. 802-11-olpc-mesh setting</b></p> +<a name="id495941"></a><p class="title"><b>Table 10. 802-11-olpc-mesh setting</b></p> <div class="table-contents"><table summary="802-11-olpc-mesh setting" border="1"> <colgroup> <col> @@ -831,7 +831,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id457478"></a><p class="title"><b>Table 11. ppp setting</b></p> +<a name="id496079"></a><p class="title"><b>Table 11. ppp setting</b></p> <div class="table-contents"><table summary="ppp setting" border="1"> <colgroup> <col> @@ -966,7 +966,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id458143"></a><p class="title"><b>Table 12. pppoe setting</b></p> +<a name="id496747"></a><p class="title"><b>Table 12. pppoe setting</b></p> <div class="table-contents"><table summary="pppoe setting" border="1"> <colgroup> <col> @@ -1017,7 +1017,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id458349"></a><p class="title"><b>Table 13. serial setting</b></p> +<a name="id496953"></a><p class="title"><b>Table 13. serial setting</b></p> <div class="table-contents"><table summary="serial setting" border="1"> <colgroup> <col> @@ -1074,7 +1074,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id458588"></a><p class="title"><b>Table 14. vlan setting</b></p> +<a name="id497192"></a><p class="title"><b>Table 14. vlan setting</b></p> <div class="table-contents"><table summary="vlan setting" border="1"> <colgroup> <col> @@ -1099,13 +1099,13 @@ <td><pre class="screen">interface-name</pre></td> <td><pre class="screen">string</pre></td> <td><pre class="screen"></pre></td> -<td>If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' or 'infiniband' settings' 'mac-address' property.</td> +<td>If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' settings' 'mac-address' property.</td> </tr> <tr> <td><pre class="screen">parent</pre></td> <td><pre class="screen">string</pre></td> <td><pre class="screen"></pre></td> -<td>If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created. If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' or 'infiniband' settings' 'mac-address' property.</td> +<td>If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created. If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' settings' 'mac-address' property.</td> </tr> <tr> <td><pre class="screen">id</pre></td> @@ -1137,7 +1137,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id458863"></a><p class="title"><b>Table 15. vpn setting</b></p> +<a name="id497467"></a><p class="title"><b>Table 15. vpn setting</b></p> <div class="table-contents"><table summary="vpn setting" border="1"> <colgroup> <col> @@ -1188,7 +1188,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id459068"></a><p class="title"><b>Table 16. wimax setting</b></p> +<a name="id497672"></a><p class="title"><b>Table 16. wimax setting</b></p> <div class="table-contents"><table summary="wimax setting" border="1"> <colgroup> <col> @@ -1227,7 +1227,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id459207"></a><p class="title"><b>Table 17. 802-3-ethernet setting</b></p> +<a name="id497811"></a><p class="title"><b>Table 17. 802-3-ethernet setting</b></p> <div class="table-contents"><table summary="802-3-ethernet setting" border="1"> <colgroup> <col> @@ -1320,7 +1320,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id459647"></a><p class="title"><b>Table 18. 802-11-wireless setting</b></p> +<a name="id498251"></a><p class="title"><b>Table 18. 802-11-wireless setting</b></p> <div class="table-contents"><table summary="802-11-wireless setting" border="1"> <colgroup> <col> @@ -1431,7 +1431,7 @@ <p><br class="table-break"> </p> <div class="table"> -<a name="id460191"></a><p class="title"><b>Table 19. 802-11-wireless-security setting</b></p> +<a name="id498795"></a><p class="title"><b>Table 19. 802-11-wireless-security setting</b></p> <div class="table-contents"><table summary="802-11-wireless-security setting" border="1"> <colgroup> <col> diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html index 4796dfd17..a6c8ca5b4 100644 --- a/docs/api/html/spec.html +++ b/docs/api/html/spec.html @@ -1,5 +1,5 @@ <!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.5.96</title><style type="text/css"> +<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.6.0</title><style type="text/css"> body { font-family: sans-serif; @@ -98,7 +98,7 @@ margin-right: 4em; } - </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.9.5.96</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.6.0</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 --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml index 885ff7f1b..fadc88628 100644 --- a/docs/api/network-manager-docs.xml +++ b/docs/api/network-manager-docs.xml @@ -7,20 +7,9 @@ <bookinfo> <title>NetworkManager D-Bus Reference Manual</title> <releaseinfo>Version &version;</releaseinfo> - <authorgroup> - <author> - <firstname>Dan</firstname> - <surname>Williams</surname> - <affiliation> - <address> - <email>dcbw@redhat.com</email> - </address> - </affiliation> - </author> - </authorgroup> <copyright> - <year>2011</year> + <year>2012</year> <holder>The NetworkManager Authors</holder> </copyright> @@ -39,19 +28,11 @@ <address> The Free Software Foundation, Inc., - <street>59 Temple Place</street> - Suite 330, - <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>, + <street>51 Franklin Street</street> - Fifth Floor, + <city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>, <country>USA</country> </address> </para> - - <para> - Many of the names used by companies to distinguish their - products and services are claimed as trademarks. Where those - names appear in any GNOME documentation, and those trademarks - are made aware to the members of the GNOME Documentation - Project, the names have been printed in caps or initial caps. - </para> </legalnotice> </bookinfo> diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml index d90814d72..1e7eead48 100644 --- a/docs/api/settings-spec.xml +++ b/docs/api/settings-spec.xml @@ -983,13 +983,13 @@ <entry><screen>interface-name</screen></entry> <entry><screen>string</screen></entry> <entry><screen></screen></entry> - <entry>If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' or 'infiniband' settings' 'mac-address' property.</entry> + <entry>If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' settings' 'mac-address' property.</entry> </row> <row> <entry><screen>parent</screen></entry> <entry><screen>string</screen></entry> <entry><screen></screen></entry> - <entry>If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created. If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' or 'infiniband' settings' 'mac-address' property.</entry> + <entry>If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created. If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' settings' 'mac-address' property.</entry> </row> <row> <entry><screen>id</screen></entry> diff --git a/docs/api/spec.html b/docs/api/spec.html index 4796dfd17..a6c8ca5b4 100644 --- a/docs/api/spec.html +++ b/docs/api/spec.html @@ -1,5 +1,5 @@ <!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.5.96</title><style type="text/css"> +<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.6.0</title><style type="text/css"> body { font-family: sans-serif; @@ -98,7 +98,7 @@ margin-right: 4em; } - </style></head><body><h1 class="topbox">NetworkManager D-Bus Interface Specification</h1><h2>Version 0.9.5.96</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.6.0</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 --git a/docs/api/version.xml b/docs/api/version.xml index b8a4eaee6..c318497fc 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -0.9.5.96 +0.9.6.0 diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am index cd96c046c..a2a7d7768 100644 --- a/docs/libnm-glib/Makefile.am +++ b/docs/libnm-glib/Makefile.am @@ -61,7 +61,7 @@ IGNORE_HFILES= \ HTML_IMAGES = libnm-glib.png # Extra XML files that are included by $(DOC_MAIN_SGML_FILE). -content_files = +content_files = version.xml # Other files to distribute. extra_files = libnm-glib.png @@ -72,7 +72,6 @@ extra_files = libnm-glib.png GTKDOC_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/marshallers \ -I$(top_srcdir)/libnm-glib \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) @@ -85,6 +84,8 @@ GTKDOC_LIBS = \ # include common portion ... include $(top_srcdir)/gtk-doc.make +EXTRA_DIST += version.xml.in + CLEANFILES += \ libnm-glib-sections.txt \ html/* \ diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in index 594126e3c..066e42e5b 100644 --- a/docs/libnm-glib/Makefile.in +++ b/docs/libnm-glib/Makefile.in @@ -40,7 +40,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gtk-doc.make + $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make subdir = docs/libnm-glib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ @@ -58,7 +58,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) @@ -366,7 +366,7 @@ IGNORE_HFILES = \ HTML_IMAGES = libnm-glib.png # Extra XML files that are included by $(DOC_MAIN_SGML_FILE). -content_files = +content_files = version.xml # Other files to distribute. extra_files = libnm-glib.png @@ -376,7 +376,6 @@ extra_files = libnm-glib.png GTKDOC_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/marshallers \ -I$(top_srcdir)/libnm-glib \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) @@ -405,10 +404,9 @@ SETUP_FILES = \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt -EXTRA_DIST = \ - $(HTML_IMAGES) \ - $(SETUP_FILES) +# include common portion ... +EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ tmpl.stamp sgml.stamp html.stamp pdf.stamp @@ -425,8 +423,6 @@ REPORT_FILES = \ $(DOC_MODULE)-undeclared.txt \ $(DOC_MODULE)-unused.txt - -# include common portion ... CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \ libnm-glib-sections.txt html/* tmpl/* xml/* @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = @@ -467,6 +463,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html index f15a78399..3e02012bc 100644 --- a/docs/libnm-glib/html/NMClient.html +++ b/docs/libnm-glib/html/NMClient.html @@ -241,7 +241,90 @@ NMClient implements } NMClientPermission; </pre> <p> +<a class="link" href="NMClient.html#NMClientPermission" title="enum NMClientPermission"><span class="type">NMClientPermission</span></a> values indicate various permissions that NetworkManager +clients can obtain to perform certain tasks on behalf of the current user. </p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-NONE:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_NONE</code></span></p></td> +<td>unknown or no permission +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-ENABLE-DISABLE-NETWORK:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK</code></span></p></td> +<td>controls whether networking + can be globally enabled or disabled +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIFI:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI</code></span></p></td> +<td>controls whether WiFi can be + globally enabled or disabled +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-ENABLE-DISABLE-WWAN:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN</code></span></p></td> +<td>controls whether WWAN (3G) can be + globally enabled or disabled +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIMAX:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX</code></span></p></td> +<td>controls whether WiMAX can be + globally enabled or disabled +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-SLEEP-WAKE:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_SLEEP_WAKE</code></span></p></td> +<td>controls whether the client can ask + NetworkManager to sleep and wake +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-NETWORK-CONTROL:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_NETWORK_CONTROL</code></span></p></td> +<td>controls whether networking connections + can be started, stopped, and changed +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-WIFI-SHARE-PROTECTED:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED</code></span></p></td> +<td>controls whether a password + protected WiFi hotspot can be created +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-WIFI-SHARE-OPEN:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN</code></span></p></td> +<td>controls whether an open WiFi hotspot + can be created +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-SETTINGS-MODIFY-SYSTEM:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM</code></span></p></td> +<td>controls whether connections + that are available to all users can be modified +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-SETTINGS-MODIFY-OWN:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN</code></span></p></td> +<td>controls whether connections + owned by the current user can be modified +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-SETTINGS-MODIFY-HOSTNAME:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME</code></span></p></td> +<td>controls whether the + persistent hostname can be changed +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-LAST:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_LAST</code></span></p></td> +<td>a reserved boundary value +</td> +</tr> +</tbody> +</table></div> </div> <hr> <div class="refsect2"> @@ -254,7 +337,36 @@ NMClient implements } NMClientPermissionResult; </pre> <p> +<a class="link" href="NMClient.html#NMClientPermissionResult" title="enum NMClientPermissionResult"><span class="type">NMClientPermissionResult</span></a> values indicate what authorizations and permissions +the user requires to obtain a given <a class="link" href="NMClient.html#NMClientPermission" title="enum NMClientPermission"><span class="type">NMClientPermission</span></a> </p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-RESULT-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_RESULT_UNKNOWN</code></span></p></td> +<td>unknown or no authorization +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-RESULT-YES:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_RESULT_YES</code></span></p></td> +<td>the permission is available +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-RESULT-AUTH:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_RESULT_AUTH</code></span></p></td> +<td>authorization is necessary before the + permission is available +</td> +</tr> +<tr> +<td><p><a name="NM-CLIENT-PERMISSION-RESULT-NO:CAPS"></a><span class="term"><code class="literal">NM_CLIENT_PERMISSION_RESULT_NO</code></span></p></td> +<td>permission to perform the operation is + denied by system policy +</td> +</tr> +</tbody> +</table></div> </div> <hr> <div class="refsect2"> diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html index 7602b8518..fd8061ce2 100644 --- a/docs/libnm-glib/html/NMDevice.html +++ b/docs/libnm-glib/html/NMDevice.html @@ -119,6 +119,7 @@ const <span class="returnvalue">char</span> * <a class="link" href="NMDev +----<a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a> +----<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a> +----<a class="link" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">NMDeviceOlpcMesh</a> + +----<a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl">NMDeviceAdsl</a> +----<a class="link" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband">NMDeviceInfiniband</a> +----<a class="link" href="NMDeviceBond.html" title="NMDeviceBond">NMDeviceBond</a> +----<a class="link" href="NMDeviceVlan.html" title="NMDeviceVlan">NMDeviceVlan</a> @@ -632,7 +633,7 @@ Gets the current <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config" </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>the <span class="type">NMDHCPConfig</span> or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated or not +<td>the <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a> or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated or not using DHCP. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span> </td> </tr> @@ -656,7 +657,7 @@ Gets the current <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config" </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>the <span class="type">NMDHCPConfig</span> or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated or not +<td>the <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a> or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the device is not activated or not using DHCP. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span> </td> </tr> diff --git a/docs/libnm-glib/html/NMDeviceAdsl.html b/docs/libnm-glib/html/NMDeviceAdsl.html new file mode 100644 index 000000000..3dae6d21a --- /dev/null +++ b/docs/libnm-glib/html/NMDeviceAdsl.html @@ -0,0 +1,237 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>NMDeviceAdsl</title> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> +<link rel="home" href="index.html" title="libnm-glib Reference Manual"> +<link rel="up" href="ch02.html" title="libnm-glib API Reference"> +<link rel="prev" href="NMDeviceWimax.html" title="NMDeviceWimax"> +<link rel="next" href="NMDeviceBond.html" title="NMDeviceBond"> +<meta name="generator" content="GTK-Doc V1.18 (XML mode)"> +<link rel="stylesheet" href="style.css" type="text/css"> +</head> +<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> +<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"> +<tr valign="middle"> +<td><a accesskey="p" href="NMDeviceWimax.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> +<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td> +<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> +<th width="100%" align="center">libnm-glib Reference Manual</th> +<td><a accesskey="n" href="NMDeviceBond.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> +</tr> +<tr><td colspan="5" class="shortcuts"> +<a href="#NMDeviceAdsl.synopsis" class="shortcut">Top</a> +  | + <a href="#NMDeviceAdsl.description" class="shortcut">Description</a> +  | + <a href="#NMDeviceAdsl.object-hierarchy" class="shortcut">Object Hierarchy</a> +  | + <a href="#NMDeviceAdsl.implemented-interfaces" class="shortcut">Implemented Interfaces</a> +  | + <a href="#NMDeviceAdsl.properties" class="shortcut">Properties</a> +</td></tr> +</table> +<div class="refentry"> +<a name="NMDeviceAdsl"></a><div class="titlepage"></div> +<div class="refnamediv"><table width="100%"><tr> +<td valign="top"> +<h2><span class="refentrytitle"><a name="NMDeviceAdsl.top_of_page"></a>NMDeviceAdsl</span></h2> +<p>NMDeviceAdsl</p> +</td> +<td valign="top" align="right"></td> +</tr></table></div> +<div class="refsynopsisdiv"> +<a name="NMDeviceAdsl.synopsis"></a><h2>Synopsis</h2> +<pre class="synopsis"> <a class="link" href="NMDeviceAdsl.html#NMDeviceAdsl-struct" title="NMDeviceAdsl">NMDeviceAdsl</a>; + <a class="link" href="NMDeviceAdsl.html#NMDeviceAdslClass" title="NMDeviceAdslClass">NMDeviceAdslClass</a>; +enum <a class="link" href="NMDeviceAdsl.html#NMDeviceAdslError" title="enum NMDeviceAdslError">NMDeviceAdslError</a>; +#define <a class="link" href="NMDeviceAdsl.html#NM-DEVICE-ADSL-CARRIER:CAPS" title="NM_DEVICE_ADSL_CARRIER">NM_DEVICE_ADSL_CARRIER</a> +#define <a class="link" href="NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR:CAPS" title="NM_DEVICE_ADSL_ERROR">NM_DEVICE_ADSL_ERROR</a> +<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> <a class="link" href="NMDeviceAdsl.html#nm-device-adsl-error-quark" title="nm_device_adsl_error_quark ()">nm_device_adsl_error_quark</a> (<em class="parameter"><code><span class="type">void</span></code></em>); +<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="NMDeviceAdsl.html#nm-device-adsl-get-carrier" title="nm_device_adsl_get_carrier ()">nm_device_adsl_get_carrier</a> (<em class="parameter"><code><a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl"><span class="type">NMDeviceAdsl</span></a> *device</code></em>); +<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> * <a class="link" href="NMDeviceAdsl.html#nm-device-adsl-new" title="nm_device_adsl_new ()">nm_device_adsl_new</a> (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>, + <em class="parameter"><code>const <span class="type">char</span> *path</code></em>); +</pre> +</div> +<div class="refsect1"> +<a name="NMDeviceAdsl.object-hierarchy"></a><h2>Object Hierarchy</h2> +<pre class="synopsis"> + <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> + +----<a class="link" href="NMObject.html" title="NMObject">NMObject</a> + +----<a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a> + +----NMDeviceAdsl +</pre> +</div> +<div class="refsect1"> +<a name="NMDeviceAdsl.implemented-interfaces"></a><h2>Implemented Interfaces</h2> +<p> +NMDeviceAdsl implements + <a href="http://library.gnome.org/devel/gio/unstable/GInitable.html">GInitable</a> and <a href="http://library.gnome.org/devel/gio/unstable/GAsyncInitable.html">GAsyncInitable</a>.</p> +</div> +<div class="refsect1"> +<a name="NMDeviceAdsl.properties"></a><h2>Properties</h2> +<pre class="synopsis"> + "<a class="link" href="NMDeviceAdsl.html#NMDeviceAdsl--carrier" title='The "carrier" property'>carrier</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read +</pre> +</div> +<div class="refsect1"> +<a name="NMDeviceAdsl.description"></a><h2>Description</h2> +<p> +</p> +</div> +<div class="refsect1"> +<a name="NMDeviceAdsl.details"></a><h2>Details</h2> +<div class="refsect2"> +<a name="NMDeviceAdsl-struct"></a><h3>NMDeviceAdsl</h3> +<pre class="programlisting">typedef struct _NMDeviceAdsl NMDeviceAdsl;</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NMDeviceAdslClass"></a><h3>NMDeviceAdslClass</h3> +<pre class="programlisting">typedef struct { + NMDeviceClass parent; + + /* Padding for future expansion */ + void (*_reserved1) (void); + void (*_reserved2) (void); + void (*_reserved3) (void); + void (*_reserved4) (void); + void (*_reserved5) (void); + void (*_reserved6) (void); +} NMDeviceAdslClass; +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NMDeviceAdslError"></a><h3>enum NMDeviceAdslError</h3> +<pre class="programlisting">typedef enum { + NM_DEVICE_ADSL_ERROR_UNKNOWN = 0, /*< nick=UnknownError >*/ + NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION, /*< nick=NotAdslConnection >*/ + NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION, /*< nick=InvalidAdslConnection >*/ +} NMDeviceAdslError; +</pre> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><a name="NM-DEVICE-ADSL-ERROR-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_DEVICE_ADSL_ERROR_UNKNOWN</code></span></p></td> +<td>unknown or unclassified error +</td> +</tr> +<tr> +<td><p><a name="NM-DEVICE-ADSL-ERROR-NOT-ADSL-CONNECTION:CAPS"></a><span class="term"><code class="literal">NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION</code></span></p></td> +<td>the connection was not of ADSL type +</td> +</tr> +<tr> +<td><p><a name="NM-DEVICE-ADSL-ERROR-INVALID-ADSL-CONNECTION:CAPS"></a><span class="term"><code class="literal">NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION</code></span></p></td> +<td>the ADSL connection was invalid +</td> +</tr> +</tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> +<a name="NM-DEVICE-ADSL-CARRIER:CAPS"></a><h3>NM_DEVICE_ADSL_CARRIER</h3> +<pre class="programlisting">#define NM_DEVICE_ADSL_CARRIER "carrier" +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NM-DEVICE-ADSL-ERROR:CAPS"></a><h3>NM_DEVICE_ADSL_ERROR</h3> +<pre class="programlisting">#define NM_DEVICE_ADSL_ERROR nm_device_adsl_error_quark () +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="nm-device-adsl-error-quark"></a><h3>nm_device_adsl_error_quark ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> nm_device_adsl_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> +<p> +Registers an error quark for <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl"><span class="type">NMDeviceAdsl</span></a> if necessary. +</p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody><tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td>the error quark used for <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl"><span class="type">NMDeviceAdsl</span></a> errors.</td> +</tr></tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> +<a name="nm-device-adsl-get-carrier"></a><h3>nm_device_adsl_get_carrier ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> nm_device_adsl_get_carrier (<em class="parameter"><code><a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl"><span class="type">NMDeviceAdsl</span></a> *device</code></em>);</pre> +<p> +Whether the device has carrier. +</p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td> +<td>a <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl"><span class="type">NMDeviceAdsl</span></a> +</td> +</tr> +<tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> +<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the device has carrier</td> +</tr> +</tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> +<a name="nm-device-adsl-new"></a><h3>nm_device_adsl_new ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> * nm_device_adsl_new (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>, + <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre> +<p> +Creates a new <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl"><span class="type">NMDeviceAdsl</span></a>. +</p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td> +<td>the <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> +</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td> +<td>the DBus object path of the device</td> +</tr> +<tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td>a new device</td> +</tr> +</tbody> +</table></div> +</div> +</div> +<div class="refsect1"> +<a name="NMDeviceAdsl.property-details"></a><h2>Property Details</h2> +<div class="refsect2"> +<a name="NMDeviceAdsl--carrier"></a><h3>The <code class="literal">"carrier"</code> property</h3> +<pre class="programlisting"> "carrier" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read</pre> +<p> +Whether the device has carrier. +</p> +<p>Default value: FALSE</p> +</div> +</div> +</div> +<div class="footer"> +<hr> + Generated by GTK-Doc V1.18</div> +</body> +</html>
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html index 0fb8a4152..1cdc8e2a4 100644 --- a/docs/libnm-glib/html/NMDeviceBond.html +++ b/docs/libnm-glib/html/NMDeviceBond.html @@ -6,7 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="libnm-glib Reference Manual"> <link rel="up" href="ch02.html" title="libnm-glib API Reference"> -<link rel="prev" href="NMDeviceWimax.html" title="NMDeviceWimax"> +<link rel="prev" href="NMDeviceAdsl.html" title="NMDeviceAdsl"> <link rel="next" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband"> <meta name="generator" content="GTK-Doc V1.18 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> @@ -14,7 +14,7 @@ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"> <tr valign="middle"> -<td><a accesskey="p" href="NMDeviceWimax.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> +<td><a accesskey="p" href="NMDeviceAdsl.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> <td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td> <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> <th width="100%" align="center">libnm-glib Reference Manual</th> diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html index 598f77b59..e36f9d087 100644 --- a/docs/libnm-glib/html/NMDeviceWimax.html +++ b/docs/libnm-glib/html/NMDeviceWimax.html @@ -7,7 +7,7 @@ <link rel="home" href="index.html" title="libnm-glib Reference Manual"> <link rel="up" href="ch02.html" title="libnm-glib API Reference"> <link rel="prev" href="NMDeviceBt.html" title="NMDeviceBt"> -<link rel="next" href="NMDeviceBond.html" title="NMDeviceBond"> +<link rel="next" href="NMDeviceAdsl.html" title="NMDeviceAdsl"> <meta name="generator" content="GTK-Doc V1.18 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> @@ -18,7 +18,7 @@ <td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td> <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> <th width="100%" align="center">libnm-glib Reference Manual</th> -<td><a accesskey="n" href="NMDeviceBond.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> +<td><a accesskey="n" href="NMDeviceAdsl.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> <tr><td colspan="5" class="shortcuts"> <a href="#NMDeviceWimax.synopsis" class="shortcut">Top</a> diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html index bada1083b..d169f441d 100644 --- a/docs/libnm-glib/html/NMSecretAgent.html +++ b/docs/libnm-glib/html/NMSecretAgent.html @@ -240,7 +240,49 @@ should be called. } NMSecretAgentError; </pre> <p> +<a class="link" href="NMSecretAgent.html#NMSecretAgentError" title="enum NMSecretAgentError"><span class="type">NMSecretAgentError</span></a> values are passed by secret agents back to NetworkManager +when they encounter problems retrieving secrets on behalf of NM. </p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><a name="NM-SECRET-AGENT-ERROR-NOT-AUTHORIZED:CAPS"></a><span class="term"><code class="literal">NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED</code></span></p></td> +<td>the caller (ie, NetworkManager) is not + authorized to make this request +</td> +</tr> +<tr> +<td><p><a name="NM-SECRET-AGENT-ERROR-INVALID-CONNECTION:CAPS"></a><span class="term"><code class="literal">NM_SECRET_AGENT_ERROR_INVALID_CONNECTION</code></span></p></td> +<td>the connection for which secrets + were requested could not be found +</td> +</tr> +<tr> +<td><p><a name="NM-SECRET-AGENT-ERROR-USER-CANCELED:CAPS"></a><span class="term"><code class="literal">NM_SECRET_AGENT_ERROR_USER_CANCELED</code></span></p></td> +<td>the request was canceled by the user +</td> +</tr> +<tr> +<td><p><a name="NM-SECRET-AGENT-ERROR-AGENT-CANCELED:CAPS"></a><span class="term"><code class="literal">NM_SECRET_AGENT_ERROR_AGENT_CANCELED</code></span></p></td> +<td>the agent canceled the request + because it was requested to do so by NetworkManager +</td> +</tr> +<tr> +<td><p><a name="NM-SECRET-AGENT-ERROR-INTERNAL-ERROR:CAPS"></a><span class="term"><code class="literal">NM_SECRET_AGENT_ERROR_INTERNAL_ERROR</code></span></p></td> +<td>some internal error in the agent caused + the request to fail +</td> +</tr> +<tr> +<td><p><a name="NM-SECRET-AGENT-ERROR-NO-SECRETS:CAPS"></a><span class="term"><code class="literal">NM_SECRET_AGENT_ERROR_NO_SECRETS</code></span></p></td> +<td>the agent cannot find any secrets for this + connection +</td> +</tr> +</tbody> +</table></div> </div> <hr> <div class="refsect2"> @@ -310,7 +352,7 @@ To easily create the hash table to return the WiFi PSK, you could do something like this: </p> <div class="example"> -<a name="id693884"></a><p class="title"><b>Example 1. Creating a secrets hash</b></p> +<a name="id581297"></a><p class="title"><b>Example 1. Creating a secrets hash</b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html index aec1fde0c..46239b5d3 100644 --- a/docs/libnm-glib/html/api-index-full.html +++ b/docs/libnm-glib/html/api-index-full.html @@ -611,15 +611,19 @@ </dt> <dd></dd> <dt> -NMDeviceAdsl, struct in NMDeviceAdsl +<a class="link" href="NMDeviceAdsl.html#NMDeviceAdsl-struct" title="NMDeviceAdsl">NMDeviceAdsl</a>, struct in <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl">NMDeviceAdsl</a> </dt> <dd></dd> <dt> -NMDeviceAdslClass, struct in NMDeviceAdsl +<a class="link" href="NMDeviceAdsl.html#NMDeviceAdsl--carrier" title='The "carrier" property'>NMDeviceAdsl:carrier</a>, object property in <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl">NMDeviceAdsl</a> </dt> <dd></dd> <dt> -NMDeviceAdslError, enum in NMDeviceAdsl +<a class="link" href="NMDeviceAdsl.html#NMDeviceAdslClass" title="NMDeviceAdslClass">NMDeviceAdslClass</a>, struct in <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl">NMDeviceAdsl</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="NMDeviceAdsl.html#NMDeviceAdslError" title="enum NMDeviceAdslError">NMDeviceAdslError</a>, enum in <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl">NMDeviceAdsl</a> </dt> <dd></dd> <dt> @@ -887,23 +891,23 @@ NMDeviceAdslError, enum in NMDeviceAdsl </dt> <dd></dd> <dt> -NM_DEVICE_ADSL_CARRIER, macro in NMDeviceAdsl +<a class="link" href="NMDeviceAdsl.html#NM-DEVICE-ADSL-CARRIER:CAPS" title="NM_DEVICE_ADSL_CARRIER">NM_DEVICE_ADSL_CARRIER</a>, macro in <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl">NMDeviceAdsl</a> </dt> <dd></dd> <dt> -NM_DEVICE_ADSL_ERROR, macro in NMDeviceAdsl +<a class="link" href="NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR:CAPS" title="NM_DEVICE_ADSL_ERROR">NM_DEVICE_ADSL_ERROR</a>, macro in <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl">NMDeviceAdsl</a> </dt> <dd></dd> <dt> -nm_device_adsl_error_quark, function in NMDeviceAdsl +<a class="link" href="NMDeviceAdsl.html#nm-device-adsl-error-quark" title="nm_device_adsl_error_quark ()">nm_device_adsl_error_quark</a>, function in <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl">NMDeviceAdsl</a> </dt> <dd></dd> <dt> -nm_device_adsl_get_carrier, function in NMDeviceAdsl +<a class="link" href="NMDeviceAdsl.html#nm-device-adsl-get-carrier" title="nm_device_adsl_get_carrier ()">nm_device_adsl_get_carrier</a>, function in <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl">NMDeviceAdsl</a> </dt> <dd></dd> <dt> -nm_device_adsl_new, function in NMDeviceAdsl +<a class="link" href="NMDeviceAdsl.html#nm-device-adsl-new" title="nm_device_adsl_new ()">nm_device_adsl_new</a>, function in <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl">NMDeviceAdsl</a> </dt> <dd></dd> <dt> @@ -1996,6 +2000,10 @@ nm_device_adsl_new, function in NMDeviceAdsl </dt> <dd></dd> <dt> +<a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiCapability" title="enum NMVpnPluginUiCapability">NMVpnPluginUiCapability</a>, enum in <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html" title="NMVpnPluginUiWidget">NMVpnPluginUiWidget</a> +</dt> +<dd></dd> +<dt> <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiFactory" title="NMVpnPluginUiFactory ()">NMVpnPluginUiFactory</a>, user_function in <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html" title="NMVpnPluginUiWidget">NMVpnPluginUiWidget</a> </dt> <dd></dd> @@ -2080,22 +2088,6 @@ nm_device_adsl_new, function in NMDeviceAdsl </dt> <dd></dd> <dt> -<a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS" title="NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT">NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT</a>, macro in <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html" title="NMVpnPluginUiWidget">NMVpnPluginUiWidget</a> -</dt> -<dd></dd> -<dt> -<a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS" title="NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT">NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT</a>, macro in <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html" title="NMVpnPluginUiWidget">NMVpnPluginUiWidget</a> -</dt> -<dd></dd> -<dt> -<a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IPV6:CAPS" title="NM_VPN_PLUGIN_UI_CAPABILITY_IPV6">NM_VPN_PLUGIN_UI_CAPABILITY_IPV6</a>, macro in <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html" title="NMVpnPluginUiWidget">NMVpnPluginUiWidget</a> -</dt> -<dd></dd> -<dt> -<a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS" title="NM_VPN_PLUGIN_UI_CAPABILITY_NONE">NM_VPN_PLUGIN_UI_CAPABILITY_NONE</a>, macro in <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html" title="NMVpnPluginUiWidget">NMVpnPluginUiWidget</a> -</dt> -<dd></dd> -<dt> <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#nm-vpn-plugin-ui-factory" title="nm_vpn_plugin_ui_factory ()">nm_vpn_plugin_ui_factory</a>, function in <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html" title="NMVpnPluginUiWidget">NMVpnPluginUiWidget</a> </dt> <dd></dd> diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html index 7a9ece4b3..a462e06f3 100644 --- a/docs/libnm-glib/html/ch02.html +++ b/docs/libnm-glib/html/ch02.html @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id575202"></a>libnm-glib API Reference</h2></div></div></div> +<a name="id455861"></a>libnm-glib API Reference</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="NMClient.html">NMClient</a></span><span class="refpurpose"></span> @@ -48,6 +48,9 @@ <span class="refentrytitle"><a href="NMDeviceWimax.html">NMDeviceWimax</a></span><span class="refpurpose"></span> </dt> <dt> +<span class="refentrytitle"><a href="NMDeviceAdsl.html">NMDeviceAdsl</a></span><span class="refpurpose"></span> +</dt> +<dt> <span class="refentrytitle"><a href="NMDeviceBond.html">NMDeviceBond</a></span><span class="refpurpose"></span> </dt> <dt> diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index 4ca2e2f8e..487d0ab2d 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -14,22 +14,15 @@ <div class="titlepage"> <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><div class="authorgroup"><div class="author"> -<h3 class="author"> -<span class="firstname">Dan</span> <span class="surname">Williams</span> -</h3> -<div class="affiliation"><div class="address"><p><br> -     <code class="email"><<a class="email" href="mailto:dcbw@redhat.com">dcbw@redhat.com</a>></code><br> -   </p></div></div> -</div></div></div> <div><p class="releaseinfo"> - for libnm-glib 0.9 + for libnm-glib 0.9.6.0 + 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>. </p></div> -<div><p class="copyright">Copyright © 2011 The NetworkManager Authors</p></div> +<div><p class="copyright">Copyright © 2012 The NetworkManager Authors</p></div> <div><div class="legalnotice"> -<a name="id569976"></a><p> +<a name="id456265"></a><p> Permission is granted to copy, distribute and/or modify this document under the terms of the <em class="citetitle">GNU Free Documentation License</em>, Version 1.1 or any later @@ -43,19 +36,12 @@ </p> <div class="address"><p><br>   The Free Software Foundation, Inc.,<br> -   <span class="street">59 Temple Place</span> - Suite 330,<br> -   <span class="city">Boston</span>, <span class="state">MA</span> <span class="postcode">02111-1307</span>,<br> +   <span class="street">51 Franklin Street</span> - Fifth Floor,<br> +   <span class="city">Boston</span>, <span class="state">MA</span> <span class="postcode">02110-1301</span>,<br>   <span class="country">USA</span><br> </p></div> <p> </p> -<p> - Many of the names used by companies to distinguish their - products and services are claimed as trademarks. Where those - names appear in any GNOME documentation, and those trademarks - are made aware to the members of the GNOME Documentation - Project, the names have been printed in caps or initial caps. - </p> </div></div> </div> <hr> @@ -89,6 +75,9 @@ <span class="refentrytitle"><a href="NMDeviceWimax.html">NMDeviceWimax</a></span><span class="refpurpose"></span> </dt> <dt> +<span class="refentrytitle"><a href="NMDeviceAdsl.html">NMDeviceAdsl</a></span><span class="refpurpose"></span> +</dt> +<dt> <span class="refentrytitle"><a href="NMDeviceBond.html">NMDeviceBond</a></span><span class="refpurpose"></span> </dt> <dt> diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml index cd95bbbf6..14757e3b3 100644 --- a/docs/libnm-glib/html/index.sgml +++ b/docs/libnm-glib/html/index.sgml @@ -12,7 +12,24 @@ <ANCHOR id="NMClientAddActivateFn" href="libnm-glib/NMClient.html#NMClientAddActivateFn"> <ANCHOR id="NMClientClass" href="libnm-glib/NMClient.html#NMClientClass"> <ANCHOR id="NMClientPermission" href="libnm-glib/NMClient.html#NMClientPermission"> +<ANCHOR id="NM-CLIENT-PERMISSION-NONE:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-NONE:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-ENABLE-DISABLE-NETWORK:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-NETWORK:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIFI:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIFI:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-ENABLE-DISABLE-WWAN:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WWAN:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIMAX:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIMAX:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-SLEEP-WAKE:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-SLEEP-WAKE:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-NETWORK-CONTROL:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-NETWORK-CONTROL:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-WIFI-SHARE-PROTECTED:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-WIFI-SHARE-PROTECTED:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-WIFI-SHARE-OPEN:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-WIFI-SHARE-OPEN:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-SETTINGS-MODIFY-SYSTEM:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-SYSTEM:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-SETTINGS-MODIFY-OWN:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-OWN:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-SETTINGS-MODIFY-HOSTNAME:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-HOSTNAME:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-LAST:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-LAST:CAPS"> <ANCHOR id="NMClientPermissionResult" href="libnm-glib/NMClient.html#NMClientPermissionResult"> +<ANCHOR id="NM-CLIENT-PERMISSION-RESULT-UNKNOWN:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-RESULT-UNKNOWN:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-RESULT-YES:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-RESULT-YES:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-RESULT-AUTH:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-RESULT-AUTH:CAPS"> +<ANCHOR id="NM-CLIENT-PERMISSION-RESULT-NO:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-PERMISSION-RESULT-NO:CAPS"> <ANCHOR id="NM-CLIENT-ACTIVE-CONNECTIONS:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-ACTIVE-CONNECTIONS:CAPS"> <ANCHOR id="NM-CLIENT-MANAGER-RUNNING:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-MANAGER-RUNNING:CAPS"> <ANCHOR id="NM-CLIENT-NETWORKING-ENABLED:CAPS" href="libnm-glib/NMClient.html#NM-CLIENT-NETWORKING-ENABLED:CAPS"> @@ -355,6 +372,26 @@ <ANCHOR id="NMDeviceWimax.signal-details" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax.signal-details"> <ANCHOR id="NMDeviceWimax-nsp-added" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax-nsp-added"> <ANCHOR id="NMDeviceWimax-nsp-removed" href="libnm-glib/NMDeviceWimax.html#NMDeviceWimax-nsp-removed"> +<ANCHOR id="NMDeviceAdsl" href="libnm-glib/NMDeviceAdsl.html"> +<ANCHOR id="NMDeviceAdsl.synopsis" href="libnm-glib/NMDeviceAdsl.html#NMDeviceAdsl.synopsis"> +<ANCHOR id="NMDeviceAdsl.object-hierarchy" href="libnm-glib/NMDeviceAdsl.html#NMDeviceAdsl.object-hierarchy"> +<ANCHOR id="NMDeviceAdsl.implemented-interfaces" href="libnm-glib/NMDeviceAdsl.html#NMDeviceAdsl.implemented-interfaces"> +<ANCHOR id="NMDeviceAdsl.properties" href="libnm-glib/NMDeviceAdsl.html#NMDeviceAdsl.properties"> +<ANCHOR id="NMDeviceAdsl.description" href="libnm-glib/NMDeviceAdsl.html#NMDeviceAdsl.description"> +<ANCHOR id="NMDeviceAdsl.details" href="libnm-glib/NMDeviceAdsl.html#NMDeviceAdsl.details"> +<ANCHOR id="NMDeviceAdsl-struct" href="libnm-glib/NMDeviceAdsl.html#NMDeviceAdsl-struct"> +<ANCHOR id="NMDeviceAdslClass" href="libnm-glib/NMDeviceAdsl.html#NMDeviceAdslClass"> +<ANCHOR id="NMDeviceAdslError" href="libnm-glib/NMDeviceAdsl.html#NMDeviceAdslError"> +<ANCHOR id="NM-DEVICE-ADSL-ERROR-UNKNOWN:CAPS" href="libnm-glib/NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR-UNKNOWN:CAPS"> +<ANCHOR id="NM-DEVICE-ADSL-ERROR-NOT-ADSL-CONNECTION:CAPS" href="libnm-glib/NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR-NOT-ADSL-CONNECTION:CAPS"> +<ANCHOR id="NM-DEVICE-ADSL-ERROR-INVALID-ADSL-CONNECTION:CAPS" href="libnm-glib/NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR-INVALID-ADSL-CONNECTION:CAPS"> +<ANCHOR id="NM-DEVICE-ADSL-CARRIER:CAPS" href="libnm-glib/NMDeviceAdsl.html#NM-DEVICE-ADSL-CARRIER:CAPS"> +<ANCHOR id="NM-DEVICE-ADSL-ERROR:CAPS" href="libnm-glib/NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR:CAPS"> +<ANCHOR id="nm-device-adsl-error-quark" href="libnm-glib/NMDeviceAdsl.html#nm-device-adsl-error-quark"> +<ANCHOR id="nm-device-adsl-get-carrier" href="libnm-glib/NMDeviceAdsl.html#nm-device-adsl-get-carrier"> +<ANCHOR id="nm-device-adsl-new" href="libnm-glib/NMDeviceAdsl.html#nm-device-adsl-new"> +<ANCHOR id="NMDeviceAdsl.property-details" href="libnm-glib/NMDeviceAdsl.html#NMDeviceAdsl.property-details"> +<ANCHOR id="NMDeviceAdsl--carrier" href="libnm-glib/NMDeviceAdsl.html#NMDeviceAdsl--carrier"> <ANCHOR id="NMDeviceBond" href="libnm-glib/NMDeviceBond.html"> <ANCHOR id="NMDeviceBond.synopsis" href="libnm-glib/NMDeviceBond.html#NMDeviceBond.synopsis"> <ANCHOR id="NMDeviceBond.object-hierarchy" href="libnm-glib/NMDeviceBond.html#NMDeviceBond.object-hierarchy"> @@ -707,6 +744,12 @@ <ANCHOR id="NMSecretAgentClass" href="libnm-glib/NMSecretAgent.html#NMSecretAgentClass"> <ANCHOR id="NMSecretAgentDeleteSecretsFunc" href="libnm-glib/NMSecretAgent.html#NMSecretAgentDeleteSecretsFunc"> <ANCHOR id="NMSecretAgentError" href="libnm-glib/NMSecretAgent.html#NMSecretAgentError"> +<ANCHOR id="NM-SECRET-AGENT-ERROR-NOT-AUTHORIZED:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-ERROR-NOT-AUTHORIZED:CAPS"> +<ANCHOR id="NM-SECRET-AGENT-ERROR-INVALID-CONNECTION:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-ERROR-INVALID-CONNECTION:CAPS"> +<ANCHOR id="NM-SECRET-AGENT-ERROR-USER-CANCELED:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-ERROR-USER-CANCELED:CAPS"> +<ANCHOR id="NM-SECRET-AGENT-ERROR-AGENT-CANCELED:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-ERROR-AGENT-CANCELED:CAPS"> +<ANCHOR id="NM-SECRET-AGENT-ERROR-INTERNAL-ERROR:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-ERROR-INTERNAL-ERROR:CAPS"> +<ANCHOR id="NM-SECRET-AGENT-ERROR-NO-SECRETS:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-ERROR-NO-SECRETS:CAPS"> <ANCHOR id="NMSecretAgentGetSecretsFlags" href="libnm-glib/NMSecretAgent.html#NMSecretAgentGetSecretsFlags"> <ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-NONE:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-NONE:CAPS"> <ANCHOR id="NM-SECRET-AGENT-GET-SECRETS-FLAG-ALLOW-INTERACTION:CAPS" href="libnm-glib/NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-ALLOW-INTERACTION:CAPS"> @@ -759,6 +802,15 @@ <ANCHOR id="NMVPNPlugin" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NMVPNPlugin"> <ANCHOR id="NMVPNPluginClass" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NMVPNPluginClass"> <ANCHOR id="NMVPNPluginError" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NMVPNPluginError"> +<ANCHOR id="NM-VPN-PLUGIN-ERROR-GENERAL:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-GENERAL:CAPS"> +<ANCHOR id="NM-VPN-PLUGIN-ERROR-STARTING-IN-PROGRESS:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-STARTING-IN-PROGRESS:CAPS"> +<ANCHOR id="NM-VPN-PLUGIN-ERROR-ALREADY-STARTED:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-ALREADY-STARTED:CAPS"> +<ANCHOR id="NM-VPN-PLUGIN-ERROR-STOPPING-IN-PROGRESS:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-STOPPING-IN-PROGRESS:CAPS"> +<ANCHOR id="NM-VPN-PLUGIN-ERROR-ALREADY-STOPPED:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-ALREADY-STOPPED:CAPS"> +<ANCHOR id="NM-VPN-PLUGIN-ERROR-WRONG-STATE:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-WRONG-STATE:CAPS"> +<ANCHOR id="NM-VPN-PLUGIN-ERROR-BAD-ARGUMENTS:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-BAD-ARGUMENTS:CAPS"> +<ANCHOR id="NM-VPN-PLUGIN-ERROR-LAUNCH-FAILED:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-LAUNCH-FAILED:CAPS"> +<ANCHOR id="NM-VPN-PLUGIN-ERROR-CONNECTION-INVALID:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-CONNECTION-INVALID:CAPS"> <ANCHOR id="NM-VPN-PLUGIN-DBUS-SERVICE-NAME:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-DBUS-SERVICE-NAME:CAPS"> <ANCHOR id="NM-VPN-PLUGIN-STATE:CAPS" href="libnm-glib/libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-STATE:CAPS"> <ANCHOR id="nm-vpn-plugin-disconnect" href="libnm-glib/libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-disconnect"> @@ -775,14 +827,18 @@ <ANCHOR id="libnm-glib-NMVpnPluginUiWidget.synopsis" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#libnm-glib-NMVpnPluginUiWidget.synopsis"> <ANCHOR id="libnm-glib-NMVpnPluginUiWidget.description" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#libnm-glib-NMVpnPluginUiWidget.description"> <ANCHOR id="libnm-glib-NMVpnPluginUiWidget.details" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#libnm-glib-NMVpnPluginUiWidget.details"> +<ANCHOR id="NMVpnPluginUiCapability" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiCapability"> +<ANCHOR id="NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS"> +<ANCHOR id="NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS"> +<ANCHOR id="NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS"> +<ANCHOR id="NM-VPN-PLUGIN-UI-CAPABILITY-IPV6:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IPV6:CAPS"> <ANCHOR id="NMVpnPluginUiFactory" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiFactory"> <ANCHOR id="NMVpnPluginUiInterface" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiInterface"> <ANCHOR id="NMVpnPluginUiInterfaceProp" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiInterfaceProp"> +<ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-PROP-NAME:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-PROP-NAME:CAPS"> +<ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-PROP-DESC:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-PROP-DESC:CAPS"> +<ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-PROP-SERVICE:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-PROP-SERVICE:CAPS"> <ANCHOR id="NMVpnPluginUiWidgetInterface" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiWidgetInterface"> -<ANCHOR id="NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS"> -<ANCHOR id="NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS"> -<ANCHOR id="NM-VPN-PLUGIN-UI-CAPABILITY-IPV6:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IPV6:CAPS"> -<ANCHOR id="NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS"> <ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS"> <ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-NAME:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-NAME:CAPS"> <ANCHOR id="NM-VPN-PLUGIN-UI-INTERFACE-SERVICE:CAPS" href="libnm-glib/libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-SERVICE:CAPS"> diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html index a05a01a42..c98b390a0 100644 --- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html +++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html @@ -143,7 +143,68 @@ enum <a class="link" href="libnm-glib-NMVPNPlugin.html#NMVPNPlugi } NMVPNPluginError; </pre> <p> +Returned by the VPN service plugin to indicate errors. </p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><a name="NM-VPN-PLUGIN-ERROR-GENERAL:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_ERROR_GENERAL</code></span></p></td> +<td>general failure +</td> +</tr> +<tr> +<td><p><a name="NM-VPN-PLUGIN-ERROR-STARTING-IN-PROGRESS:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS</code></span></p></td> +<td>the plugin is already starting, + and another connect request was received +</td> +</tr> +<tr> +<td><p><a name="NM-VPN-PLUGIN-ERROR-ALREADY-STARTED:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_ERROR_ALREADY_STARTED</code></span></p></td> +<td>the plugin is already connected, and + another connect request was received +</td> +</tr> +<tr> +<td><p><a name="NM-VPN-PLUGIN-ERROR-STOPPING-IN-PROGRESS:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS</code></span></p></td> +<td>the plugin is already stopping, + and another stop request was received +</td> +</tr> +<tr> +<td><p><a name="NM-VPN-PLUGIN-ERROR-ALREADY-STOPPED:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED</code></span></p></td> +<td>the plugin is already stopped, and + another disconnect request was received +</td> +</tr> +<tr> +<td><p><a name="NM-VPN-PLUGIN-ERROR-WRONG-STATE:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_ERROR_WRONG_STATE</code></span></p></td> +<td>the operation could not be performed in + this state +</td> +</tr> +<tr> +<td><p><a name="NM-VPN-PLUGIN-ERROR-BAD-ARGUMENTS:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS</code></span></p></td> +<td>the operation could not be performed as + the request contained malformed arguments, or arguments of unexpected type. + Usually means that one of the VPN setting data items or secrets was not of + the expected type (ie int, string, bool, etc). +</td> +</tr> +<tr> +<td><p><a name="NM-VPN-PLUGIN-ERROR-LAUNCH-FAILED:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED</code></span></p></td> +<td>a child process failed to launch +</td> +</tr> +<tr> +<td><p><a name="NM-VPN-PLUGIN-ERROR-CONNECTION-INVALID:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID</code></span></p></td> +<td>the operation could not be performed + because the connection was invalid. Usually means that the connection's + VPN setting was missing some required data item or secret. +</td> +</tr> +</tbody> +</table></div> </div> <hr> <div class="refsect2"> diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html index 9afd3d0a3..4a1f1f8aa 100644 --- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html +++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html @@ -37,14 +37,11 @@ </tr></table></div> <div class="refsynopsisdiv"> <a name="libnm-glib-NMVpnPluginUiWidget.synopsis"></a><h2>Synopsis</h2> -<pre class="synopsis"><a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="returnvalue">NMVpnPluginUiInterface</span></a> * (<a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiFactory" title="NMVpnPluginUiFactory ()">*NMVpnPluginUiFactory</a>) (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>); +<pre class="synopsis">enum <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiCapability" title="enum NMVpnPluginUiCapability">NMVpnPluginUiCapability</a>; +<a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="returnvalue">NMVpnPluginUiInterface</span></a> * (<a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiFactory" title="NMVpnPluginUiFactory ()">*NMVpnPluginUiFactory</a>) (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>); struct <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface">NMVpnPluginUiInterface</a>; enum <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiInterfaceProp" title="enum NMVpnPluginUiInterfaceProp">NMVpnPluginUiInterfaceProp</a>; struct <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiWidgetInterface" title="struct NMVpnPluginUiWidgetInterface">NMVpnPluginUiWidgetInterface</a>; -#define <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS" title="NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT">NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT</a> -#define <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS" title="NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT">NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT</a> -#define <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IPV6:CAPS" title="NM_VPN_PLUGIN_UI_CAPABILITY_IPV6">NM_VPN_PLUGIN_UI_CAPABILITY_IPV6</a> -#define <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS" title="NM_VPN_PLUGIN_UI_CAPABILITY_NONE">NM_VPN_PLUGIN_UI_CAPABILITY_NONE</a> #define <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS" title="NM_VPN_PLUGIN_UI_INTERFACE_DESC">NM_VPN_PLUGIN_UI_INTERFACE_DESC</a> #define <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-NAME:CAPS" title="NM_VPN_PLUGIN_UI_INTERFACE_NAME">NM_VPN_PLUGIN_UI_INTERFACE_NAME</a> #define <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-SERVICE:CAPS" title="NM_VPN_PLUGIN_UI_INTERFACE_SERVICE">NM_VPN_PLUGIN_UI_INTERFACE_SERVICE</a> @@ -89,6 +86,45 @@ struct <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NM <div class="refsect1"> <a name="libnm-glib-NMVpnPluginUiWidget.details"></a><h2>Details</h2> <div class="refsect2"> +<a name="NMVpnPluginUiCapability"></a><h3>enum NMVpnPluginUiCapability</h3> +<pre class="programlisting">typedef enum { + NM_VPN_PLUGIN_UI_CAPABILITY_NONE = 0x00, + NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT = 0x01, + NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT = 0x02, + NM_VPN_PLUGIN_UI_CAPABILITY_IPV6 = 0x04 +} NMVpnPluginUiCapability; +</pre> +<p> +Flags that indicate to UI programs certain capabilities of the plugin. +</p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><a name="NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_UI_CAPABILITY_NONE</code></span></p></td> +<td>unknown or no capability +</td> +</tr> +<tr> +<td><p><a name="NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT</code></span></p></td> +<td>the plugin can import new connections +</td> +</tr> +<tr> +<td><p><a name="NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT</code></span></p></td> +<td>the plugin can export connections +</td> +</tr> +<tr> +<td><p><a name="NM-VPN-PLUGIN-UI-CAPABILITY-IPV6:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_UI_CAPABILITY_IPV6</code></span></p></td> +<td>the plugin supports IPv6 addressing +</td> +</tr> +</tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> <a name="NMVpnPluginUiFactory"></a><h3>NMVpnPluginUiFactory ()</h3> <pre class="programlisting"><a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiInterface" title="struct NMVpnPluginUiInterface"><span class="returnvalue">NMVpnPluginUiInterface</span></a> * (*NMVpnPluginUiFactory) (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre> <p> @@ -157,15 +193,37 @@ struct <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NM <div class="refsect2"> <a name="NMVpnPluginUiInterfaceProp"></a><h3>enum NMVpnPluginUiInterfaceProp</h3> <pre class="programlisting">typedef enum { - NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST = 0x1000, - NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME = NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST, NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC, NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE } NMVpnPluginUiInterfaceProp; </pre> <p> +<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> property numbers that plugins should override to provide certain +information to UI programs. </p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><a name="NM-VPN-PLUGIN-UI-INTERFACE-PROP-NAME:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME</code></span></p></td> +<td>the VPN plugin's name +</td> +</tr> +<tr> +<td><p><a name="NM-VPN-PLUGIN-UI-INTERFACE-PROP-DESC:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC</code></span></p></td> +<td>description of the VPN plugin and what +VPN services it supports +</td> +</tr> +<tr> +<td><p><a name="NM-VPN-PLUGIN-UI-INTERFACE-PROP-SERVICE:CAPS"></a><span class="term"><code class="literal">NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE</code></span></p></td> +<td>the D-Bus service name used by the +plugin's VPN service daemon +</td> +</tr> +</tbody> +</table></div> </div> <hr> <div class="refsect2"> @@ -202,38 +260,6 @@ struct <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#NM </div> <hr> <div class="refsect2"> -<a name="NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS"></a><h3>NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT</h3> -<pre class="programlisting">#define NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT 0x02 -</pre> -<p> -</p> -</div> -<hr> -<div class="refsect2"> -<a name="NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS"></a><h3>NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT</h3> -<pre class="programlisting">#define NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT 0x01 -</pre> -<p> -</p> -</div> -<hr> -<div class="refsect2"> -<a name="NM-VPN-PLUGIN-UI-CAPABILITY-IPV6:CAPS"></a><h3>NM_VPN_PLUGIN_UI_CAPABILITY_IPV6</h3> -<pre class="programlisting">#define NM_VPN_PLUGIN_UI_CAPABILITY_IPV6 0x04 -</pre> -<p> -</p> -</div> -<hr> -<div class="refsect2"> -<a name="NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS"></a><h3>NM_VPN_PLUGIN_UI_CAPABILITY_NONE</h3> -<pre class="programlisting">#define NM_VPN_PLUGIN_UI_CAPABILITY_NONE 0x00 -</pre> -<p> -</p> -</div> -<hr> -<div class="refsect2"> <a name="NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS"></a><h3>NM_VPN_PLUGIN_UI_INTERFACE_DESC</h3> <pre class="programlisting">#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc" </pre> diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2 index 56ad45ead..64e57d5f7 100644 --- a/docs/libnm-glib/html/libnm-glib.devhelp2 +++ b/docs/libnm-glib/html/libnm-glib.devhelp2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="no"?> <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" ""> -<book xmlns="http://www.devhelp.net/book" title="libnm-glib Reference Manual" link="index.html" author="Dan Williams" name="libnm-glib" version="2" language="c"> +<book xmlns="http://www.devhelp.net/book" title="libnm-glib Reference Manual" link="index.html" author="" name="libnm-glib" version="2" language="c"> <chapters> <sub name="Object Overview" link="ref-overview.html"/> <sub name="libnm-glib API Reference" link="ch02.html"> @@ -12,6 +12,7 @@ <sub name="NMDeviceModem" link="NMDeviceModem.html"/> <sub name="NMDeviceBt" link="NMDeviceBt.html"/> <sub name="NMDeviceWimax" link="NMDeviceWimax.html"/> + <sub name="NMDeviceAdsl" link="NMDeviceAdsl.html"/> <sub name="NMDeviceBond" link="NMDeviceBond.html"/> <sub name="NMDeviceInfiniband" link="NMDeviceInfiniband.html"/> <sub name="NMDeviceVlan" link="NMDeviceVlan.html"/> @@ -294,6 +295,15 @@ <keyword type="property" name="The "tx-power" property" link="NMDeviceWimax.html#NMDeviceWimax--tx-power"/> <keyword type="signal" name="The "nsp-added" signal" link="NMDeviceWimax.html#NMDeviceWimax-nsp-added"/> <keyword type="signal" name="The "nsp-removed" signal" link="NMDeviceWimax.html#NMDeviceWimax-nsp-removed"/> + <keyword type="struct" name="NMDeviceAdsl" link="NMDeviceAdsl.html#NMDeviceAdsl-struct"/> + <keyword type="struct" name="NMDeviceAdslClass" link="NMDeviceAdsl.html#NMDeviceAdslClass"/> + <keyword type="enum" name="enum NMDeviceAdslError" link="NMDeviceAdsl.html#NMDeviceAdslError"/> + <keyword type="macro" name="NM_DEVICE_ADSL_CARRIER" link="NMDeviceAdsl.html#NM-DEVICE-ADSL-CARRIER:CAPS"/> + <keyword type="macro" name="NM_DEVICE_ADSL_ERROR" link="NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR:CAPS"/> + <keyword type="function" name="nm_device_adsl_error_quark ()" link="NMDeviceAdsl.html#nm-device-adsl-error-quark"/> + <keyword type="function" name="nm_device_adsl_get_carrier ()" link="NMDeviceAdsl.html#nm-device-adsl-get-carrier"/> + <keyword type="function" name="nm_device_adsl_new ()" link="NMDeviceAdsl.html#nm-device-adsl-new"/> + <keyword type="property" name="The "carrier" property" link="NMDeviceAdsl.html#NMDeviceAdsl--carrier"/> <keyword type="struct" name="NMDeviceBond" link="NMDeviceBond.html#NMDeviceBond-struct"/> <keyword type="struct" name="NMDeviceBondClass" link="NMDeviceBond.html#NMDeviceBondClass"/> <keyword type="enum" name="enum NMDeviceBondError" link="NMDeviceBond.html#NMDeviceBondError"/> @@ -547,14 +557,11 @@ <keyword type="function" name="nm_vpn_plugin_set_ip6_config ()" link="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-set-ip6-config"/> <keyword type="function" name="nm_vpn_plugin_set_login_banner ()" link="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-set-login-banner"/> <keyword type="function" name="nm_vpn_plugin_set_state ()" link="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-set-state"/> + <keyword type="enum" name="enum NMVpnPluginUiCapability" link="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiCapability"/> <keyword type="function" name="NMVpnPluginUiFactory ()" link="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiFactory"/> <keyword type="struct" name="struct NMVpnPluginUiInterface" link="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiInterface"/> <keyword type="enum" name="enum NMVpnPluginUiInterfaceProp" link="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiInterfaceProp"/> <keyword type="struct" name="struct NMVpnPluginUiWidgetInterface" link="libnm-glib-NMVpnPluginUiWidget.html#NMVpnPluginUiWidgetInterface"/> - <keyword type="macro" name="NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS"/> - <keyword type="macro" name="NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS"/> - <keyword type="macro" name="NM_VPN_PLUGIN_UI_CAPABILITY_IPV6" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IPV6:CAPS"/> - <keyword type="macro" name="NM_VPN_PLUGIN_UI_CAPABILITY_NONE" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS"/> <keyword type="macro" name="NM_VPN_PLUGIN_UI_INTERFACE_DESC" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-DESC:CAPS"/> <keyword type="macro" name="NM_VPN_PLUGIN_UI_INTERFACE_NAME" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-NAME:CAPS"/> <keyword type="macro" name="NM_VPN_PLUGIN_UI_INTERFACE_SERVICE" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-SERVICE:CAPS"/> @@ -570,6 +577,23 @@ <keyword type="function" name="nm_vpn_plugin_ui_widget_interface_update_connection ()" link="libnm-glib-NMVpnPluginUiWidget.html#nm-vpn-plugin-ui-widget-interface-update-connection"/> <keyword type="function" name="nm_vpn_plugin_utils_get_secret_flags ()" link="libnm-glib-nm-vpn-plugin-utils.html#nm-vpn-plugin-utils-get-secret-flags"/> <keyword type="function" name="nm_vpn_plugin_utils_read_vpn_details ()" link="libnm-glib-nm-vpn-plugin-utils.html#nm-vpn-plugin-utils-read-vpn-details"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_NONE" link="NMClient.html#NM-CLIENT-PERMISSION-NONE:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK" link="NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-NETWORK:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI" link="NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIFI:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN" link="NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WWAN:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX" link="NMClient.html#NM-CLIENT-PERMISSION-ENABLE-DISABLE-WIMAX:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_SLEEP_WAKE" link="NMClient.html#NM-CLIENT-PERMISSION-SLEEP-WAKE:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_NETWORK_CONTROL" link="NMClient.html#NM-CLIENT-PERMISSION-NETWORK-CONTROL:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED" link="NMClient.html#NM-CLIENT-PERMISSION-WIFI-SHARE-PROTECTED:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN" link="NMClient.html#NM-CLIENT-PERMISSION-WIFI-SHARE-OPEN:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM" link="NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-SYSTEM:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN" link="NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-OWN:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME" link="NMClient.html#NM-CLIENT-PERMISSION-SETTINGS-MODIFY-HOSTNAME:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_LAST" link="NMClient.html#NM-CLIENT-PERMISSION-LAST:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_UNKNOWN" link="NMClient.html#NM-CLIENT-PERMISSION-RESULT-UNKNOWN:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_YES" link="NMClient.html#NM-CLIENT-PERMISSION-RESULT-YES:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_AUTH" link="NMClient.html#NM-CLIENT-PERMISSION-RESULT-AUTH:CAPS"/> + <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_NO" link="NMClient.html#NM-CLIENT-PERMISSION-RESULT-NO:CAPS"/> <keyword type="constant" name="NM_DEVICE_ETHERNET_ERROR_UNKNOWN" link="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-ERROR-UNKNOWN:CAPS"/> <keyword type="constant" name="NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION" link="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-ERROR-NOT-ETHERNET-CONNECTION:CAPS"/> <keyword type="constant" name="NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION" link="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-ERROR-INVALID-ETHERNET-CONNECTION:CAPS"/> @@ -597,6 +621,9 @@ <keyword type="constant" name="NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-ERROR-INVALID-WIMAX-CONNECTION:CAPS"/> <keyword type="constant" name="NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-ERROR-INVALID-DEVICE-MAC:CAPS"/> <keyword type="constant" name="NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-ERROR-MAC-MISMATCH:CAPS"/> + <keyword type="constant" name="NM_DEVICE_ADSL_ERROR_UNKNOWN" link="NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR-UNKNOWN:CAPS"/> + <keyword type="constant" name="NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION" link="NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR-NOT-ADSL-CONNECTION:CAPS"/> + <keyword type="constant" name="NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION" link="NMDeviceAdsl.html#NM-DEVICE-ADSL-ERROR-INVALID-ADSL-CONNECTION:CAPS"/> <keyword type="constant" name="NM_DEVICE_BOND_ERROR_UNKNOWN" link="NMDeviceBond.html#NM-DEVICE-BOND-ERROR-UNKNOWN:CAPS"/> <keyword type="constant" name="NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION" link="NMDeviceBond.html#NM-DEVICE-BOND-ERROR-NOT-BOND-CONNECTION:CAPS"/> <keyword type="constant" name="NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION" link="NMDeviceBond.html#NM-DEVICE-BOND-ERROR-INVALID-BOND-CONNECTION:CAPS"/> @@ -619,9 +646,31 @@ <keyword type="constant" name="NM_REMOTE_SETTINGS_ERROR_UNKNOWN" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-UNKNOWN:CAPS"/> <keyword type="constant" name="NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-CONNECTION-REMOVED:CAPS"/> <keyword type="constant" name="NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE" link="NMRemoteSettings.html#NM-REMOTE-SETTINGS-ERROR-CONNECTION-UNAVAILABLE:CAPS"/> + <keyword type="constant" name="NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED" link="NMSecretAgent.html#NM-SECRET-AGENT-ERROR-NOT-AUTHORIZED:CAPS"/> + <keyword type="constant" name="NM_SECRET_AGENT_ERROR_INVALID_CONNECTION" link="NMSecretAgent.html#NM-SECRET-AGENT-ERROR-INVALID-CONNECTION:CAPS"/> + <keyword type="constant" name="NM_SECRET_AGENT_ERROR_USER_CANCELED" link="NMSecretAgent.html#NM-SECRET-AGENT-ERROR-USER-CANCELED:CAPS"/> + <keyword type="constant" name="NM_SECRET_AGENT_ERROR_AGENT_CANCELED" link="NMSecretAgent.html#NM-SECRET-AGENT-ERROR-AGENT-CANCELED:CAPS"/> + <keyword type="constant" name="NM_SECRET_AGENT_ERROR_INTERNAL_ERROR" link="NMSecretAgent.html#NM-SECRET-AGENT-ERROR-INTERNAL-ERROR:CAPS"/> + <keyword type="constant" name="NM_SECRET_AGENT_ERROR_NO_SECRETS" link="NMSecretAgent.html#NM-SECRET-AGENT-ERROR-NO-SECRETS:CAPS"/> <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE" link="NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-NONE:CAPS"/> <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION" link="NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-ALLOW-INTERACTION:CAPS"/> <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW" link="NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-REQUEST-NEW:CAPS"/> <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED" link="NMSecretAgent.html#NM-SECRET-AGENT-GET-SECRETS-FLAG-USER-REQUESTED:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_GENERAL" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-GENERAL:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-STARTING-IN-PROGRESS:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_ALREADY_STARTED" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-ALREADY-STARTED:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-STOPPING-IN-PROGRESS:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-ALREADY-STOPPED:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_WRONG_STATE" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-WRONG-STATE:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-BAD-ARGUMENTS:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-LAUNCH-FAILED:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID" link="libnm-glib-NMVPNPlugin.html#NM-VPN-PLUGIN-ERROR-CONNECTION-INVALID:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_UI_CAPABILITY_NONE" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-NONE:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IMPORT:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-EXPORT:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_UI_CAPABILITY_IPV6" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-CAPABILITY-IPV6:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-PROP-NAME:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-PROP-DESC:CAPS"/> + <keyword type="constant" name="NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE" link="libnm-glib-NMVpnPluginUiWidget.html#NM-VPN-PLUGIN-UI-INTERFACE-PROP-SERVICE:CAPS"/> </functions> </book> diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html index 40bce23a3..ae88a436c 100644 --- a/docs/libnm-glib/html/object-tree.html +++ b/docs/libnm-glib/html/object-tree.html @@ -33,6 +33,7 @@ <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a> <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a> <a class="link" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">NMDeviceOlpcMesh</a> + <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl">NMDeviceAdsl</a> <a class="link" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband">NMDeviceInfiniband</a> <a class="link" href="NMDeviceBond.html" title="NMDeviceBond">NMDeviceBond</a> <a class="link" href="NMDeviceVlan.html" title="NMDeviceVlan">NMDeviceVlan</a> diff --git a/docs/libnm-glib/libnm-glib-docs.xml b/docs/libnm-glib/libnm-glib-docs.xml index 7f855aa0e..1b989cb67 100644 --- a/docs/libnm-glib/libnm-glib-docs.xml +++ b/docs/libnm-glib/libnm-glib-docs.xml @@ -1,28 +1,20 @@ <?xml version="1.0"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY version SYSTEM "version.xml"> +]> + <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <bookinfo> <title>libnm-glib Reference Manual</title> <releaseinfo> - for libnm-glib 0.9 + for libnm-glib &version; The latest version of this documentation can be found on-line at <ulink role="online-location" url="http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/">http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/</ulink>. </releaseinfo> - <authorgroup> - <author> - <firstname>Dan</firstname> - <surname>Williams</surname> - <affiliation> - <address> - <email>dcbw@redhat.com</email> - </address> - </affiliation> - </author> - </authorgroup> <copyright> - <year>2011</year> + <year>2012</year> <holder>The NetworkManager Authors</holder> </copyright> @@ -41,19 +33,11 @@ <address> The Free Software Foundation, Inc., - <street>59 Temple Place</street> - Suite 330, - <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>, + <street>51 Franklin Street</street> - Fifth Floor, + <city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>, <country>USA</country> </address> </para> - - <para> - Many of the names used by companies to distinguish their - products and services are claimed as trademarks. Where those - names appear in any GNOME documentation, and those trademarks - are made aware to the members of the GNOME Documentation - Project, the names have been printed in caps or initial caps. - </para> </legalnotice> </bookinfo> @@ -88,6 +72,7 @@ <xi:include href="xml/nm-device-modem.xml"/> <xi:include href="xml/nm-device-bt.xml"/> <xi:include href="xml/nm-device-wimax.xml"/> + <xi:include href="xml/nm-device-adsl.xml"/> <xi:include href="xml/nm-device-bond.xml"/> <xi:include href="xml/nm-device-infiniband.xml"/> <xi:include href="xml/nm-device-vlan.xml"/> diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt index 59d419330..ff6034513 100644 --- a/docs/libnm-glib/libnm-glib-sections.txt +++ b/docs/libnm-glib/libnm-glib-sections.txt @@ -735,8 +735,10 @@ nm_vpn_connection_get_type <FILE>nm-vpn-enum-types</FILE> <SUBSECTION Standard> NM_TYPE_VPN_PLUGIN_ERROR +NM_TYPE_VPN_PLUGIN_UI_CAPABILITY NM_TYPE_VPN_PLUGIN_UI_INTERFACE_PROP nm_vpn_plugin_error_get_type +nm_vpn_plugin_ui_capability_get_type nm_vpn_plugin_ui_interface_prop_get_type </SECTION> @@ -774,14 +776,11 @@ nm_vpn_plugin_get_type <FILE>nm-vpn-plugin-ui-interface</FILE> <TITLE>NMVpnPluginUi</TITLE> <TITLE>NMVpnPluginUiWidget</TITLE> +NMVpnPluginUiCapability NMVpnPluginUiFactory NMVpnPluginUiInterface NMVpnPluginUiInterfaceProp NMVpnPluginUiWidgetInterface -NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT -NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT -NM_VPN_PLUGIN_UI_CAPABILITY_IPV6 -NM_VPN_PLUGIN_UI_CAPABILITY_NONE NM_VPN_PLUGIN_UI_INTERFACE_DESC NM_VPN_PLUGIN_UI_INTERFACE_NAME NM_VPN_PLUGIN_UI_INTERFACE_SERVICE diff --git a/docs/libnm-glib/libnm-glib.types b/docs/libnm-glib/libnm-glib.types index 9f6419d9f..e3750af90 100644 --- a/docs/libnm-glib/libnm-glib.types +++ b/docs/libnm-glib/libnm-glib.types @@ -7,6 +7,7 @@ #include <nm-device-bt.h> #include <nm-device-wimax.h> #include <nm-device-olpc-mesh.h> +#include <nm-device-adsl.h> #include <nm-device-infiniband.h> #include <nm-device-bond.h> #include <nm-device-vlan.h> @@ -30,6 +31,7 @@ nm_device_modem_get_type nm_device_bt_get_type nm_device_wimax_get_type nm_device_olpc_mesh_get_type +nm_device_adsl_get_type nm_device_infiniband_get_type nm_device_bond_get_type nm_device_vlan_get_type diff --git a/docs/libnm-glib/tmpl/nm-device-adsl.sgml b/docs/libnm-glib/tmpl/nm-device-adsl.sgml index dc12af8ef..286f2f41e 100644 --- a/docs/libnm-glib/tmpl/nm-device-adsl.sgml +++ b/docs/libnm-glib/tmpl/nm-device-adsl.sgml @@ -27,7 +27,11 @@ NMDeviceAdsl </para> -@parent: + +<!-- ##### ARG NMDeviceAdsl:carrier ##### --> +<para> + +</para> <!-- ##### STRUCT NMDeviceAdslClass ##### --> <para> diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml index d8b747741..f4c724a87 100644 --- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml +++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml @@ -22,6 +22,16 @@ NMVpnPluginUiWidget <!-- ##### SECTION Image ##### --> +<!-- ##### ENUM NMVpnPluginUiCapability ##### --> +<para> + +</para> + +@NM_VPN_PLUGIN_UI_CAPABILITY_NONE: +@NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT: +@NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT: +@NM_VPN_PLUGIN_UI_CAPABILITY_IPV6: + <!-- ##### USER_FUNCTION NMVpnPluginUiFactory ##### --> <para> @@ -55,7 +65,6 @@ NMVpnPluginUiWidget </para> -@NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST: @NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: @NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: @NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: @@ -71,34 +80,6 @@ NMVpnPluginUiWidget @save_secrets: @changed: -<!-- ##### MACRO NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT ##### --> -<para> - -</para> - - - -<!-- ##### MACRO NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT ##### --> -<para> - -</para> - - - -<!-- ##### MACRO NM_VPN_PLUGIN_UI_CAPABILITY_IPV6 ##### --> -<para> - -</para> - - - -<!-- ##### MACRO NM_VPN_PLUGIN_UI_CAPABILITY_NONE ##### --> -<para> - -</para> - - - <!-- ##### MACRO NM_VPN_PLUGIN_UI_INTERFACE_DESC ##### --> <para> diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml new file mode 100644 index 000000000..c318497fc --- /dev/null +++ b/docs/libnm-glib/version.xml @@ -0,0 +1 @@ +0.9.6.0 diff --git a/docs/libnm-glib/version.xml.in b/docs/libnm-glib/version.xml.in new file mode 100644 index 000000000..d78bda934 --- /dev/null +++ b/docs/libnm-glib/version.xml.in @@ -0,0 +1 @@ +@VERSION@ diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am index 89a5db987..be1bdeebc 100644 --- a/docs/libnm-util/Makefile.am +++ b/docs/libnm-util/Makefile.am @@ -39,7 +39,7 @@ IGNORE_HFILES= \ HTML_IMAGES = # Extra XML files that are included by $(DOC_MAIN_SGML_FILE). -content_files = +content_files = version.xml # Other files to distribute. extra_files = @@ -50,7 +50,6 @@ extra_files = GTKDOC_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/marshallers \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) @@ -63,6 +62,8 @@ GTKDOC_LIBS = \ # include common portion ... include $(top_srcdir)/gtk-doc.make +EXTRA_DIST += version.xml.in + CLEANFILES += \ libnm-util-sections.txt \ html/* \ diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in index 2d444e76b..5890524e8 100644 --- a/docs/libnm-util/Makefile.in +++ b/docs/libnm-util/Makefile.in @@ -40,7 +40,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gtk-doc.make + $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make subdir = docs/libnm-util ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ @@ -58,7 +58,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) @@ -344,7 +344,7 @@ IGNORE_HFILES = \ HTML_IMAGES = # Extra XML files that are included by $(DOC_MAIN_SGML_FILE). -content_files = +content_files = version.xml # Other files to distribute. extra_files = @@ -354,7 +354,6 @@ extra_files = GTKDOC_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/marshallers \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) @@ -382,10 +381,9 @@ SETUP_FILES = \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt -EXTRA_DIST = \ - $(HTML_IMAGES) \ - $(SETUP_FILES) +# include common portion ... +EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ tmpl.stamp sgml.stamp html.stamp pdf.stamp @@ -402,8 +400,6 @@ REPORT_FILES = \ $(DOC_MODULE)-undeclared.txt \ $(DOC_MODULE)-unused.txt - -# include common portion ... CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \ libnm-util-sections.txt html/* tmpl/* xml/* @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = @@ -444,6 +440,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html index c1bd42e1d..9e62ec8a5 100644 --- a/docs/libnm-util/html/NMConnection.html +++ b/docs/libnm-util/html/NMConnection.html @@ -78,7 +78,7 @@ const <span class="returnvalue">char</span> * <a class="link" href="NMCon <a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> * <a class="link" href="NMConnection.html#nm-connection-get-setting" title="nm_connection_get_setting ()">nm_connection_get_setting</a> (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> setting_type</code></em>); <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="returnvalue">NMSetting8021x</span></a> * <a class="link" href="NMConnection.html#nm-connection-get-setting-802-1x" title="nm_connection_get_setting_802_1x ()">nm_connection_get_setting_802_1x</a> (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>); -<span class="returnvalue">NMSettingAdsl</span> * <a class="link" href="NMConnection.html#nm-connection-get-setting-adsl" title="nm_connection_get_setting_adsl ()">nm_connection_get_setting_adsl</a> (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>); +<a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="returnvalue">NMSettingAdsl</span></a> * <a class="link" href="NMConnection.html#nm-connection-get-setting-adsl" title="nm_connection_get_setting_adsl ()">nm_connection_get_setting_adsl</a> (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>); <a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth"><span class="returnvalue">NMSettingBluetooth</span></a> * <a class="link" href="NMConnection.html#nm-connection-get-setting-bluetooth" title="nm_connection_get_setting_bluetooth ()">nm_connection_get_setting_bluetooth</a> (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>); <a class="link" href="NMSettingBond.html" title="NMSettingBond"><span class="returnvalue">NMSettingBond</span></a> * <a class="link" href="NMConnection.html#nm-connection-get-setting-bond" title="nm_connection_get_setting_bond ()">nm_connection_get_setting_bond</a> (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>); @@ -631,9 +631,9 @@ A shortcut to return any <a class="link" href="NMSetting8021x.html" title="NMSet <hr> <div class="refsect2"> <a name="nm-connection-get-setting-adsl"></a><h3>nm_connection_get_setting_adsl ()</h3> -<pre class="programlisting"><span class="returnvalue">NMSettingAdsl</span> * nm_connection_get_setting_adsl (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre> +<pre class="programlisting"><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="returnvalue">NMSettingAdsl</span></a> * nm_connection_get_setting_adsl (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre> <p> -A shortcut to return any <span class="type">NMSettingAdsl</span> the connection might contain. +A shortcut to return any <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> the connection might contain. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -645,7 +645,7 @@ A shortcut to return any <span class="type">NMSettingAdsl</span> the connection </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>an <span class="type">NMSettingAdsl</span> if the connection contains one, otherwise NULL. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span> +<td>an <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> if the connection contains one, otherwise NULL. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span> </td> </tr> </tbody> @@ -921,7 +921,7 @@ A shortcut to return any <a class="link" href="NMSettingPPP.html" title="NMSetti <a name="nm-connection-get-setting-pppoe"></a><h3>nm_connection_get_setting_pppoe ()</h3> <pre class="programlisting"><a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="returnvalue">NMSettingPPPOE</span></a> * nm_connection_get_setting_pppoe (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre> <p> -A shortcut to return any <span class="type">NMSettingPPOE</span> the connection might contain. +A shortcut to return any <a class="link" href="NMSettingPPPOE.html" title="NMSettingPPPOE"><span class="type">NMSettingPPPOE</span></a> the connection might contain. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html index cccfd00b2..8a8b2b8ce 100644 --- a/docs/libnm-util/html/NMSetting.html +++ b/docs/libnm-util/html/NMSetting.html @@ -113,7 +113,7 @@ const <span class="returnvalue">char</span> * <a class="link" href="NMSet <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----NMSetting +----<a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a> - +----NMSettingAdsl + +----<a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> +----<a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth">NMSettingBluetooth</a> +----<a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a> +----<a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a> diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html index ba179c4ab..a81f903d9 100644 --- a/docs/libnm-util/html/NMSetting8021x.html +++ b/docs/libnm-util/html/NMSetting8021x.html @@ -6,7 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="libnm-util Reference Manual"> <link rel="up" href="ch01.html" title="libnm-util API Reference"> -<link rel="prev" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"> +<link rel="prev" href="NMSettingAdsl.html" title="NMSettingAdsl"> <link rel="next" href="NMSettingIP4Config.html" title="NMSettingIP4Config"> <meta name="generator" content="GTK-Doc V1.18 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> @@ -14,7 +14,7 @@ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"> <tr valign="middle"> -<td><a accesskey="p" href="NMSettingOlpcMesh.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> +<td><a accesskey="p" href="NMSettingAdsl.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> <td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td> <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> <th width="100%" align="center">libnm-util Reference Manual</th> diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html new file mode 100644 index 000000000..c7289a0ae --- /dev/null +++ b/docs/libnm-util/html/NMSettingAdsl.html @@ -0,0 +1,511 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>NMSettingAdsl</title> +<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> +<link rel="home" href="index.html" title="libnm-util Reference Manual"> +<link rel="up" href="ch01.html" title="libnm-util API Reference"> +<link rel="prev" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"> +<link rel="next" href="NMSetting8021x.html" title="NMSetting8021x"> +<meta name="generator" content="GTK-Doc V1.18 (XML mode)"> +<link rel="stylesheet" href="style.css" type="text/css"> +</head> +<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> +<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"> +<tr valign="middle"> +<td><a accesskey="p" href="NMSettingOlpcMesh.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> +<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td> +<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> +<th width="100%" align="center">libnm-util Reference Manual</th> +<td><a accesskey="n" href="NMSetting8021x.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> +</tr> +<tr><td colspan="5" class="shortcuts"> +<a href="#NMSettingAdsl.synopsis" class="shortcut">Top</a> +  | + <a href="#NMSettingAdsl.description" class="shortcut">Description</a> +  | + <a href="#NMSettingAdsl.object-hierarchy" class="shortcut">Object Hierarchy</a> +  | + <a href="#NMSettingAdsl.properties" class="shortcut">Properties</a> +</td></tr> +</table> +<div class="refentry"> +<a name="NMSettingAdsl"></a><div class="titlepage"></div> +<div class="refnamediv"><table width="100%"><tr> +<td valign="top"> +<h2><span class="refentrytitle"><a name="NMSettingAdsl.top_of_page"></a>NMSettingAdsl</span></h2> +<p>NMSettingAdsl — Describes ADSL-based properties</p> +</td> +<td valign="top" align="right"></td> +</tr></table></div> +<div class="refsynopsisdiv"> +<a name="NMSettingAdsl.synopsis"></a><h2>Synopsis</h2> +<a name="NMSettingAdslError"></a><pre class="synopsis"> +#include <nm-setting-adsl.h> + + <a class="link" href="NMSettingAdsl.html#NMSettingAdsl-struct" title="NMSettingAdsl">NMSettingAdsl</a>; + <a class="link" href="NMSettingAdsl.html#NMSettingAdslClass" title="NMSettingAdslClass">NMSettingAdslClass</a>; +enum <a class="link" href="NMSettingAdsl.html#NMSettingAdslError-enum" title="enum NMSettingAdslError">NMSettingAdslError</a>; +#define <a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION:CAPS" title="NM_SETTING_ADSL_ENCAPSULATION">NM_SETTING_ADSL_ENCAPSULATION</a> +#define <a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION-LLC:CAPS" title="NM_SETTING_ADSL_ENCAPSULATION_LLC">NM_SETTING_ADSL_ENCAPSULATION_LLC</a> +#define <a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION-VCMUX:CAPS" title="NM_SETTING_ADSL_ENCAPSULATION_VCMUX">NM_SETTING_ADSL_ENCAPSULATION_VCMUX</a> +#define <a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-ERROR:CAPS" title="NM_SETTING_ADSL_ERROR">NM_SETTING_ADSL_ERROR</a> +#define <a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-PASSWORD:CAPS" title="NM_SETTING_ADSL_PASSWORD">NM_SETTING_ADSL_PASSWORD</a> +#define <a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-PASSWORD-FLAGS:CAPS" title="NM_SETTING_ADSL_PASSWORD_FLAGS">NM_SETTING_ADSL_PASSWORD_FLAGS</a> +#define <a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL:CAPS" title="NM_SETTING_ADSL_PROTOCOL">NM_SETTING_ADSL_PROTOCOL</a> +#define <a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL-IPOATM:CAPS" title="NM_SETTING_ADSL_PROTOCOL_IPOATM">NM_SETTING_ADSL_PROTOCOL_IPOATM</a> +#define <a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL-PPPOA:CAPS" title="NM_SETTING_ADSL_PROTOCOL_PPPOA">NM_SETTING_ADSL_PROTOCOL_PPPOA</a> +#define <a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL-PPPOE:CAPS" title="NM_SETTING_ADSL_PROTOCOL_PPPOE">NM_SETTING_ADSL_PROTOCOL_PPPOE</a> +#define <a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-SETTING-NAME:CAPS" title="NM_SETTING_ADSL_SETTING_NAME">NM_SETTING_ADSL_SETTING_NAME</a> +#define <a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-USERNAME:CAPS" title="NM_SETTING_ADSL_USERNAME">NM_SETTING_ADSL_USERNAME</a> +#define <a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-VCI:CAPS" title="NM_SETTING_ADSL_VCI">NM_SETTING_ADSL_VCI</a> +#define <a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-VPI:CAPS" title="NM_SETTING_ADSL_VPI">NM_SETTING_ADSL_VPI</a> +<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> <a class="link" href="NMSettingAdsl.html#nm-setting-adsl-error-quark" title="nm_setting_adsl_error_quark ()">nm_setting_adsl_error_quark</a> (<em class="parameter"><code><span class="type">void</span></code></em>); +const <span class="returnvalue">char</span> * <a class="link" href="NMSettingAdsl.html#nm-setting-adsl-get-encapsulation" title="nm_setting_adsl_get_encapsulation ()">nm_setting_adsl_get_encapsulation</a> (<em class="parameter"><code><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> *setting</code></em>); +const <span class="returnvalue">char</span> * <a class="link" href="NMSettingAdsl.html#nm-setting-adsl-get-password" title="nm_setting_adsl_get_password ()">nm_setting_adsl_get_password</a> (<em class="parameter"><code><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> *setting</code></em>); +<a class="link" href="NMSetting.html#NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a> <a class="link" href="NMSettingAdsl.html#nm-setting-adsl-get-password-flags" title="nm_setting_adsl_get_password_flags ()">nm_setting_adsl_get_password_flags</a> (<em class="parameter"><code><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> *setting</code></em>); +const <span class="returnvalue">char</span> * <a class="link" href="NMSettingAdsl.html#nm-setting-adsl-get-protocol" title="nm_setting_adsl_get_protocol ()">nm_setting_adsl_get_protocol</a> (<em class="parameter"><code><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> *setting</code></em>); +const <span class="returnvalue">char</span> * <a class="link" href="NMSettingAdsl.html#nm-setting-adsl-get-username" title="nm_setting_adsl_get_username ()">nm_setting_adsl_get_username</a> (<em class="parameter"><code><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> *setting</code></em>); +<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a> <a class="link" href="NMSettingAdsl.html#nm-setting-adsl-get-vci" title="nm_setting_adsl_get_vci ()">nm_setting_adsl_get_vci</a> (<em class="parameter"><code><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> *setting</code></em>); +<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a> <a class="link" href="NMSettingAdsl.html#nm-setting-adsl-get-vpi" title="nm_setting_adsl_get_vpi ()">nm_setting_adsl_get_vpi</a> (<em class="parameter"><code><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> *setting</code></em>); +<a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> * <a class="link" href="NMSettingAdsl.html#nm-setting-adsl-new" title="nm_setting_adsl_new ()">nm_setting_adsl_new</a> (<em class="parameter"><code><span class="type">void</span></code></em>); +</pre> +</div> +<div class="refsect1"> +<a name="NMSettingAdsl.object-hierarchy"></a><h2>Object Hierarchy</h2> +<pre class="synopsis"> + <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> + +----<a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a> + +----NMSettingAdsl +</pre> +<pre class="synopsis"> + GEnum + +----NMSettingAdslError +</pre> +</div> +<div class="refsect1"> +<a name="NMSettingAdsl.properties"></a><h2>Properties</h2> +<pre class="synopsis"> + "<a class="link" href="NMSettingAdsl.html#NMSettingAdsl--encapsulation" title='The "encapsulation" property'>encapsulation</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write + "<a class="link" href="NMSettingAdsl.html#NMSettingAdsl--password" title='The "password" property'>password</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write + "<a class="link" href="NMSettingAdsl.html#NMSettingAdsl--password-flags" title='The "password-flags" property'>password-flags</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write + "<a class="link" href="NMSettingAdsl.html#NMSettingAdsl--protocol" title='The "protocol" property'>protocol</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write + "<a class="link" href="NMSettingAdsl.html#NMSettingAdsl--username" title='The "username" property'>username</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write + "<a class="link" href="NMSettingAdsl.html#NMSettingAdsl--vci" title='The "vci" property'>vci</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write + "<a class="link" href="NMSettingAdsl.html#NMSettingAdsl--vpi" title='The "vpi" property'>vpi</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write +</pre> +</div> +<div class="refsect1"> +<a name="NMSettingAdsl.description"></a><h2>Description</h2> +<p> +The <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes +properties of ADSL connections. +</p> +</div> +<div class="refsect1"> +<a name="NMSettingAdsl.details"></a><h2>Details</h2> +<div class="refsect2"> +<a name="NMSettingAdsl-struct"></a><h3>NMSettingAdsl</h3> +<pre class="programlisting">typedef struct _NMSettingAdsl NMSettingAdsl;</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NMSettingAdslClass"></a><h3>NMSettingAdslClass</h3> +<pre class="programlisting">typedef struct { + NMSettingClass parent; + + /* Padding for future expansion */ + void (*_reserved1) (void); + void (*_reserved2) (void); + void (*_reserved3) (void); + void (*_reserved4) (void); +} NMSettingAdslClass; +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NMSettingAdslError-enum"></a><h3>enum NMSettingAdslError</h3> +<pre class="programlisting">typedef enum { + NM_SETTING_ADSL_ERROR_UNKNOWN = 0, /*< nick=UnknownError >*/ + NM_SETTING_ADSL_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/ + NM_SETTING_ADSL_ERROR_MISSING_PROPERTY /*< nick=MissingProperty >*/ +} NMSettingAdslError; +</pre> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><a name="NM-SETTING-ADSL-ERROR-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_SETTING_ADSL_ERROR_UNKNOWN</code></span></p></td> +<td>unknown or unclassified error +</td> +</tr> +<tr> +<td><p><a name="NM-SETTING-ADSL-ERROR-INVALID-PROPERTY:CAPS"></a><span class="term"><code class="literal">NM_SETTING_ADSL_ERROR_INVALID_PROPERTY</code></span></p></td> +<td>the property was invalid +</td> +</tr> +<tr> +<td><p><a name="NM-SETTING-ADSL-ERROR-MISSING-PROPERTY:CAPS"></a><span class="term"><code class="literal">NM_SETTING_ADSL_ERROR_MISSING_PROPERTY</code></span></p></td> +<td>the property was missing and is +required +</td> +</tr> +</tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> +<a name="NM-SETTING-ADSL-ENCAPSULATION:CAPS"></a><h3>NM_SETTING_ADSL_ENCAPSULATION</h3> +<pre class="programlisting">#define NM_SETTING_ADSL_ENCAPSULATION "encapsulation" +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NM-SETTING-ADSL-ENCAPSULATION-LLC:CAPS"></a><h3>NM_SETTING_ADSL_ENCAPSULATION_LLC</h3> +<pre class="programlisting">#define NM_SETTING_ADSL_ENCAPSULATION_LLC "llc" +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NM-SETTING-ADSL-ENCAPSULATION-VCMUX:CAPS"></a><h3>NM_SETTING_ADSL_ENCAPSULATION_VCMUX</h3> +<pre class="programlisting">#define NM_SETTING_ADSL_ENCAPSULATION_VCMUX "vcmux" +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NM-SETTING-ADSL-ERROR:CAPS"></a><h3>NM_SETTING_ADSL_ERROR</h3> +<pre class="programlisting">#define NM_SETTING_ADSL_ERROR nm_setting_adsl_error_quark () +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NM-SETTING-ADSL-PASSWORD:CAPS"></a><h3>NM_SETTING_ADSL_PASSWORD</h3> +<pre class="programlisting">#define NM_SETTING_ADSL_PASSWORD "password" +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NM-SETTING-ADSL-PASSWORD-FLAGS:CAPS"></a><h3>NM_SETTING_ADSL_PASSWORD_FLAGS</h3> +<pre class="programlisting">#define NM_SETTING_ADSL_PASSWORD_FLAGS "password-flags" +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NM-SETTING-ADSL-PROTOCOL:CAPS"></a><h3>NM_SETTING_ADSL_PROTOCOL</h3> +<pre class="programlisting">#define NM_SETTING_ADSL_PROTOCOL "protocol" +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NM-SETTING-ADSL-PROTOCOL-IPOATM:CAPS"></a><h3>NM_SETTING_ADSL_PROTOCOL_IPOATM</h3> +<pre class="programlisting">#define NM_SETTING_ADSL_PROTOCOL_IPOATM "ipoatm" +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NM-SETTING-ADSL-PROTOCOL-PPPOA:CAPS"></a><h3>NM_SETTING_ADSL_PROTOCOL_PPPOA</h3> +<pre class="programlisting">#define NM_SETTING_ADSL_PROTOCOL_PPPOA "pppoa" +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NM-SETTING-ADSL-PROTOCOL-PPPOE:CAPS"></a><h3>NM_SETTING_ADSL_PROTOCOL_PPPOE</h3> +<pre class="programlisting">#define NM_SETTING_ADSL_PROTOCOL_PPPOE "pppoe" +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NM-SETTING-ADSL-SETTING-NAME:CAPS"></a><h3>NM_SETTING_ADSL_SETTING_NAME</h3> +<pre class="programlisting">#define NM_SETTING_ADSL_SETTING_NAME "adsl" +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NM-SETTING-ADSL-USERNAME:CAPS"></a><h3>NM_SETTING_ADSL_USERNAME</h3> +<pre class="programlisting">#define NM_SETTING_ADSL_USERNAME "username" +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NM-SETTING-ADSL-VCI:CAPS"></a><h3>NM_SETTING_ADSL_VCI</h3> +<pre class="programlisting">#define NM_SETTING_ADSL_VCI "vci" +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="NM-SETTING-ADSL-VPI:CAPS"></a><h3>NM_SETTING_ADSL_VPI</h3> +<pre class="programlisting">#define NM_SETTING_ADSL_VPI "vpi" +</pre> +<p> +</p> +</div> +<hr> +<div class="refsect2"> +<a name="nm-setting-adsl-error-quark"></a><h3>nm_setting_adsl_error_quark ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> nm_setting_adsl_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> +<p> +Registers an error quark for <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> if necessary. +</p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody><tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td>the error quark used for <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> errors.</td> +</tr></tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> +<a name="nm-setting-adsl-get-encapsulation"></a><h3>nm_setting_adsl_get_encapsulation ()</h3> +<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_adsl_get_encapsulation (<em class="parameter"><code><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> *setting</code></em>);</pre> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td> +<td>the <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> +</td> +</tr> +<tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td>the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--encapsulation" title='The "encapsulation" property'><span class="type">"encapsulation"</span></a> property of the setting</td> +</tr> +</tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> +<a name="nm-setting-adsl-get-password"></a><h3>nm_setting_adsl_get_password ()</h3> +<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_adsl_get_password (<em class="parameter"><code><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> *setting</code></em>);</pre> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td> +<td>the <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> +</td> +</tr> +<tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td>the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--password" title='The "password" property'><span class="type">"password"</span></a> property of the setting</td> +</tr> +</tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> +<a name="nm-setting-adsl-get-password-flags"></a><h3>nm_setting_adsl_get_password_flags ()</h3> +<pre class="programlisting"><a class="link" href="NMSetting.html#NMSettingSecretFlags"><span class="returnvalue">NMSettingSecretFlags</span></a> nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> *setting</code></em>);</pre> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td> +<td>the <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> +</td> +</tr> +<tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td>the <a class="link" href="NMSetting.html#NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> pertaining to the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--password" title='The "password" property'><span class="type">"password"</span></a> +</td> +</tr> +</tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> +<a name="nm-setting-adsl-get-protocol"></a><h3>nm_setting_adsl_get_protocol ()</h3> +<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_adsl_get_protocol (<em class="parameter"><code><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> *setting</code></em>);</pre> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td> +<td>the <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> +</td> +</tr> +<tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td>the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--protocol" title='The "protocol" property'><span class="type">"protocol"</span></a> property of the setting</td> +</tr> +</tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> +<a name="nm-setting-adsl-get-username"></a><h3>nm_setting_adsl_get_username ()</h3> +<pre class="programlisting">const <span class="returnvalue">char</span> * nm_setting_adsl_get_username (<em class="parameter"><code><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> *setting</code></em>);</pre> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td> +<td>the <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> +</td> +</tr> +<tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td>the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--username" title='The "username" property'><span class="type">"username"</span></a> property of the setting</td> +</tr> +</tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> +<a name="nm-setting-adsl-get-vci"></a><h3>nm_setting_adsl_get_vci ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a> nm_setting_adsl_get_vci (<em class="parameter"><code><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> *setting</code></em>);</pre> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td> +<td>the <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> +</td> +</tr> +<tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td>the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--vci" title='The "vci" property'><span class="type">"vci"</span></a> property of the setting</td> +</tr> +</tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> +<a name="nm-setting-adsl-get-vpi"></a><h3>nm_setting_adsl_get_vpi ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a> nm_setting_adsl_get_vpi (<em class="parameter"><code><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> *setting</code></em>);</pre> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>setting</code></em> :</span></p></td> +<td>the <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> +</td> +</tr> +<tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td>the <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--vpi" title='The "vpi" property'><span class="type">"vpi"</span></a> property of the setting</td> +</tr> +</tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> +<a name="nm-setting-adsl-new"></a><h3>nm_setting_adsl_new ()</h3> +<pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> * nm_setting_adsl_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> +<p> +Creates a new <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> object with default values. +</p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody><tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td>the new empty <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> object</td> +</tr></tbody> +</table></div> +</div> +</div> +<div class="refsect1"> +<a name="NMSettingAdsl.property-details"></a><h2>Property Details</h2> +<div class="refsect2"> +<a name="NMSettingAdsl--encapsulation"></a><h3>The <code class="literal">"encapsulation"</code> property</h3> +<pre class="programlisting"> "encapsulation" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre> +<p> +ADSL connection encapsulation, can be vcmux or llc. +</p> +<p>Default value: NULL</p> +</div> +<hr> +<div class="refsect2"> +<a name="NMSettingAdsl--password"></a><h3>The <code class="literal">"password"</code> property</h3> +<pre class="programlisting"> "password" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre> +<p> +Password used to authenticate with the ADSL service. +</p> +<p>Default value: NULL</p> +</div> +<hr> +<div class="refsect2"> +<a name="NMSettingAdsl--password-flags"></a><h3>The <code class="literal">"password-flags"</code> property</h3> +<pre class="programlisting"> "password-flags" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write</pre> +<p> +Flags indicating how to handle <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--password" title='The "password" property'><span class="type">"password"</span></a>:. +</p> +<p>Allowed values: <= 7</p> +<p>Default value: 0</p> +</div> +<hr> +<div class="refsect2"> +<a name="NMSettingAdsl--protocol"></a><h3>The <code class="literal">"protocol"</code> property</h3> +<pre class="programlisting"> "protocol" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre> +<p> +ADSL connection protocol, can be pppoa, pppoe or ipoatm. +</p> +<p>Default value: NULL</p> +</div> +<hr> +<div class="refsect2"> +<a name="NMSettingAdsl--username"></a><h3>The <code class="literal">"username"</code> property</h3> +<pre class="programlisting"> "username" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre> +<p> +Username used to authenticate with the ADSL service. +</p> +<p>Default value: NULL</p> +</div> +<hr> +<div class="refsect2"> +<a name="NMSettingAdsl--vci"></a><h3>The <code class="literal">"vci"</code> property</h3> +<pre class="programlisting"> "vci" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write</pre> +<p> +ADSL connection vci. +</p> +<p>Allowed values: <= 65536</p> +<p>Default value: 0</p> +</div> +<hr> +<div class="refsect2"> +<a name="NMSettingAdsl--vpi"></a><h3>The <code class="literal">"vpi"</code> property</h3> +<pre class="programlisting"> "vpi" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write</pre> +<p> +ADSL connection vpi. +</p> +<p>Allowed values: <= 65536</p> +<p>Default value: 0</p> +</div> +</div> +</div> +<div class="footer"> +<hr> + Generated by GTK-Doc V1.18</div> +</body> +</html>
\ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html index 53ee169c3..fe2fa0955 100644 --- a/docs/libnm-util/html/NMSettingOlpcMesh.html +++ b/docs/libnm-util/html/NMSettingOlpcMesh.html @@ -7,7 +7,7 @@ <link rel="home" href="index.html" title="libnm-util Reference Manual"> <link rel="up" href="ch01.html" title="libnm-util API Reference"> <link rel="prev" href="NMSettingVlan.html" title="NMSettingVlan"> -<link rel="next" href="NMSetting8021x.html" title="NMSetting8021x"> +<link rel="next" href="NMSettingAdsl.html" title="NMSettingAdsl"> <meta name="generator" content="GTK-Doc V1.18 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> @@ -18,7 +18,7 @@ <td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td> <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> <th width="100%" align="center">libnm-util Reference Manual</th> -<td><a accesskey="n" href="NMSetting8021x.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> +<td><a accesskey="n" href="NMSettingAdsl.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> <tr><td colspan="5" class="shortcuts"> <a href="#NMSettingOlpcMesh.synopsis" class="shortcut">Top</a> @@ -115,8 +115,27 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Byte-Arrays.htm NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY /*< nick=MissingProperty >*/ } NMSettingOlpcMeshError; </pre> -<p> -</p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><a name="NM-SETTING-OLPC-MESH-ERROR-UNKNOWN:CAPS"></a><span class="term"><code class="literal">NM_SETTING_OLPC_MESH_ERROR_UNKNOWN</code></span></p></td> +<td>unknown or unclassified error +</td> +</tr> +<tr> +<td><p><a name="NM-SETTING-OLPC-MESH-ERROR-INVALID-PROPERTY:CAPS"></a><span class="term"><code class="literal">NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY</code></span></p></td> +<td>the property was invalid +</td> +</tr> +<tr> +<td><p><a name="NM-SETTING-OLPC-MESH-ERROR-MISSING-PROPERTY:CAPS"></a><span class="term"><code class="literal">NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY</code></span></p></td> +<td>the property was missing and is +required +</td> +</tr> +</tbody> +</table></div> </div> <hr> <div class="refsect2"> diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html index cc50161ea..013c31f1c 100644 --- a/docs/libnm-util/html/NMSettingVlan.html +++ b/docs/libnm-util/html/NMSettingVlan.html @@ -681,8 +681,7 @@ If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the <a class="link" href="NMSettingVlan.html#NMSettingVlan--id" title='The "id" property'><span class="type">"id"</span></a> , ex 'eth2.1'. The parent interface may be given by the <a class="link" href="NMSettingVlan.html#NMSettingVlan--parent" title='The "parent" property'><span class="type">"parent"</span></a> property or by a -hardware address property, eg <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title='The "mac-address" property'><span class="type">"mac-address"</span></a> or -<a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband--mac-address" title='The "mac-address" property'><span class="type">"mac-address"</span></a>. +hardware address property, eg <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title='The "mac-address" property'><span class="type">"mac-address"</span></a>. </p> <p>Default value: NULL</p> </div> @@ -694,8 +693,7 @@ hardware address property, eg <a class="link" href="NMSettingWired.html#NMSettin If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created. If this property is not specified, the connection must contain a hardware address in a -hardware-specific setting, like <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title='The "mac-address" property'><span class="type">"mac-address"</span></a> or -<a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband--mac-address" title='The "mac-address" property'><span class="type">"mac-address"</span></a>. +hardware-specific setting, like <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title='The "mac-address" property'><span class="type">"mac-address"</span></a>. </p> <p>Default value: NULL</p> </div> diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html index 053cb3320..2e5d124d0 100644 --- a/docs/libnm-util/html/api-index-full.html +++ b/docs/libnm-util/html/api-index-full.html @@ -621,43 +621,43 @@ </dt> <dd></dd> <dt> -NMSettingAdsl, struct in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NMSettingAdsl-struct" title="NMSettingAdsl">NMSettingAdsl</a>, struct in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NMSettingAdsl:encapsulation, object property in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NMSettingAdsl--encapsulation" title='The "encapsulation" property'>NMSettingAdsl:encapsulation</a>, object property in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NMSettingAdsl:password, object property in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NMSettingAdsl--password" title='The "password" property'>NMSettingAdsl:password</a>, object property in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NMSettingAdsl:password-flags, object property in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NMSettingAdsl--password-flags" title='The "password-flags" property'>NMSettingAdsl:password-flags</a>, object property in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NMSettingAdsl:protocol, object property in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NMSettingAdsl--protocol" title='The "protocol" property'>NMSettingAdsl:protocol</a>, object property in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NMSettingAdsl:username, object property in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NMSettingAdsl--username" title='The "username" property'>NMSettingAdsl:username</a>, object property in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NMSettingAdsl:vci, object property in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NMSettingAdsl--vci" title='The "vci" property'>NMSettingAdsl:vci</a>, object property in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NMSettingAdsl:vpi, object property in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NMSettingAdsl--vpi" title='The "vpi" property'>NMSettingAdsl:vpi</a>, object property in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NMSettingAdslClass, struct in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NMSettingAdslClass" title="NMSettingAdslClass">NMSettingAdslClass</a>, struct in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NMSettingAdslError, enum in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NMSettingAdslError-enum" title="enum NMSettingAdslError">NMSettingAdslError</a>, enum in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> @@ -1873,95 +1873,95 @@ NMSettingAdslError, enum in NMSettingAdsl </dt> <dd></dd> <dt> -NM_SETTING_ADSL_ENCAPSULATION, macro in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION:CAPS" title="NM_SETTING_ADSL_ENCAPSULATION">NM_SETTING_ADSL_ENCAPSULATION</a>, macro in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NM_SETTING_ADSL_ENCAPSULATION_LLC, macro in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION-LLC:CAPS" title="NM_SETTING_ADSL_ENCAPSULATION_LLC">NM_SETTING_ADSL_ENCAPSULATION_LLC</a>, macro in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NM_SETTING_ADSL_ENCAPSULATION_VCMUX, macro in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION-VCMUX:CAPS" title="NM_SETTING_ADSL_ENCAPSULATION_VCMUX">NM_SETTING_ADSL_ENCAPSULATION_VCMUX</a>, macro in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NM_SETTING_ADSL_ERROR, macro in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-ERROR:CAPS" title="NM_SETTING_ADSL_ERROR">NM_SETTING_ADSL_ERROR</a>, macro in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -nm_setting_adsl_error_quark, function in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#nm-setting-adsl-error-quark" title="nm_setting_adsl_error_quark ()">nm_setting_adsl_error_quark</a>, function in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -nm_setting_adsl_get_encapsulation, function in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#nm-setting-adsl-get-encapsulation" title="nm_setting_adsl_get_encapsulation ()">nm_setting_adsl_get_encapsulation</a>, function in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -nm_setting_adsl_get_password, function in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#nm-setting-adsl-get-password" title="nm_setting_adsl_get_password ()">nm_setting_adsl_get_password</a>, function in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -nm_setting_adsl_get_password_flags, function in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#nm-setting-adsl-get-password-flags" title="nm_setting_adsl_get_password_flags ()">nm_setting_adsl_get_password_flags</a>, function in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -nm_setting_adsl_get_protocol, function in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#nm-setting-adsl-get-protocol" title="nm_setting_adsl_get_protocol ()">nm_setting_adsl_get_protocol</a>, function in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -nm_setting_adsl_get_username, function in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#nm-setting-adsl-get-username" title="nm_setting_adsl_get_username ()">nm_setting_adsl_get_username</a>, function in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -nm_setting_adsl_get_vci, function in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#nm-setting-adsl-get-vci" title="nm_setting_adsl_get_vci ()">nm_setting_adsl_get_vci</a>, function in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -nm_setting_adsl_get_vpi, function in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#nm-setting-adsl-get-vpi" title="nm_setting_adsl_get_vpi ()">nm_setting_adsl_get_vpi</a>, function in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -nm_setting_adsl_new, function in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#nm-setting-adsl-new" title="nm_setting_adsl_new ()">nm_setting_adsl_new</a>, function in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NM_SETTING_ADSL_PASSWORD, macro in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-PASSWORD:CAPS" title="NM_SETTING_ADSL_PASSWORD">NM_SETTING_ADSL_PASSWORD</a>, macro in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NM_SETTING_ADSL_PASSWORD_FLAGS, macro in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-PASSWORD-FLAGS:CAPS" title="NM_SETTING_ADSL_PASSWORD_FLAGS">NM_SETTING_ADSL_PASSWORD_FLAGS</a>, macro in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NM_SETTING_ADSL_PROTOCOL, macro in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL:CAPS" title="NM_SETTING_ADSL_PROTOCOL">NM_SETTING_ADSL_PROTOCOL</a>, macro in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NM_SETTING_ADSL_PROTOCOL_IPOATM, macro in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL-IPOATM:CAPS" title="NM_SETTING_ADSL_PROTOCOL_IPOATM">NM_SETTING_ADSL_PROTOCOL_IPOATM</a>, macro in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NM_SETTING_ADSL_PROTOCOL_PPPOA, macro in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL-PPPOA:CAPS" title="NM_SETTING_ADSL_PROTOCOL_PPPOA">NM_SETTING_ADSL_PROTOCOL_PPPOA</a>, macro in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NM_SETTING_ADSL_PROTOCOL_PPPOE, macro in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL-PPPOE:CAPS" title="NM_SETTING_ADSL_PROTOCOL_PPPOE">NM_SETTING_ADSL_PROTOCOL_PPPOE</a>, macro in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NM_SETTING_ADSL_SETTING_NAME, macro in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-SETTING-NAME:CAPS" title="NM_SETTING_ADSL_SETTING_NAME">NM_SETTING_ADSL_SETTING_NAME</a>, macro in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NM_SETTING_ADSL_USERNAME, macro in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-USERNAME:CAPS" title="NM_SETTING_ADSL_USERNAME">NM_SETTING_ADSL_USERNAME</a>, macro in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NM_SETTING_ADSL_VCI, macro in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-VCI:CAPS" title="NM_SETTING_ADSL_VCI">NM_SETTING_ADSL_VCI</a>, macro in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> -NM_SETTING_ADSL_VPI, macro in NMSettingAdsl +<a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-VPI:CAPS" title="NM_SETTING_ADSL_VPI">NM_SETTING_ADSL_VPI</a>, macro in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> </dt> <dd></dd> <dt> diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html index 39768bae6..6f1e37fe0 100644 --- a/docs/libnm-util/html/ch01.html +++ b/docs/libnm-util/html/ch01.html @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id397030"></a>libnm-util API Reference</h2></div></div></div> +<a name="id527380"></a>libnm-util API Reference</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="NMConnection.html">NMConnection</a></span><span class="refpurpose"> — Describes a connection to specific network or provider</span> @@ -71,6 +71,9 @@ serial communications</span> <span class="refentrytitle"><a href="NMSettingOlpcMesh.html">NMSettingOlpcMesh</a></span><span class="refpurpose"></span> </dt> <dt> +<span class="refentrytitle"><a href="NMSettingAdsl.html">NMSettingAdsl</a></span><span class="refpurpose"> — Describes ADSL-based properties</span> +</dt> +<dt> <span class="refentrytitle"><a href="NMSetting8021x.html">NMSetting8021x</a></span><span class="refpurpose"> — Describes 802.1x-authenticated connection properties</span> </dt> <dt> diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html index dea375f60..a97eb48a5 100644 --- a/docs/libnm-util/html/index.html +++ b/docs/libnm-util/html/index.html @@ -15,10 +15,34 @@ <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 + for libnm-util 0.9.6.0 + 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>. </p></div> +<div><p class="copyright">Copyright © 2012 The NetworkManager Authors</p></div> +<div><div class="legalnotice"> +<a name="id516501"></a><p> + Permission is granted to copy, distribute and/or modify this + document under the terms of the <em class="citetitle">GNU Free + Documentation License</em>, Version 1.1 or any later + version published by the Free Software Foundation with no + Invariant Sections, no Front-Cover Texts, and no Back-Cover + Texts. You may obtain a copy of the <em class="citetitle">GNU Free + Documentation License</em> from the Free Software + Foundation by visiting <a class="ulink" href="http://www.fsf.org" target="_top">their Web site</a> or by writing + to: + + </p> +<div class="address"><p><br> +   The Free Software Foundation, Inc.,<br> +   <span class="street">51 Franklin Street</span> - Fifth Floor,<br> +   <span class="city">Boston</span>, <span class="state">MA</span> <span class="postcode">02110-1301</span>,<br> +   <span class="country">USA</span><br> + </p></div> +<p> + </p> +</div></div> </div> <hr> </div> @@ -73,6 +97,9 @@ serial communications</span> <span class="refentrytitle"><a href="NMSettingOlpcMesh.html">NMSettingOlpcMesh</a></span><span class="refpurpose"></span> </dt> <dt> +<span class="refentrytitle"><a href="NMSettingAdsl.html">NMSettingAdsl</a></span><span class="refpurpose"> — Describes ADSL-based properties</span> +</dt> +<dt> <span class="refentrytitle"><a href="NMSetting8021x.html">NMSetting8021x</a></span><span class="refpurpose"> — Describes 802.1x-authenticated connection properties</span> </dt> <dt> diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml index e8f2d4ea5..2fa04eafc 100644 --- a/docs/libnm-util/html/index.sgml +++ b/docs/libnm-util/html/index.sgml @@ -716,6 +716,9 @@ <ANCHOR id="NMSettingOlpcMesh-struct" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh-struct"> <ANCHOR id="NMSettingOlpcMeshClass" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMeshClass"> <ANCHOR id="NMSettingOlpcMeshError-enum" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMeshError-enum"> +<ANCHOR id="NM-SETTING-OLPC-MESH-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR-UNKNOWN:CAPS"> +<ANCHOR id="NM-SETTING-OLPC-MESH-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR-INVALID-PROPERTY:CAPS"> +<ANCHOR id="NM-SETTING-OLPC-MESH-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR-MISSING-PROPERTY:CAPS"> <ANCHOR id="NM-SETTING-OLPC-MESH-CHANNEL:CAPS" href="libnm-util/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-CHANNEL:CAPS"> <ANCHOR id="NM-SETTING-OLPC-MESH-DHCP-ANYCAST-ADDRESS:CAPS" href="libnm-util/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-DHCP-ANYCAST-ADDRESS:CAPS"> <ANCHOR id="NM-SETTING-OLPC-MESH-ERROR:CAPS" href="libnm-util/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR:CAPS"> @@ -730,6 +733,50 @@ <ANCHOR id="NMSettingOlpcMesh--channel" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh--channel"> <ANCHOR id="NMSettingOlpcMesh--dhcp-anycast-address" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh--dhcp-anycast-address"> <ANCHOR id="NMSettingOlpcMesh--ssid" href="libnm-util/NMSettingOlpcMesh.html#NMSettingOlpcMesh--ssid"> +<ANCHOR id="NMSettingAdsl" href="libnm-util/NMSettingAdsl.html"> +<ANCHOR id="NMSettingAdsl.synopsis" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl.synopsis"> +<ANCHOR id="NMSettingAdslError" href="libnm-util/NMSettingAdsl.html#NMSettingAdslError"> +<ANCHOR id="NMSettingAdsl.object-hierarchy" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl.object-hierarchy"> +<ANCHOR id="NMSettingAdsl.properties" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl.properties"> +<ANCHOR id="NMSettingAdsl.description" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl.description"> +<ANCHOR id="NMSettingAdsl.details" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl.details"> +<ANCHOR id="NMSettingAdsl-struct" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl-struct"> +<ANCHOR id="NMSettingAdslClass" href="libnm-util/NMSettingAdsl.html#NMSettingAdslClass"> +<ANCHOR id="NMSettingAdslError-enum" href="libnm-util/NMSettingAdsl.html#NMSettingAdslError-enum"> +<ANCHOR id="NM-SETTING-ADSL-ERROR-UNKNOWN:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-ERROR-UNKNOWN:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-ERROR-INVALID-PROPERTY:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-ERROR-INVALID-PROPERTY:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-ERROR-MISSING-PROPERTY:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-ERROR-MISSING-PROPERTY:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-ENCAPSULATION:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-ENCAPSULATION-LLC:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION-LLC:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-ENCAPSULATION-VCMUX:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION-VCMUX:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-ERROR:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-ERROR:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-PASSWORD:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-PASSWORD:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-PASSWORD-FLAGS:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-PASSWORD-FLAGS:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-PROTOCOL:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-PROTOCOL-IPOATM:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL-IPOATM:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-PROTOCOL-PPPOA:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL-PPPOA:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-PROTOCOL-PPPOE:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL-PPPOE:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-SETTING-NAME:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-SETTING-NAME:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-USERNAME:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-USERNAME:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-VCI:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-VCI:CAPS"> +<ANCHOR id="NM-SETTING-ADSL-VPI:CAPS" href="libnm-util/NMSettingAdsl.html#NM-SETTING-ADSL-VPI:CAPS"> +<ANCHOR id="nm-setting-adsl-error-quark" href="libnm-util/NMSettingAdsl.html#nm-setting-adsl-error-quark"> +<ANCHOR id="nm-setting-adsl-get-encapsulation" href="libnm-util/NMSettingAdsl.html#nm-setting-adsl-get-encapsulation"> +<ANCHOR id="nm-setting-adsl-get-password" href="libnm-util/NMSettingAdsl.html#nm-setting-adsl-get-password"> +<ANCHOR id="nm-setting-adsl-get-password-flags" href="libnm-util/NMSettingAdsl.html#nm-setting-adsl-get-password-flags"> +<ANCHOR id="nm-setting-adsl-get-protocol" href="libnm-util/NMSettingAdsl.html#nm-setting-adsl-get-protocol"> +<ANCHOR id="nm-setting-adsl-get-username" href="libnm-util/NMSettingAdsl.html#nm-setting-adsl-get-username"> +<ANCHOR id="nm-setting-adsl-get-vci" href="libnm-util/NMSettingAdsl.html#nm-setting-adsl-get-vci"> +<ANCHOR id="nm-setting-adsl-get-vpi" href="libnm-util/NMSettingAdsl.html#nm-setting-adsl-get-vpi"> +<ANCHOR id="nm-setting-adsl-new" href="libnm-util/NMSettingAdsl.html#nm-setting-adsl-new"> +<ANCHOR id="NMSettingAdsl.property-details" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl.property-details"> +<ANCHOR id="NMSettingAdsl--encapsulation" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl--encapsulation"> +<ANCHOR id="NMSettingAdsl--password" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl--password"> +<ANCHOR id="NMSettingAdsl--password-flags" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl--password-flags"> +<ANCHOR id="NMSettingAdsl--protocol" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl--protocol"> +<ANCHOR id="NMSettingAdsl--username" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl--username"> +<ANCHOR id="NMSettingAdsl--vci" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl--vci"> +<ANCHOR id="NMSettingAdsl--vpi" href="libnm-util/NMSettingAdsl.html#NMSettingAdsl--vpi"> <ANCHOR id="NMSetting8021x" href="libnm-util/NMSetting8021x.html"> <ANCHOR id="NMSetting8021x.synopsis" href="libnm-util/NMSetting8021x.html#NMSetting8021x.synopsis"> <ANCHOR id="NMSetting8021xCKFormat" href="libnm-util/NMSetting8021x.html#NMSetting8021xCKFormat"> diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2 index 93646eec2..5b50abff5 100644 --- a/docs/libnm-util/html/libnm-util.devhelp2 +++ b/docs/libnm-util/html/libnm-util.devhelp2 @@ -18,6 +18,7 @@ <sub name="NMSettingInfiniband" link="NMSettingInfiniband.html"/> <sub name="NMSettingVlan" link="NMSettingVlan.html"/> <sub name="NMSettingOlpcMesh" link="NMSettingOlpcMesh.html"/> + <sub name="NMSettingAdsl" link="NMSettingAdsl.html"/> <sub name="NMSetting8021x" link="NMSetting8021x.html"/> <sub name="NMSettingIP4Config" link="NMSettingIP4Config.html"/> <sub name="NMSettingIP6Config" link="NMSettingIP6Config.html"/> @@ -528,6 +529,39 @@ <keyword type="property" name="The "channel" property" link="NMSettingOlpcMesh.html#NMSettingOlpcMesh--channel"/> <keyword type="property" name="The "dhcp-anycast-address" property" link="NMSettingOlpcMesh.html#NMSettingOlpcMesh--dhcp-anycast-address"/> <keyword type="property" name="The "ssid" property" link="NMSettingOlpcMesh.html#NMSettingOlpcMesh--ssid"/> + <keyword type="struct" name="NMSettingAdsl" link="NMSettingAdsl.html#NMSettingAdsl-struct"/> + <keyword type="struct" name="NMSettingAdslClass" link="NMSettingAdsl.html#NMSettingAdslClass"/> + <keyword type="enum" name="enum NMSettingAdslError" link="NMSettingAdsl.html#NMSettingAdslError-enum"/> + <keyword type="macro" name="NM_SETTING_ADSL_ENCAPSULATION" link="NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION:CAPS"/> + <keyword type="macro" name="NM_SETTING_ADSL_ENCAPSULATION_LLC" link="NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION-LLC:CAPS"/> + <keyword type="macro" name="NM_SETTING_ADSL_ENCAPSULATION_VCMUX" link="NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION-VCMUX:CAPS"/> + <keyword type="macro" name="NM_SETTING_ADSL_ERROR" link="NMSettingAdsl.html#NM-SETTING-ADSL-ERROR:CAPS"/> + <keyword type="macro" name="NM_SETTING_ADSL_PASSWORD" link="NMSettingAdsl.html#NM-SETTING-ADSL-PASSWORD:CAPS"/> + <keyword type="macro" name="NM_SETTING_ADSL_PASSWORD_FLAGS" link="NMSettingAdsl.html#NM-SETTING-ADSL-PASSWORD-FLAGS:CAPS"/> + <keyword type="macro" name="NM_SETTING_ADSL_PROTOCOL" link="NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL:CAPS"/> + <keyword type="macro" name="NM_SETTING_ADSL_PROTOCOL_IPOATM" link="NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL-IPOATM:CAPS"/> + <keyword type="macro" name="NM_SETTING_ADSL_PROTOCOL_PPPOA" link="NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL-PPPOA:CAPS"/> + <keyword type="macro" name="NM_SETTING_ADSL_PROTOCOL_PPPOE" link="NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL-PPPOE:CAPS"/> + <keyword type="macro" name="NM_SETTING_ADSL_SETTING_NAME" link="NMSettingAdsl.html#NM-SETTING-ADSL-SETTING-NAME:CAPS"/> + <keyword type="macro" name="NM_SETTING_ADSL_USERNAME" link="NMSettingAdsl.html#NM-SETTING-ADSL-USERNAME:CAPS"/> + <keyword type="macro" name="NM_SETTING_ADSL_VCI" link="NMSettingAdsl.html#NM-SETTING-ADSL-VCI:CAPS"/> + <keyword type="macro" name="NM_SETTING_ADSL_VPI" link="NMSettingAdsl.html#NM-SETTING-ADSL-VPI:CAPS"/> + <keyword type="function" name="nm_setting_adsl_error_quark ()" link="NMSettingAdsl.html#nm-setting-adsl-error-quark"/> + <keyword type="function" name="nm_setting_adsl_get_encapsulation ()" link="NMSettingAdsl.html#nm-setting-adsl-get-encapsulation"/> + <keyword type="function" name="nm_setting_adsl_get_password ()" link="NMSettingAdsl.html#nm-setting-adsl-get-password"/> + <keyword type="function" name="nm_setting_adsl_get_password_flags ()" link="NMSettingAdsl.html#nm-setting-adsl-get-password-flags"/> + <keyword type="function" name="nm_setting_adsl_get_protocol ()" link="NMSettingAdsl.html#nm-setting-adsl-get-protocol"/> + <keyword type="function" name="nm_setting_adsl_get_username ()" link="NMSettingAdsl.html#nm-setting-adsl-get-username"/> + <keyword type="function" name="nm_setting_adsl_get_vci ()" link="NMSettingAdsl.html#nm-setting-adsl-get-vci"/> + <keyword type="function" name="nm_setting_adsl_get_vpi ()" link="NMSettingAdsl.html#nm-setting-adsl-get-vpi"/> + <keyword type="function" name="nm_setting_adsl_new ()" link="NMSettingAdsl.html#nm-setting-adsl-new"/> + <keyword type="property" name="The "encapsulation" property" link="NMSettingAdsl.html#NMSettingAdsl--encapsulation"/> + <keyword type="property" name="The "password" property" link="NMSettingAdsl.html#NMSettingAdsl--password"/> + <keyword type="property" name="The "password-flags" property" link="NMSettingAdsl.html#NMSettingAdsl--password-flags"/> + <keyword type="property" name="The "protocol" property" link="NMSettingAdsl.html#NMSettingAdsl--protocol"/> + <keyword type="property" name="The "username" property" link="NMSettingAdsl.html#NMSettingAdsl--username"/> + <keyword type="property" name="The "vci" property" link="NMSettingAdsl.html#NMSettingAdsl--vci"/> + <keyword type="property" name="The "vpi" property" link="NMSettingAdsl.html#NMSettingAdsl--vpi"/> <keyword type="struct" name="NMSetting8021x" link="NMSetting8021x.html#NMSetting8021x-struct"/> <keyword type="enum" name="enum NMSetting8021xCKFormat" link="NMSetting8021x.html#NMSetting8021xCKFormat-enum"/> <keyword type="enum" name="enum NMSetting8021xCKScheme" link="NMSetting8021x.html#NMSetting8021xCKScheme-enum"/> @@ -1087,6 +1121,12 @@ <keyword type="constant" name="NM_VLAN_FLAG_LOOSE_BINDING" link="NMSettingVlan.html#NM-VLAN-FLAG-LOOSE-BINDING:CAPS"/> <keyword type="constant" name="NM_VLAN_INGRESS_MAP" link="NMSettingVlan.html#NM-VLAN-INGRESS-MAP:CAPS"/> <keyword type="constant" name="NM_VLAN_EGRESS_MAP" link="NMSettingVlan.html#NM-VLAN-EGRESS-MAP:CAPS"/> + <keyword type="constant" name="NM_SETTING_OLPC_MESH_ERROR_UNKNOWN" link="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR-UNKNOWN:CAPS"/> + <keyword type="constant" name="NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY" link="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR-INVALID-PROPERTY:CAPS"/> + <keyword type="constant" name="NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY" link="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-ERROR-MISSING-PROPERTY:CAPS"/> + <keyword type="constant" name="NM_SETTING_ADSL_ERROR_UNKNOWN" link="NMSettingAdsl.html#NM-SETTING-ADSL-ERROR-UNKNOWN:CAPS"/> + <keyword type="constant" name="NM_SETTING_ADSL_ERROR_INVALID_PROPERTY" link="NMSettingAdsl.html#NM-SETTING-ADSL-ERROR-INVALID-PROPERTY:CAPS"/> + <keyword type="constant" name="NM_SETTING_ADSL_ERROR_MISSING_PROPERTY" link="NMSettingAdsl.html#NM-SETTING-ADSL-ERROR-MISSING-PROPERTY:CAPS"/> <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_UNKNOWN" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-UNKNOWN:CAPS"/> <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_X509" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-X509:CAPS"/> <keyword type="constant" name="NM_SETTING_802_1X_CK_FORMAT_RAW_KEY" link="NMSetting8021x.html#NM-SETTING-802-1X-CK-FORMAT-RAW-KEY:CAPS"/> diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html index edb82a827..ea1caff31 100644 --- a/docs/libnm-util/html/object-tree.html +++ b/docs/libnm-util/html/object-tree.html @@ -27,7 +27,7 @@ <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a> <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a> - NMSettingAdsl + <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a> <a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth">NMSettingBluetooth</a> <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a> <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a> @@ -51,7 +51,7 @@ <a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat">NMSetting8021xCKFormat</a> <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme">NMSetting8021xCKScheme</a> <a class="link" href="NMSetting8021x.html#NMSetting8021xError">NMSetting8021xError</a> - NMSettingAdslError + <a class="link" href="NMSettingAdsl.html#NMSettingAdslError">NMSettingAdslError</a> <a class="link" href="NMSettingBluetooth.html#NMSettingBluetoothError">NMSettingBluetoothError</a> <a class="link" href="NMSettingBond.html#NMSettingBondError">NMSettingBondError</a> <a class="link" href="NMSettingCdma.html#NMSettingCdmaError">NMSettingCdmaError</a> diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml index f389971b6..66b402c30 100644 --- a/docs/libnm-util/libnm-util-docs.sgml +++ b/docs/libnm-util/libnm-util-docs.sgml @@ -3,15 +3,43 @@ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ <!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'"> + <!ENTITY version SYSTEM "version.xml"> ]> <book id="index"> <bookinfo> <title>libnm-util Reference Manual</title> <releaseinfo> - for libnm-util 0.9 + for libnm-util &version; The latest version of this documentation can be found on-line at <ulink role="online-location" url="http://projects.gnome.org/NetworkManager/developers/libnm-util/09/">http://projects.gnome.org/NetworkManager/developers/libnm-util/09/</ulink>. </releaseinfo> + + <copyright> + <year>2012</year> + <holder>The NetworkManager Authors</holder> + </copyright> + + <legalnotice> + <para> + Permission is granted to copy, distribute and/or modify this + document under the terms of the <citetitle>GNU Free + Documentation License</citetitle>, Version 1.1 or any later + version published by the Free Software Foundation with no + Invariant Sections, no Front-Cover Texts, and no Back-Cover + Texts. You may obtain a copy of the <citetitle>GNU Free + Documentation License</citetitle> from the Free Software + Foundation by visiting <ulink type="http" + url="http://www.fsf.org">their Web site</ulink> or by writing + to: + + <address> + The Free Software Foundation, Inc., + <street>51 Franklin Street</street> - Fifth Floor, + <city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>, + <country>USA</country> + </address> + </para> + </legalnotice> </bookinfo> <chapter> @@ -31,6 +59,7 @@ <xi:include href="xml/nm-setting-infiniband.xml"/> <xi:include href="xml/nm-setting-vlan.xml"/> <xi:include href="xml/nm-setting-olpc-mesh.xml"/> + <xi:include href="xml/nm-setting-adsl.xml"/> <xi:include href="xml/nm-setting-8021x.xml"/> <xi:include href="xml/nm-setting-ip4-config.xml"/> <xi:include href="xml/nm-setting-ip6-config.xml"/> diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml index 597996117..fa0b5d8bd 100644 --- a/docs/libnm-util/tmpl/nm-connection.sgml +++ b/docs/libnm-util/tmpl/nm-connection.sgml @@ -9,11 +9,13 @@ NMConnection </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml index 107752243..f8ab2c77b 100644 --- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml +++ b/docs/libnm-util/tmpl/nm-setting-8021x.sgml @@ -9,11 +9,13 @@ NMSetting8021x </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-adsl.sgml b/docs/libnm-util/tmpl/nm-setting-adsl.sgml index d81ae07f5..0e209bc26 100644 --- a/docs/libnm-util/tmpl/nm-setting-adsl.sgml +++ b/docs/libnm-util/tmpl/nm-setting-adsl.sgml @@ -9,11 +9,13 @@ NMSettingAdsl </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml index 9ab1b4b2d..cc64b574f 100644 --- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml +++ b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml @@ -9,11 +9,13 @@ NMSettingBluetooth </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-bond.sgml b/docs/libnm-util/tmpl/nm-setting-bond.sgml index 8f7dbfc1c..caa8b37a5 100644 --- a/docs/libnm-util/tmpl/nm-setting-bond.sgml +++ b/docs/libnm-util/tmpl/nm-setting-bond.sgml @@ -9,11 +9,13 @@ NMSettingBond </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml index 7837016d3..5d065170a 100644 --- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml +++ b/docs/libnm-util/tmpl/nm-setting-cdma.sgml @@ -9,11 +9,13 @@ NMSettingCdma </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml index 751b1a19d..d4f568006 100644 --- a/docs/libnm-util/tmpl/nm-setting-connection.sgml +++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml @@ -9,11 +9,13 @@ NMSettingConnection </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml index 5a6a3c481..0c9bdeb04 100644 --- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml +++ b/docs/libnm-util/tmpl/nm-setting-gsm.sgml @@ -9,11 +9,13 @@ NMSettingGsm </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml index ba7117c01..02a59881c 100644 --- a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml +++ b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml @@ -9,11 +9,13 @@ NMSettingInfiniband </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml index fbc1b4ccb..4b915f2b1 100644 --- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml +++ b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml @@ -9,11 +9,13 @@ NMSettingIP4Config </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml index 400bfced4..ad9c1b634 100644 --- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml +++ b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml @@ -9,11 +9,13 @@ NMSettingIP6Config </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml index 744c87e30..9a1e720ef 100644 --- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml +++ b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml @@ -9,11 +9,13 @@ NMSettingOlpcMesh </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml index f26d56fa4..90815380f 100644 --- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml +++ b/docs/libnm-util/tmpl/nm-setting-ppp.sgml @@ -9,11 +9,13 @@ NMSettingPPP </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml index 942b5a049..3c0221699 100644 --- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml +++ b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml @@ -9,11 +9,13 @@ NMSettingPPPOE </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-private.sgml b/docs/libnm-util/tmpl/nm-setting-private.sgml index b5cdc70e8..b97401650 100644 --- a/docs/libnm-util/tmpl/nm-setting-private.sgml +++ b/docs/libnm-util/tmpl/nm-setting-private.sgml @@ -9,11 +9,13 @@ nm-setting-private </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml index 542b9fbcf..f0313441e 100644 --- a/docs/libnm-util/tmpl/nm-setting-serial.sgml +++ b/docs/libnm-util/tmpl/nm-setting-serial.sgml @@ -9,11 +9,13 @@ NMSettingSerial </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml index 79cb88db5..49f40d1d4 100644 --- a/docs/libnm-util/tmpl/nm-setting-vlan.sgml +++ b/docs/libnm-util/tmpl/nm-setting-vlan.sgml @@ -9,11 +9,13 @@ NMSettingVlan </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml index e29dfff99..567776c1c 100644 --- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml +++ b/docs/libnm-util/tmpl/nm-setting-vpn.sgml @@ -9,11 +9,13 @@ NMSettingVPN </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml index 9225504a5..0b96fa9f6 100644 --- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml +++ b/docs/libnm-util/tmpl/nm-setting-wimax.sgml @@ -9,11 +9,13 @@ NMSettingWimax </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml index cff79594b..09fb963ac 100644 --- a/docs/libnm-util/tmpl/nm-setting-wired.sgml +++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml @@ -9,11 +9,13 @@ NMSettingWired </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml index d653c6825..01b16ce92 100644 --- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml +++ b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml @@ -9,11 +9,13 @@ NMSettingWirelessSecurity </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml index 6a34f4c54..fdadf8b97 100644 --- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml +++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml @@ -9,11 +9,13 @@ NMSettingWireless </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml index a5198c104..2067408af 100644 --- a/docs/libnm-util/tmpl/nm-setting.sgml +++ b/docs/libnm-util/tmpl/nm-setting.sgml @@ -9,11 +9,13 @@ NMSetting </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml index 5171db340..820258228 100644 --- a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml +++ b/docs/libnm-util/tmpl/nm-utils-enum-types.sgml @@ -9,11 +9,13 @@ nm-utils-enum-types </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml index f7ee74c18..8a822fcfc 100644 --- a/docs/libnm-util/tmpl/nm-utils.sgml +++ b/docs/libnm-util/tmpl/nm-utils.sgml @@ -9,11 +9,13 @@ nm-utils </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> + <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml new file mode 100644 index 000000000..c318497fc --- /dev/null +++ b/docs/libnm-util/version.xml @@ -0,0 +1 @@ +0.9.6.0 diff --git a/docs/libnm-util/version.xml.in b/docs/libnm-util/version.xml.in new file mode 100644 index 000000000..d78bda934 --- /dev/null +++ b/docs/libnm-util/version.xml.in @@ -0,0 +1 @@ +@VERSION@ diff --git a/include/NetworkManager.h b/include/NetworkManager.h index 644575105..bb67b8f7a 100644 --- a/include/NetworkManager.h +++ b/include/NetworkManager.h @@ -139,7 +139,6 @@ typedef enum { * General device capability flags. **/ typedef enum { - /*< flags >*/ NM_DEVICE_CAP_NONE = 0x00000000, NM_DEVICE_CAP_NM_SUPPORTED = 0x00000001, NM_DEVICE_CAP_CARRIER_DETECT = 0x00000002 @@ -160,7 +159,6 @@ typedef enum { * 802.11 specific device encryption and authentication capabilities. **/ typedef enum { - /*< flags >*/ NM_WIFI_DEVICE_CAP_NONE = 0x00000000, NM_WIFI_DEVICE_CAP_CIPHER_WEP40 = 0x00000001, NM_WIFI_DEVICE_CAP_CIPHER_WEP104 = 0x00000002, @@ -181,7 +179,6 @@ typedef enum { * 802.11 access point flags. **/ typedef enum { - /*< flags >*/ NM_802_11_AP_FLAGS_NONE = 0x00000000, NM_802_11_AP_FLAGS_PRIVACY = 0x00000001 } NM80211ApFlags; @@ -212,7 +209,6 @@ typedef enum { * access point's beacon. **/ typedef enum { - /*< flags >*/ NM_802_11_AP_SEC_NONE = 0x00000000, NM_802_11_AP_SEC_PAIR_WEP40 = 0x00000001, NM_802_11_AP_SEC_PAIR_WEP104 = 0x00000002, @@ -250,7 +246,6 @@ typedef enum { * Bluetooth device. **/ typedef enum { - /*< flags >*/ NM_BT_CAPABILITY_NONE = 0x00000000, NM_BT_CAPABILITY_DUN = 0x00000001, NM_BT_CAPABILITY_NAP = 0x00000002, @@ -273,7 +268,6 @@ typedef enum { * API. **/ typedef enum { - /*< flags >*/ NM_DEVICE_MODEM_CAPABILITY_NONE = 0x00000000, NM_DEVICE_MODEM_CAPABILITY_POTS = 0x00000001, NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO = 0x00000002, diff --git a/include/nm-version.h b/include/nm-version.h index 4bf3ebe5b..13256abd5 100644 --- a/include/nm-version.h +++ b/include/nm-version.h @@ -43,7 +43,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (5) +#define NM_MICRO_VERSION (6) /** * NM_CHECK_VERSION: diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index 89ed3c5eb..4d122c177 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -6,8 +6,7 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/libnm-util \ - -I$(top_builddir)/marshallers + -I$(top_builddir)/libnm-util BUILT_SOURCES = \ nm-vpn-plugin-glue.h \ diff --git a/libnm-glib/Makefile.in b/libnm-glib/Makefile.in index 7ee1e434c..4718b8125 100644 --- a/libnm-glib/Makefile.in +++ b/libnm-glib/Makefile.in @@ -513,8 +513,7 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/libnm-util \ - -I$(top_builddir)/marshallers + -I$(top_builddir)/libnm-util BUILT_SOURCES = nm-vpn-plugin-glue.h nm-secret-agent-glue.h \ $(GLIB_GENERATED) diff --git a/libnm-glib/nm-access-point.h b/libnm-glib/nm-access-point.h index ffbf63ccb..76275f004 100644 --- a/libnm-glib/nm-access-point.h +++ b/libnm-glib/nm-access-point.h @@ -36,7 +36,7 @@ G_BEGIN_DECLS #define NM_ACCESS_POINT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ACCESS_POINT, NMAccessPoint)) #define NM_ACCESS_POINT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_ACCESS_POINT, NMAccessPointClass)) #define NM_IS_ACCESS_POINT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_ACCESS_POINT)) -#define NM_IS_ACCESS_POINT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_ACCESS_POINT)) +#define NM_IS_ACCESS_POINT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_ACCESS_POINT)) #define NM_ACCESS_POINT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_ACCESS_POINT, NMAccessPointClass)) #define NM_ACCESS_POINT_FLAGS "flags" diff --git a/libnm-glib/nm-active-connection.h b/libnm-glib/nm-active-connection.h index d6426e903..c6777f80e 100644 --- a/libnm-glib/nm-active-connection.h +++ b/libnm-glib/nm-active-connection.h @@ -36,7 +36,7 @@ G_BEGIN_DECLS #define NM_ACTIVE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnection)) #define NM_ACTIVE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnectionClass)) #define NM_IS_ACTIVE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_ACTIVE_CONNECTION)) -#define NM_IS_ACTIVE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_ACTIVE_CONNECTION)) +#define NM_IS_ACTIVE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_ACTIVE_CONNECTION)) #define NM_ACTIVE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnectionClass)) #define NM_ACTIVE_CONNECTION_CONNECTION "connection" diff --git a/libnm-glib/nm-client.h b/libnm-glib/nm-client.h index 684326ffd..64cbce216 100644 --- a/libnm-glib/nm-client.h +++ b/libnm-glib/nm-client.h @@ -39,7 +39,7 @@ G_BEGIN_DECLS #define NM_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CLIENT, NMClient)) #define NM_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_CLIENT, NMClientClass)) #define NM_IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_CLIENT)) -#define NM_IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_CLIENT)) +#define NM_IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_CLIENT)) #define NM_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_CLIENT, NMClientClass)) #define NM_CLIENT_VERSION "version" @@ -54,7 +54,36 @@ G_BEGIN_DECLS #define NM_CLIENT_WIMAX_HARDWARE_ENABLED "wimax-hardware-enabled" #define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections" -/* Permissions */ +/** + * NMClientPermission: + * @NM_CLIENT_PERMISSION_NONE: unknown or no permission + * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK: controls whether networking + * can be globally enabled or disabled + * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI: controls whether WiFi can be + * globally enabled or disabled + * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN: controls whether WWAN (3G) can be + * globally enabled or disabled + * @NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX: controls whether WiMAX can be + * globally enabled or disabled + * @NM_CLIENT_PERMISSION_SLEEP_WAKE: controls whether the client can ask + * NetworkManager to sleep and wake + * @NM_CLIENT_PERMISSION_NETWORK_CONTROL: controls whether networking connections + * can be started, stopped, and changed + * @NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED: controls whether a password + * protected WiFi hotspot can be created + * @NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN: controls whether an open WiFi hotspot + * can be created + * @NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM: controls whether connections + * that are available to all users can be modified + * @NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN: controls whether connections + * owned by the current user can be modified + * @NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME: controls whether the + * persistent hostname can be changed + * @NM_CLIENT_PERMISSION_LAST: a reserved boundary value + * + * #NMClientPermission values indicate various permissions that NetworkManager + * clients can obtain to perform certain tasks on behalf of the current user. + **/ typedef enum { NM_CLIENT_PERMISSION_NONE = 0, NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK = 1, @@ -72,6 +101,18 @@ typedef enum { NM_CLIENT_PERMISSION_LAST = NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME } NMClientPermission; +/** + * NMClientPermissionResult: + * @NM_CLIENT_PERMISSION_RESULT_UNKNOWN: unknown or no authorization + * @NM_CLIENT_PERMISSION_RESULT_YES: the permission is available + * @NM_CLIENT_PERMISSION_RESULT_AUTH: authorization is necessary before the + * permission is available + * @NM_CLIENT_PERMISSION_RESULT_NO: permission to perform the operation is + * denied by system policy + * + * #NMClientPermissionResult values indicate what authorizations and permissions + * the user requires to obtain a given #NMClientPermission + **/ typedef enum { NM_CLIENT_PERMISSION_RESULT_UNKNOWN = 0, NM_CLIENT_PERMISSION_RESULT_YES, diff --git a/libnm-glib/nm-device-adsl.h b/libnm-glib/nm-device-adsl.h index 9d83e2677..702d16dca 100644 --- a/libnm-glib/nm-device-adsl.h +++ b/libnm-glib/nm-device-adsl.h @@ -31,7 +31,7 @@ G_BEGIN_DECLS #define NM_DEVICE_ADSL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ADSL, NMDeviceAdsl)) #define NM_DEVICE_ADSL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_ADSL, NMDeviceAdslClass)) #define NM_IS_DEVICE_ADSL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_ADSL)) -#define NM_IS_DEVICE_ADSL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DEVICE_ADSL)) +#define NM_IS_DEVICE_ADSL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_ADSL)) #define NM_DEVICE_ADSL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_ADSL, NMDeviceAdslClass)) /** diff --git a/libnm-glib/nm-device-bond.h b/libnm-glib/nm-device-bond.h index db4a90fc5..61ff38267 100644 --- a/libnm-glib/nm-device-bond.h +++ b/libnm-glib/nm-device-bond.h @@ -31,7 +31,7 @@ G_BEGIN_DECLS #define NM_DEVICE_BOND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BOND, NMDeviceBond)) #define NM_DEVICE_BOND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_BOND, NMDeviceBondClass)) #define NM_IS_DEVICE_BOND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_BOND)) -#define NM_IS_DEVICE_BOND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DEVICE_BOND)) +#define NM_IS_DEVICE_BOND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_BOND)) #define NM_DEVICE_BOND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_BOND, NMDeviceBondClass)) /** diff --git a/libnm-glib/nm-device-bt.h b/libnm-glib/nm-device-bt.h index 8f9a78a71..113b5eca2 100644 --- a/libnm-glib/nm-device-bt.h +++ b/libnm-glib/nm-device-bt.h @@ -33,7 +33,7 @@ G_BEGIN_DECLS #define NM_DEVICE_BT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BT, NMDeviceBt)) #define NM_DEVICE_BT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_BT, NMDeviceBtClass)) #define NM_IS_DEVICE_BT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_BT)) -#define NM_IS_DEVICE_BT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DEVICE_BT)) +#define NM_IS_DEVICE_BT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_BT)) #define NM_DEVICE_BT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_BT, NMDeviceBtClass)) /** diff --git a/libnm-glib/nm-device-ethernet.h b/libnm-glib/nm-device-ethernet.h index f14cd045f..4028d62ca 100644 --- a/libnm-glib/nm-device-ethernet.h +++ b/libnm-glib/nm-device-ethernet.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS #define NM_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernet)) #define NM_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass)) #define NM_IS_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_ETHERNET)) -#define NM_IS_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DEVICE_ETHERNET)) +#define NM_IS_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_ETHERNET)) #define NM_DEVICE_ETHERNET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass)) /** diff --git a/libnm-glib/nm-device-infiniband.h b/libnm-glib/nm-device-infiniband.h index d0e754b35..72d8fc6c3 100644 --- a/libnm-glib/nm-device-infiniband.h +++ b/libnm-glib/nm-device-infiniband.h @@ -31,7 +31,7 @@ G_BEGIN_DECLS #define NM_DEVICE_INFINIBAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_INFINIBAND, NMDeviceInfiniband)) #define NM_DEVICE_INFINIBAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_INFINIBAND, NMDeviceInfinibandClass)) #define NM_IS_DEVICE_INFINIBAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_INFINIBAND)) -#define NM_IS_DEVICE_INFINIBAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DEVICE_INFINIBAND)) +#define NM_IS_DEVICE_INFINIBAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_INFINIBAND)) #define NM_DEVICE_INFINIBAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_INFINIBAND, NMDeviceInfinibandClass)) /** diff --git a/libnm-glib/nm-device-modem.h b/libnm-glib/nm-device-modem.h index 6f9666dd9..62719e2b9 100644 --- a/libnm-glib/nm-device-modem.h +++ b/libnm-glib/nm-device-modem.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS #define NM_DEVICE_MODEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_MODEM, NMDeviceModem)) #define NM_DEVICE_MODEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_MODEM, NMDeviceModemClass)) #define NM_IS_DEVICE_MODEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_MODEM)) -#define NM_IS_DEVICE_MODEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DEVICE_MODEM)) +#define NM_IS_DEVICE_MODEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_MODEM)) #define NM_DEVICE_MODEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_MODEM, NMDeviceModemClass)) /** diff --git a/libnm-glib/nm-device-olpc-mesh.h b/libnm-glib/nm-device-olpc-mesh.h index 7945d0c78..93cb2cdeb 100644 --- a/libnm-glib/nm-device-olpc-mesh.h +++ b/libnm-glib/nm-device-olpc-mesh.h @@ -33,7 +33,7 @@ G_BEGIN_DECLS #define NM_DEVICE_OLPC_MESH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_OLPC_MESH, NMDeviceOlpcMesh)) #define NM_DEVICE_OLPC_MESH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_OLPC_MESH, NMDeviceOlpcMeshClass)) #define NM_IS_DEVICE_OLPC_MESH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_OLPC_MESH)) -#define NM_IS_DEVICE_OLPC_MESH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DEVICE_OLPC_MESH)) +#define NM_IS_DEVICE_OLPC_MESH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_OLPC_MESH)) #define NM_DEVICE_OLPC_MESH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_OLPC_MESH, NMDeviceOlpcMeshClass)) /** diff --git a/libnm-glib/nm-device-vlan.h b/libnm-glib/nm-device-vlan.h index df0202595..6ccbb028e 100644 --- a/libnm-glib/nm-device-vlan.h +++ b/libnm-glib/nm-device-vlan.h @@ -31,7 +31,7 @@ G_BEGIN_DECLS #define NM_DEVICE_VLAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_VLAN, NMDeviceVlan)) #define NM_DEVICE_VLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_VLAN, NMDeviceVlanClass)) #define NM_IS_DEVICE_VLAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_VLAN)) -#define NM_IS_DEVICE_VLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DEVICE_VLAN)) +#define NM_IS_DEVICE_VLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_VLAN)) #define NM_DEVICE_VLAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_VLAN, NMDeviceVlanClass)) /** diff --git a/libnm-glib/nm-device-wifi.h b/libnm-glib/nm-device-wifi.h index 13f1cb8a8..d909c65c9 100644 --- a/libnm-glib/nm-device-wifi.h +++ b/libnm-glib/nm-device-wifi.h @@ -33,7 +33,7 @@ G_BEGIN_DECLS #define NM_DEVICE_WIFI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_WIFI, NMDeviceWifi)) #define NM_DEVICE_WIFI_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_WIFI, NMDeviceWifiClass)) #define NM_IS_DEVICE_WIFI(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_WIFI)) -#define NM_IS_DEVICE_WIFI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DEVICE_WIFI)) +#define NM_IS_DEVICE_WIFI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_WIFI)) #define NM_DEVICE_WIFI_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_WIFI, NMDeviceWifiClass)) /** diff --git a/libnm-glib/nm-device-wimax.h b/libnm-glib/nm-device-wimax.h index e391d4de3..c0550d194 100644 --- a/libnm-glib/nm-device-wimax.h +++ b/libnm-glib/nm-device-wimax.h @@ -33,7 +33,7 @@ G_BEGIN_DECLS #define NM_DEVICE_WIMAX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_WIMAX, NMDeviceWimax)) #define NM_DEVICE_WIMAX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_WIMAX, NMDeviceWimaxClass)) #define NM_IS_DEVICE_WIMAX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_WIMAX)) -#define NM_IS_DEVICE_WIMAX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DEVICE_WIMAX)) +#define NM_IS_DEVICE_WIMAX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_WIMAX)) #define NM_DEVICE_WIMAX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_WIMAX, NMDeviceWimaxClass)) /** diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index b3a4f72a3..fc3340032 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -1105,7 +1105,7 @@ nm_device_get_ip4_config (NMDevice *device) * * Gets the current #NMDHCP4Config associated with the #NMDevice. * - * Returns: (transfer none): the #NMDHCPConfig or %NULL if the device is not activated or not + * Returns: (transfer none): the #NMDHCP4Config or %NULL if the device is not activated or not * using DHCP. **/ NMDHCP4Config * @@ -1140,7 +1140,7 @@ nm_device_get_ip6_config (NMDevice *device) * * Gets the current #NMDHCP6Config associated with the #NMDevice. * - * Returns: (transfer none): the #NMDHCPConfig or %NULL if the device is not activated or not + * Returns: (transfer none): the #NMDHCP6Config or %NULL if the device is not activated or not * using DHCP. **/ NMDHCP6Config * diff --git a/libnm-glib/nm-device.h b/libnm-glib/nm-device.h index 9260a33c4..1726862fd 100644 --- a/libnm-glib/nm-device.h +++ b/libnm-glib/nm-device.h @@ -42,7 +42,7 @@ G_BEGIN_DECLS #define NM_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE, NMDevice)) #define NM_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE, NMDeviceClass)) #define NM_IS_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE)) -#define NM_IS_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DEVICE)) +#define NM_IS_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE)) #define NM_DEVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE, NMDeviceClass)) #define NM_DEVICE_DEVICE_TYPE "device-type" diff --git a/libnm-glib/nm-dhcp4-config.h b/libnm-glib/nm-dhcp4-config.h index da5b57b36..9ca1a7695 100644 --- a/libnm-glib/nm-dhcp4-config.h +++ b/libnm-glib/nm-dhcp4-config.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define NM_DHCP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP4_CONFIG, NMDHCP4Config)) #define NM_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP4_CONFIG, NMDHCP4ConfigClass)) #define NM_IS_DHCP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP4_CONFIG)) -#define NM_IS_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DHCP4_CONFIG)) +#define NM_IS_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP4_CONFIG)) typedef struct { NMObject parent; diff --git a/libnm-glib/nm-dhcp6-config.h b/libnm-glib/nm-dhcp6-config.h index 91f32fa03..44002940b 100644 --- a/libnm-glib/nm-dhcp6-config.h +++ b/libnm-glib/nm-dhcp6-config.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define NM_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP6_CONFIG, NMDHCP6Config)) #define NM_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP6_CONFIG, NMDHCP6ConfigClass)) #define NM_IS_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP6_CONFIG)) -#define NM_IS_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DHCP6_CONFIG)) +#define NM_IS_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP6_CONFIG)) typedef struct { NMObject parent; diff --git a/libnm-glib/nm-glib-enum-types.c b/libnm-glib/nm-glib-enum-types.c index 6af605cf7..7486ff963 100644 --- a/libnm-glib/nm-glib-enum-types.c +++ b/libnm-glib/nm-glib-enum-types.c @@ -346,7 +346,7 @@ nm_secret_agent_get_secrets_flags_get_type (void) if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { + static const GFlagsValue values[] = { { NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE, "NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE", "none" }, { NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION, "NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION", "allow-interaction" }, { NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW, "NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW", "request-new" }, @@ -354,7 +354,7 @@ nm_secret_agent_get_secrets_flags_get_type (void) { 0, NULL, NULL } }; GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMSecretAgentGetSecretsFlags"), values); + g_flags_register_static (g_intern_static_string ("NMSecretAgentGetSecretsFlags"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } diff --git a/libnm-glib/nm-ip4-config.h b/libnm-glib/nm-ip4-config.h index ddff7e0ec..b76fdf8b3 100644 --- a/libnm-glib/nm-ip4-config.h +++ b/libnm-glib/nm-ip4-config.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define NM_IP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IP4_CONFIG, NMIP4Config)) #define NM_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_IP4_CONFIG, NMIP4ConfigClass)) #define NM_IS_IP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_IP4_CONFIG)) -#define NM_IS_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_IP4_CONFIG)) +#define NM_IS_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP4_CONFIG)) #define NM_IP4_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP4_CONFIG, NMIP4ConfigClass)) typedef struct { diff --git a/libnm-glib/nm-ip6-config.h b/libnm-glib/nm-ip6-config.h index 7865dfdbb..9692c6558 100644 --- a/libnm-glib/nm-ip6-config.h +++ b/libnm-glib/nm-ip6-config.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define NM_IP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IP6_CONFIG, NMIP6Config)) #define NM_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_IP6_CONFIG, NMIP6ConfigClass)) #define NM_IS_IP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_IP6_CONFIG)) -#define NM_IS_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_IP6_CONFIG)) +#define NM_IS_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP6_CONFIG)) #define NM_IP6_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP6_CONFIG, NMIP6ConfigClass)) typedef struct { diff --git a/libnm-glib/nm-object.h b/libnm-glib/nm-object.h index 267c7148f..eac713c60 100644 --- a/libnm-glib/nm-object.h +++ b/libnm-glib/nm-object.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS #define NM_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_OBJECT, NMObject)) #define NM_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_OBJECT, NMObjectClass)) #define NM_IS_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_OBJECT)) -#define NM_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_OBJECT)) +#define NM_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_OBJECT)) #define NM_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_OBJECT, NMObjectClass)) /** diff --git a/libnm-glib/nm-remote-connection.h b/libnm-glib/nm-remote-connection.h index 577e9a1b8..eebf91605 100644 --- a/libnm-glib/nm-remote-connection.h +++ b/libnm-glib/nm-remote-connection.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define NM_REMOTE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_REMOTE_CONNECTION, NMRemoteConnection)) #define NM_REMOTE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_REMOTE_CONNECTION, NMRemoteConnectionClass)) #define NM_IS_REMOTE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_REMOTE_CONNECTION)) -#define NM_IS_REMOTE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_REMOTE_CONNECTION)) +#define NM_IS_REMOTE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_REMOTE_CONNECTION)) #define NM_REMOTE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_REMOTE_CONNECTION, NMRemoteConnectionClass)) #define NM_REMOTE_CONNECTION_UPDATED "updated" diff --git a/libnm-glib/nm-remote-settings.h b/libnm-glib/nm-remote-settings.h index dd6c5a344..20235c0d1 100644 --- a/libnm-glib/nm-remote-settings.h +++ b/libnm-glib/nm-remote-settings.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define NM_REMOTE_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_REMOTE_SETTINGS, NMRemoteSettings)) #define NM_REMOTE_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_REMOTE_SETTINGS, NMRemoteSettingsClass)) #define NM_IS_REMOTE_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_REMOTE_SETTINGS)) -#define NM_IS_REMOTE_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_REMOTE_SETTINGS)) +#define NM_IS_REMOTE_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_REMOTE_SETTINGS)) #define NM_REMOTE_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_REMOTE_SETTINGS, NMRemoteSettingsClass)) /** diff --git a/libnm-glib/nm-secret-agent.h b/libnm-glib/nm-secret-agent.h index f96a39c1a..50fc64ef7 100644 --- a/libnm-glib/nm-secret-agent.h +++ b/libnm-glib/nm-secret-agent.h @@ -29,6 +29,23 @@ G_BEGIN_DECLS GQuark nm_secret_agent_error_quark (void); +/** + * NMSecretAgentError: + * @NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED: the caller (ie, NetworkManager) is not + * authorized to make this request + * @NM_SECRET_AGENT_ERROR_INVALID_CONNECTION: the connection for which secrets + * were requested could not be found + * @NM_SECRET_AGENT_ERROR_USER_CANCELED: the request was canceled by the user + * @NM_SECRET_AGENT_ERROR_AGENT_CANCELED: the agent canceled the request + * because it was requested to do so by NetworkManager + * @NM_SECRET_AGENT_ERROR_INTERNAL_ERROR: some internal error in the agent caused + * the request to fail + * @NM_SECRET_AGENT_ERROR_NO_SECRETS: the agent cannot find any secrets for this + * connection + * + * #NMSecretAgentError values are passed by secret agents back to NetworkManager + * when they encounter problems retrieving secrets on behalf of NM. + */ typedef enum { NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED = 0, /*< nick=NotAuthorized >*/ NM_SECRET_AGENT_ERROR_INVALID_CONNECTION, /*< nick=InvalidConnection >*/ @@ -57,7 +74,7 @@ typedef enum { * * #NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request. */ -typedef enum { +typedef enum /*< flags >*/ { NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE = 0x0, NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION = 0x1, NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW = 0x2, @@ -68,7 +85,7 @@ typedef enum { #define NM_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT, NMSecretAgent)) #define NM_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SECRET_AGENT, NMSecretAgentClass)) #define NM_IS_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SECRET_AGENT)) -#define NM_IS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SECRET_AGENT)) +#define NM_IS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SECRET_AGENT)) #define NM_SECRET_AGENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SECRET_AGENT, NMSecretAgentClass)) #define NM_SECRET_AGENT_IDENTIFIER "identifier" diff --git a/libnm-glib/nm-vpn-connection.h b/libnm-glib/nm-vpn-connection.h index 8541e704a..8727bb86d 100644 --- a/libnm-glib/nm-vpn-connection.h +++ b/libnm-glib/nm-vpn-connection.h @@ -36,7 +36,7 @@ G_BEGIN_DECLS #define NM_VPN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_CONNECTION, NMVPNConnection)) #define NM_VPN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_CONNECTION, NMVPNConnectionClass)) #define NM_IS_VPN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_CONNECTION)) -#define NM_IS_VPN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_VPN_CONNECTION)) +#define NM_IS_VPN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_CONNECTION)) #define NM_VPN_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_CONNECTION, NMVPNConnectionClass)) #define NM_VPN_CONNECTION_VPN_STATE "vpn-state" diff --git a/libnm-glib/nm-vpn-enum-types.c b/libnm-glib/nm-vpn-enum-types.c index fb0de17c5..0dc5ed23f 100644 --- a/libnm-glib/nm-vpn-enum-types.c +++ b/libnm-glib/nm-vpn-enum-types.c @@ -36,6 +36,27 @@ nm_vpn_plugin_error_get_type (void) return g_define_type_id__volatile; } GType +nm_vpn_plugin_ui_capability_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + + if (g_once_init_enter (&g_define_type_id__volatile)) + { + static const GFlagsValue values[] = { + { NM_VPN_PLUGIN_UI_CAPABILITY_NONE, "NM_VPN_PLUGIN_UI_CAPABILITY_NONE", "none" }, + { NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT, "NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT", "import" }, + { NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT, "NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT", "export" }, + { NM_VPN_PLUGIN_UI_CAPABILITY_IPV6, "NM_VPN_PLUGIN_UI_CAPABILITY_IPV6", "ipv6" }, + { 0, NULL, NULL } + }; + GType g_define_type_id = + g_flags_register_static (g_intern_static_string ("NMVpnPluginUiCapability"), values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + + return g_define_type_id__volatile; +} +GType nm_vpn_plugin_ui_interface_prop_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; diff --git a/libnm-glib/nm-vpn-enum-types.h b/libnm-glib/nm-vpn-enum-types.h index 86bb97f18..3d9e96093 100644 --- a/libnm-glib/nm-vpn-enum-types.h +++ b/libnm-glib/nm-vpn-enum-types.h @@ -11,6 +11,8 @@ G_BEGIN_DECLS GType nm_vpn_plugin_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_VPN_PLUGIN_ERROR (nm_vpn_plugin_error_get_type ()) +GType nm_vpn_plugin_ui_capability_get_type (void) G_GNUC_CONST; +#define NM_TYPE_VPN_PLUGIN_UI_CAPABILITY (nm_vpn_plugin_ui_capability_get_type ()) GType nm_vpn_plugin_ui_interface_prop_get_type (void) G_GNUC_CONST; #define NM_TYPE_VPN_PLUGIN_UI_INTERFACE_PROP (nm_vpn_plugin_ui_interface_prop_get_type ()) G_END_DECLS diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.h b/libnm-glib/nm-vpn-plugin-ui-interface.h index 80a5b82ee..068d8f89f 100644 --- a/libnm-glib/nm-vpn-plugin-ui-interface.h +++ b/libnm-glib/nm-vpn-plugin-ui-interface.h @@ -49,10 +49,21 @@ NMVpnPluginUiInterface *nm_vpn_plugin_ui_factory (GError **error); #define NM_IS_VPN_PLUGIN_UI_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_PLUGIN_UI_INTERFACE)) #define NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), NM_TYPE_VPN_PLUGIN_UI_INTERFACE, NMVpnPluginUiInterface)) -#define NM_VPN_PLUGIN_UI_CAPABILITY_NONE 0x00 -#define NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT 0x01 -#define NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT 0x02 -#define NM_VPN_PLUGIN_UI_CAPABILITY_IPV6 0x04 +/** + * NMVpnPluginUiCapability: + * @NM_VPN_PLUGIN_UI_CAPABILITY_NONE: unknown or no capability + * @NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT: the plugin can import new connections + * @NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT: the plugin can export connections + * @NM_VPN_PLUGIN_UI_CAPABILITY_IPV6: the plugin supports IPv6 addressing + * + * Flags that indicate to UI programs certain capabilities of the plugin. + **/ +typedef enum /*< flags >*/ { + NM_VPN_PLUGIN_UI_CAPABILITY_NONE = 0x00, + NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT = 0x01, + NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT = 0x02, + NM_VPN_PLUGIN_UI_CAPABILITY_IPV6 = 0x04 +} NMVpnPluginUiCapability; /* Short display name of the VPN plugin */ #define NM_VPN_PLUGIN_UI_INTERFACE_NAME "name" @@ -63,14 +74,28 @@ NMVpnPluginUiInterface *nm_vpn_plugin_ui_factory (GError **error); /* D-Bus service name of the plugin's VPN service */ #define NM_VPN_PLUGIN_UI_INTERFACE_SERVICE "service" +/** + * NMVpnPluginUiInterfaceProp: + * @NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: the VPN plugin's name + * @NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: description of the VPN plugin and what + * VPN services it supports + * @NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: the D-Bus service name used by the + * plugin's VPN service daemon + * + * #GObject property numbers that plugins should override to provide certain + * information to UI programs. + **/ typedef enum { + /*< private >*/ NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST = 0x1000, + /*< public >*/ NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME = NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST, NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC, NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE } NMVpnPluginUiInterfaceProp; + struct _NMVpnPluginUiInterface { GTypeInterface g_iface; diff --git a/libnm-glib/nm-vpn-plugin.h b/libnm-glib/nm-vpn-plugin.h index cdd55c153..dee726f7a 100644 --- a/libnm-glib/nm-vpn-plugin.h +++ b/libnm-glib/nm-vpn-plugin.h @@ -36,12 +36,36 @@ G_BEGIN_DECLS #define NM_VPN_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_PLUGIN, NMVPNPlugin)) #define NM_VPN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_PLUGIN, NMVPNPluginClass)) #define NM_IS_VPN_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_PLUGIN)) -#define NM_IS_VPN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_VPN_PLUGIN)) +#define NM_IS_VPN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_PLUGIN)) #define NM_VPN_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_PLUGIN, NMVPNPluginClass)) #define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name" #define NM_VPN_PLUGIN_STATE "state" +/** + * NMVPNPluginError: + * @NM_VPN_PLUGIN_ERROR_GENERAL: general failure + * @NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS: the plugin is already starting, + * and another connect request was received + * @NM_VPN_PLUGIN_ERROR_ALREADY_STARTED: the plugin is already connected, and + * another connect request was received + * @NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS: the plugin is already stopping, + * and another stop request was received + * @NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED: the plugin is already stopped, and + * another disconnect request was received + * @NM_VPN_PLUGIN_ERROR_WRONG_STATE: the operation could not be performed in + * this state + * @NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS: the operation could not be performed as + * the request contained malformed arguments, or arguments of unexpected type. + * Usually means that one of the VPN setting data items or secrets was not of + * the expected type (ie int, string, bool, etc). + * @NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED: a child process failed to launch + * @NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID: the operation could not be performed + * because the connection was invalid. Usually means that the connection's + * VPN setting was missing some required data item or secret. + * + * Returned by the VPN service plugin to indicate errors. + **/ typedef enum { NM_VPN_PLUGIN_ERROR_GENERAL, /*< nick=General >*/ NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS, /*< nick=StartingInProgress >*/ diff --git a/libnm-glib/nm-wimax-nsp.h b/libnm-glib/nm-wimax-nsp.h index 311d87f78..b8e91079d 100644 --- a/libnm-glib/nm-wimax-nsp.h +++ b/libnm-glib/nm-wimax-nsp.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define NM_WIMAX_NSP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_WIMAX_NSP, NMWimaxNsp)) #define NM_WIMAX_NSP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_WIMAX_NSP, NMWimaxNspClass)) #define NM_IS_WIMAX_NSP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_WIMAX_NSP)) -#define NM_IS_WIMAX_NSP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_WIMAX_NSP)) +#define NM_IS_WIMAX_NSP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_WIMAX_NSP)) #define NM_WIMAX_NSP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_WIMAX_NSP, NMWimaxNspClass)) #define NM_WIMAX_NSP_NAME "name" diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index e24ec148d..66df511f9 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -1544,7 +1544,7 @@ nm_connection_get_setting_ppp (NMConnection *connection) * nm_connection_get_setting_pppoe: * @connection: the #NMConnection * - * A shortcut to return any #NMSettingPPOE the connection might contain. + * A shortcut to return any #NMSettingPPPOE the connection might contain. * * Returns: (transfer none): an #NMSettingPPPOE if the connection contains one, otherwise NULL **/ diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h index ca29d1577..0fd878c3e 100644 --- a/libnm-util/nm-connection.h +++ b/libnm-util/nm-connection.h @@ -57,7 +57,7 @@ G_BEGIN_DECLS #define NM_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTION, NMConnection)) #define NM_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_CONNECTION, NMConnectionClass)) #define NM_IS_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_CONNECTION)) -#define NM_IS_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_CONNECTION)) +#define NM_IS_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_CONNECTION)) #define NM_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_CONNECTION, NMConnectionClass)) diff --git a/libnm-util/nm-setting-8021x.h b/libnm-util/nm-setting-8021x.h index eaca344d9..8381fed7c 100644 --- a/libnm-util/nm-setting-8021x.h +++ b/libnm-util/nm-setting-8021x.h @@ -73,7 +73,7 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/ #define NM_SETTING_802_1X(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_802_1X, NMSetting8021x)) #define NM_SETTING_802_1X_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_802_1X, NMSetting8021xClass)) #define NM_IS_SETTING_802_1X(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_802_1X)) -#define NM_IS_SETTING_802_1X_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_802_1X)) +#define NM_IS_SETTING_802_1X_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_802_1X)) #define NM_SETTING_802_1X_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_802_1X, NMSetting8021xClass)) #define NM_SETTING_802_1X_SETTING_NAME "802-1x" diff --git a/libnm-util/nm-setting-adsl.h b/libnm-util/nm-setting-adsl.h index f233c7ed8..484e8a395 100644 --- a/libnm-util/nm-setting-adsl.h +++ b/libnm-util/nm-setting-adsl.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS #define NM_SETTING_ADSL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_ADSL, NMSettingAdsl)) #define NM_SETTING_ADSL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_ADSL, NMSettingAdslClass)) #define NM_IS_SETTING_ADSL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_ADSL)) -#define NM_IS_SETTING_ADSL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_ADSL)) +#define NM_IS_SETTING_ADSL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_ADSL)) #define NM_SETTING_ADSL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_ADSL, NMSettingAdslClass)) #define NM_SETTING_ADSL_SETTING_NAME "adsl" diff --git a/libnm-util/nm-setting-bluetooth.h b/libnm-util/nm-setting-bluetooth.h index d76da8dbc..95a8852ab 100644 --- a/libnm-util/nm-setting-bluetooth.h +++ b/libnm-util/nm-setting-bluetooth.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define NM_SETTING_BLUETOOTH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_BLUETOOTH, NMSettingBluetooth)) #define NM_SETTING_BLUETOOTH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_BLUETOOTH, NMSettingBluetoothClass)) #define NM_IS_SETTING_BLUETOOTH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_BLUETOOTH)) -#define NM_IS_SETTING_BLUETOOTH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_BLUETOOTH)) +#define NM_IS_SETTING_BLUETOOTH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_BLUETOOTH)) #define NM_SETTING_BLUETOOTH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_BLUETOOTH, NMSettingBluetoothClass)) #define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth" diff --git a/libnm-util/nm-setting-bond.h b/libnm-util/nm-setting-bond.h index 9d494d3d1..f326a95b2 100644 --- a/libnm-util/nm-setting-bond.h +++ b/libnm-util/nm-setting-bond.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS #define NM_SETTING_BOND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_BOND, NMSettingBond)) #define NM_SETTING_BOND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_BOND, NMSettingBondClass)) #define NM_IS_SETTING_BOND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_BOND)) -#define NM_IS_SETTING_BOND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_BOND)) +#define NM_IS_SETTING_BOND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_BOND)) #define NM_SETTING_BOND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_BOND, NMSettingBondClass)) #define NM_SETTING_BOND_SETTING_NAME "bond" diff --git a/libnm-util/nm-setting-cdma.h b/libnm-util/nm-setting-cdma.h index a9491efb6..0dc290dac 100644 --- a/libnm-util/nm-setting-cdma.h +++ b/libnm-util/nm-setting-cdma.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS #define NM_SETTING_CDMA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_CDMA, NMSettingCdma)) #define NM_SETTING_CDMA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_CDMA, NMSettingCdmaClass)) #define NM_IS_SETTING_CDMA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_CDMA)) -#define NM_IS_SETTING_CDMA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_CDMA)) +#define NM_IS_SETTING_CDMA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_CDMA)) #define NM_SETTING_CDMA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_CDMA, NMSettingCdmaClass)) #define NM_SETTING_CDMA_SETTING_NAME "cdma" diff --git a/libnm-util/nm-setting-connection.h b/libnm-util/nm-setting-connection.h index 7aaf75294..44b0f8450 100644 --- a/libnm-util/nm-setting-connection.h +++ b/libnm-util/nm-setting-connection.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS #define NM_SETTING_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_CONNECTION, NMSettingConnection)) #define NM_SETTING_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_CONNECTION, NMSettingConnectionClass)) #define NM_IS_SETTING_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_CONNECTION)) -#define NM_IS_SETTING_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_CONNECTION)) +#define NM_IS_SETTING_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_CONNECTION)) #define NM_SETTING_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_CONNECTION, NMSettingConnectionClass)) #define NM_SETTING_CONNECTION_SETTING_NAME "connection" diff --git a/libnm-util/nm-setting-gsm.h b/libnm-util/nm-setting-gsm.h index af3efc2cd..12114e320 100644 --- a/libnm-util/nm-setting-gsm.h +++ b/libnm-util/nm-setting-gsm.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS #define NM_SETTING_GSM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_GSM, NMSettingGsm)) #define NM_SETTING_GSM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_GSM, NMSettingGsmClass)) #define NM_IS_SETTING_GSM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_GSM)) -#define NM_IS_SETTING_GSM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_GSM)) +#define NM_IS_SETTING_GSM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_GSM)) #define NM_SETTING_GSM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_GSM, NMSettingGsmClass)) #define NM_SETTING_GSM_SETTING_NAME "gsm" diff --git a/libnm-util/nm-setting-infiniband.h b/libnm-util/nm-setting-infiniband.h index dc8e8ad0e..98a3dd5e9 100644 --- a/libnm-util/nm-setting-infiniband.h +++ b/libnm-util/nm-setting-infiniband.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS #define NM_SETTING_INFINIBAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_INFINIBAND, NMSettingInfiniband)) #define NM_SETTING_INFINIBAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_INFINIBAND, NMSettingInfinibandClass)) #define NM_IS_SETTING_INFINIBAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_INFINIBAND)) -#define NM_IS_SETTING_INFINIBAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_INFINIBAND)) +#define NM_IS_SETTING_INFINIBAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_INFINIBAND)) #define NM_SETTING_INFINIBAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_INFINIBAND, NMSettingInfinibandClass)) #define NM_SETTING_INFINIBAND_SETTING_NAME "infiniband" diff --git a/libnm-util/nm-setting-ip4-config.h b/libnm-util/nm-setting-ip4-config.h index 52fa54e12..5f7f3d001 100644 --- a/libnm-util/nm-setting-ip4-config.h +++ b/libnm-util/nm-setting-ip4-config.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS #define NM_SETTING_IP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_IP4_CONFIG, NMSettingIP4Config)) #define NM_SETTING_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_IP4CONFIG, NMSettingIP4ConfigClass)) #define NM_IS_SETTING_IP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_IP4_CONFIG)) -#define NM_IS_SETTING_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_IP4_CONFIG)) +#define NM_IS_SETTING_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_IP4_CONFIG)) #define NM_SETTING_IP4_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_IP4_CONFIG, NMSettingIP4ConfigClass)) #define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4" diff --git a/libnm-util/nm-setting-ip6-config.h b/libnm-util/nm-setting-ip6-config.h index 55b48b2de..05c166687 100644 --- a/libnm-util/nm-setting-ip6-config.h +++ b/libnm-util/nm-setting-ip6-config.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define NM_SETTING_IP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_IP6_CONFIG, NMSettingIP6Config)) #define NM_SETTING_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_IP6CONFIG, NMSettingIP6ConfigClass)) #define NM_IS_SETTING_IP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_IP6_CONFIG)) -#define NM_IS_SETTING_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_IP6_CONFIG)) +#define NM_IS_SETTING_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_IP6_CONFIG)) #define NM_SETTING_IP6_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_IP6_CONFIG, NMSettingIP6ConfigClass)) #define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6" diff --git a/libnm-util/nm-setting-olpc-mesh.h b/libnm-util/nm-setting-olpc-mesh.h index d6940401b..59c03b485 100644 --- a/libnm-util/nm-setting-olpc-mesh.h +++ b/libnm-util/nm-setting-olpc-mesh.h @@ -36,13 +36,19 @@ G_BEGIN_DECLS #define NM_SETTING_OLPC_MESH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_OLPC_MESH, NMSettingOlpcMesh)) #define NM_SETTING_OLPC_MESH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_OLPC_MESH, NMSettingOlpcMeshClass)) #define NM_IS_SETTING_OLPC_MESH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_OLPC_MESH)) -#define NM_IS_SETTING_OLPC_MESH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_OLPC_MESH)) +#define NM_IS_SETTING_OLPC_MESH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_OLPC_MESH)) #define NM_SETTING_OLPC_MESH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_OLPC_MESH, NMSettingOlpcMeshClass)) #define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh" -typedef enum -{ +/** + * NMSettingOlpcMeshError: + * @NM_SETTING_OLPC_MESH_ERROR_UNKNOWN: unknown or unclassified error + * @NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY: the property was invalid + * @NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY: the property was missing and is + * required + */ +typedef enum { NM_SETTING_OLPC_MESH_ERROR_UNKNOWN = 0, /*< nick=UnknownError >*/ NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/ NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY /*< nick=MissingProperty >*/ diff --git a/libnm-util/nm-setting-ppp.h b/libnm-util/nm-setting-ppp.h index 072dd23c3..17a7181db 100644 --- a/libnm-util/nm-setting-ppp.h +++ b/libnm-util/nm-setting-ppp.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS #define NM_SETTING_PPP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_PPP, NMSettingPPP)) #define NM_SETTING_PPP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_PPP, NMSettingPPPClass)) #define NM_IS_SETTING_PPP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_PPP)) -#define NM_IS_SETTING_PPP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_PPP)) +#define NM_IS_SETTING_PPP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_PPP)) #define NM_SETTING_PPP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_PPP, NMSettingPPPClass)) #define NM_SETTING_PPP_SETTING_NAME "ppp" diff --git a/libnm-util/nm-setting-pppoe.h b/libnm-util/nm-setting-pppoe.h index 087e99020..9be90ddb5 100644 --- a/libnm-util/nm-setting-pppoe.h +++ b/libnm-util/nm-setting-pppoe.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS #define NM_SETTING_PPPOE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_PPPOE, NMSettingPPPOE)) #define NM_SETTING_PPPOE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_PPPOE, NMSettingPPPOEClass)) #define NM_IS_SETTING_PPPOE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_PPPOE)) -#define NM_IS_SETTING_PPPOE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_PPPOE)) +#define NM_IS_SETTING_PPPOE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_PPPOE)) #define NM_SETTING_PPPOE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_PPPOE, NMSettingPPPOEClass)) #define NM_SETTING_PPPOE_SETTING_NAME "pppoe" diff --git a/libnm-util/nm-setting-serial.h b/libnm-util/nm-setting-serial.h index 8c2a79b94..5a73d1030 100644 --- a/libnm-util/nm-setting-serial.h +++ b/libnm-util/nm-setting-serial.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS #define NM_SETTING_SERIAL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_SERIAL, NMSettingSerial)) #define NM_SETTING_SERIAL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_SERIAL, NMSettingSerialClass)) #define NM_IS_SETTING_SERIAL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_SERIAL)) -#define NM_IS_SETTING_SERIAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_SERIAL)) +#define NM_IS_SETTING_SERIAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_SERIAL)) #define NM_SETTING_SERIAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_SERIAL, NMSettingSerialClass)) #define NM_SETTING_SERIAL_SETTING_NAME "serial" diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index d9fd31310..f69e0d855 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -614,8 +614,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) * a default name will be constructed from the interface described by the * parent interface and the #NMSettingVlan:id , ex 'eth2.1'. The parent * interface may be given by the #NMSettingVlan:parent property or by a - * hardware address property, eg #NMSettingWired:mac-address or - * #NMSettingInfiniband:mac-address. + * hardware address property, eg #NMSettingWired:mac-address. **/ g_object_class_install_property (object_class, PROP_IFACE_NAME, @@ -627,8 +626,8 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) "parent interface and the 'id' property, ex " "'eth2.1'. The parent interface may be given by " "the 'parent' property or by a hardware address " - "property, eg the 'wired' or 'infiniband' " - "settings' 'mac-address' property.", + "property, eg the 'wired' settings' 'mac-address' " + "property.", NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); @@ -638,8 +637,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) * If given, specifies the parent interface name or parent connection UUID * from which this VLAN interface should be created. If this property is * not specified, the connection must contain a hardware address in a - * hardware-specific setting, like #NMSettingWired:mac-address or - * #NMSettingInfiniband:mac-address. + * hardware-specific setting, like #NMSettingWired:mac-address. **/ g_object_class_install_property (object_class, PROP_PARENT, @@ -650,8 +648,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) "interface should be created. If this property is " "not specified, the connection must contain a " "hardware address in a hardware-specific setting, " - "like the 'wired' or 'infiniband' settings' " - "'mac-address' property.", + "like the 'wired' settings' 'mac-address' property.", NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); diff --git a/libnm-util/nm-setting-vlan.h b/libnm-util/nm-setting-vlan.h index 18c7ed29a..9d2d728b3 100644 --- a/libnm-util/nm-setting-vlan.h +++ b/libnm-util/nm-setting-vlan.h @@ -33,7 +33,7 @@ G_BEGIN_DECLS #define NM_SETTING_VLAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_VLAN, NMSettingVlan)) #define NM_SETTING_VLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_VLANCONFIG, NMSettingVlanClass)) #define NM_IS_SETTING_VLAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_VLAN)) -#define NM_IS_SETTING_VLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_VLAN)) +#define NM_IS_SETTING_VLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_VLAN)) #define NM_SETTING_VLAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_VLAN, NMSettingVlanClass)) #define NM_SETTING_VLAN_SETTING_NAME "vlan" diff --git a/libnm-util/nm-setting-vpn.h b/libnm-util/nm-setting-vpn.h index 59068f883..dfd98105f 100644 --- a/libnm-util/nm-setting-vpn.h +++ b/libnm-util/nm-setting-vpn.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS #define NM_SETTING_VPN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_VPN, NMSettingVPN)) #define NM_SETTING_VPN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_VPN, NMSettingVPNClass)) #define NM_IS_SETTING_VPN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_VPN)) -#define NM_IS_SETTING_VPN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_VPN)) +#define NM_IS_SETTING_VPN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_VPN)) #define NM_SETTING_VPN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_VPN, NMSettingVPNClass)) #define NM_SETTING_VPN_SETTING_NAME "vpn" diff --git a/libnm-util/nm-setting-wimax.h b/libnm-util/nm-setting-wimax.h index be3a47e50..935960d8f 100644 --- a/libnm-util/nm-setting-wimax.h +++ b/libnm-util/nm-setting-wimax.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS #define NM_SETTING_WIMAX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_WIMAX, NMSettingWimax)) #define NM_SETTING_WIMAX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_WIMAX, NMSettingWimaxClass)) #define NM_IS_SETTING_WIMAX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_WIMAX)) -#define NM_IS_SETTING_WIMAX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_WIMAX)) +#define NM_IS_SETTING_WIMAX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_WIMAX)) #define NM_SETTING_WIMAX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_WIMAX, NMSettingWimaxClass)) #define NM_SETTING_WIMAX_SETTING_NAME "wimax" diff --git a/libnm-util/nm-setting-wired.h b/libnm-util/nm-setting-wired.h index 0189785fa..e235d23cc 100644 --- a/libnm-util/nm-setting-wired.h +++ b/libnm-util/nm-setting-wired.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS #define NM_SETTING_WIRED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_WIRED, NMSettingWired)) #define NM_SETTING_WIRED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_WIRED, NMSettingWiredClass)) #define NM_IS_SETTING_WIRED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_WIRED)) -#define NM_IS_SETTING_WIRED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_WIRED)) +#define NM_IS_SETTING_WIRED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_WIRED)) #define NM_SETTING_WIRED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_WIRED, NMSettingWiredClass)) #define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet" diff --git a/libnm-util/nm-setting-wireless-security.h b/libnm-util/nm-setting-wireless-security.h index 54dfcce81..d9e972c04 100644 --- a/libnm-util/nm-setting-wireless-security.h +++ b/libnm-util/nm-setting-wireless-security.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS #define NM_SETTING_WIRELESS_SECURITY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_WIRELESS_SECURITY, NMSettingWirelessSecurity)) #define NM_SETTING_WIRELESS_SECURITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_WIRELESS_SECURITY, NMSettingWirelessSecurityClass)) #define NM_IS_SETTING_WIRELESS_SECURITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_WIRELESS_SECURITY)) -#define NM_IS_SETTING_WIRELESS_SECURITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_WIRELESS_SECURITY)) +#define NM_IS_SETTING_WIRELESS_SECURITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_WIRELESS_SECURITY)) #define NM_SETTING_WIRELESS_SECURITY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_WIRELESS_SECURITY, NMSettingWirelessSecurityClass)) #define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security" diff --git a/libnm-util/nm-setting-wireless.h b/libnm-util/nm-setting-wireless.h index abbf231a2..e54e8353e 100644 --- a/libnm-util/nm-setting-wireless.h +++ b/libnm-util/nm-setting-wireless.h @@ -36,7 +36,7 @@ G_BEGIN_DECLS #define NM_SETTING_WIRELESS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_WIRELESS, NMSettingWireless)) #define NM_SETTING_WIRELESS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_WIRELESS, NMSettingWirelessClass)) #define NM_IS_SETTING_WIRELESS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_WIRELESS)) -#define NM_IS_SETTING_WIRELESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_WIRELESS)) +#define NM_IS_SETTING_WIRELESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_WIRELESS)) #define NM_SETTING_WIRELESS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_WIRELESS, NMSettingWirelessClass)) #define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless" diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h index 6cc6ed3e8..b717b65ac 100644 --- a/libnm-util/nm-setting.h +++ b/libnm-util/nm-setting.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define NM_SETTING(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING, NMSetting)) #define NM_SETTING_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING, NMSettingClass)) #define NM_IS_SETTING(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING)) -#define NM_IS_SETTING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING)) +#define NM_IS_SETTING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING)) #define NM_SETTING_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING, NMSettingClass)) /** diff --git a/m4/compiler_warnings.m4 b/m4/compiler_warnings.m4 index eeacfae85..3037c584f 100644 --- a/m4/compiler_warnings.m4 +++ b/m4/compiler_warnings.m4 @@ -11,7 +11,9 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then -Wdeclaration-after-statement \ -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \ -fno-strict-aliasing -Wno-unused-but-set-variable \ - -Wundef; do + -Wundef -Wimplicit-function-declaration \ + -Wpointer-arith -Winit-self \ + -Wmissing-include-dirs -Waggregate-return; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" AC_MSG_CHECKING([whether gcc understands $option]) diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index 127c72bf3..0c84af776 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -1,16 +1,16 @@ .\" NetworkManager(8) manual page .\" -.\" Copyright (C) 2005 - 2011 Red Hat, Inc. +.\" Copyright (C) 2005 - 2012 Red Hat, Inc. .\" Copyright (C) 2005 - 2009 Novell, Inc. .\" Copyright (C) 2005 Robert Love .\" -.TH NETWORKMANAGER "8" "2 August 2011" +.TH NETWORKMANAGER "8" "26 July 2012" .SH NAME NetworkManager \- network management daemon .SH SYNOPSIS .B NetworkManager [\-\-version] | [\-\-help] .PP -.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...] +.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...] [\-\-connectivity\-uri=<uri>] [\-\-connectivity\-interval=<int>] [\-\-connectivity\-response=<resp>] .SH DESCRIPTION The \fINetworkManager\fP daemon attempts to make networking configuration and operation as painless and automatic as possible by managing the primary network @@ -118,6 +118,24 @@ log levels and domains. Sets which operations are logged to the log destination (usually syslog). By default, most domains are logging-enabled. See \fBNetworkManager.conf\fP(5) for more information on log levels and domains. +.TP +.I "\-\-connectivity\-uri=<uri> +Sets the URI of a web page that will be used for connectivity checking. By +default connectivity checking is disabled. See \fBNetworkManager.conf\fP(5) +[connectivity] section for more information on connectivity checking feature. +.TP +.I "\-\-connectivity\-interval=<int> +Sets the interval (in seconds) in which connection checks for the URI are done. +0 means no checks. The default value is 300 seconds. See +\fBNetworkManager.conf\fP(5) [connectivity] section for more information on +connectivity checking feature. +.TP +.I "\-\-connectivity\-response=<resp> +If set, it controls what body content NetworkManager checks for when requesting +the URI for connectivity checking. If missing, defaults to "NetworkManager is online". +See \fBNetworkManager.conf\fP(5) [connectivity] section for more information on +connectivity checking feature. + .SH DEBUGGING The following environment variables are supported to help debugging. When used in conjunction with the "\-\-no\-daemon" option (thus echoing PPP and DHCP helper diff --git a/man/NetworkManager.8.in b/man/NetworkManager.8.in index 127c72bf3..0c84af776 100644 --- a/man/NetworkManager.8.in +++ b/man/NetworkManager.8.in @@ -1,16 +1,16 @@ .\" NetworkManager(8) manual page .\" -.\" Copyright (C) 2005 - 2011 Red Hat, Inc. +.\" Copyright (C) 2005 - 2012 Red Hat, Inc. .\" Copyright (C) 2005 - 2009 Novell, Inc. .\" Copyright (C) 2005 Robert Love .\" -.TH NETWORKMANAGER "8" "2 August 2011" +.TH NETWORKMANAGER "8" "26 July 2012" .SH NAME NetworkManager \- network management daemon .SH SYNOPSIS .B NetworkManager [\-\-version] | [\-\-help] .PP -.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...] +.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...] [\-\-connectivity\-uri=<uri>] [\-\-connectivity\-interval=<int>] [\-\-connectivity\-response=<resp>] .SH DESCRIPTION The \fINetworkManager\fP daemon attempts to make networking configuration and operation as painless and automatic as possible by managing the primary network @@ -118,6 +118,24 @@ log levels and domains. Sets which operations are logged to the log destination (usually syslog). By default, most domains are logging-enabled. See \fBNetworkManager.conf\fP(5) for more information on log levels and domains. +.TP +.I "\-\-connectivity\-uri=<uri> +Sets the URI of a web page that will be used for connectivity checking. By +default connectivity checking is disabled. See \fBNetworkManager.conf\fP(5) +[connectivity] section for more information on connectivity checking feature. +.TP +.I "\-\-connectivity\-interval=<int> +Sets the interval (in seconds) in which connection checks for the URI are done. +0 means no checks. The default value is 300 seconds. See +\fBNetworkManager.conf\fP(5) [connectivity] section for more information on +connectivity checking feature. +.TP +.I "\-\-connectivity\-response=<resp> +If set, it controls what body content NetworkManager checks for when requesting +the URI for connectivity checking. If missing, defaults to "NetworkManager is online". +See \fBNetworkManager.conf\fP(5) [connectivity] section for more information on +connectivity checking feature. + .SH DEBUGGING The following environment variables are supported to help debugging. When used in conjunction with the "\-\-no\-daemon" option (thus echoing PPP and DHCP helper diff --git a/man/nm-online.1 b/man/nm-online.1 index 2c8c9e9af..4859ba903 100644 --- a/man/nm-online.1 +++ b/man/nm-online.1 @@ -15,10 +15,9 @@ .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" -.\" You should have received a copy of the GNU General Public -.\" License along with this manual; if not, write to the Free -.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, -.\" USA. +.\" You should have received a copy of the GNU General Public Licence along +.\" with this manual; if not, write to the Free Software Foundation, Inc., +.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. .\" .\" Copyright (C) 2010 Red Hat, Inc. .\" diff --git a/man/nm-online.1.in b/man/nm-online.1.in index 2c8c9e9af..4859ba903 100644 --- a/man/nm-online.1.in +++ b/man/nm-online.1.in @@ -15,10 +15,9 @@ .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" -.\" You should have received a copy of the GNU General Public -.\" License along with this manual; if not, write to the Free -.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, -.\" USA. +.\" You should have received a copy of the GNU General Public Licence along +.\" with this manual; if not, write to the Free Software Foundation, Inc., +.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. .\" .\" Copyright (C) 2010 Red Hat, Inc. .\" diff --git a/man/nmcli.1 b/man/nmcli.1 index bd84edb7d..184ce40cc 100644 --- a/man/nmcli.1 +++ b/man/nmcli.1 @@ -15,14 +15,13 @@ .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" -.\" You should have received a copy of the GNU General Public -.\" License along with this manual; if not, write to the Free -.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, -.\" USA. +.\" You should have received a copy of the GNU General Public Licence along +.\" with this manual; if not, write to the Free Software Foundation, Inc., +.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. .\" .\" Copyright (C) 2010 - 2012 Red Hat, Inc. .\" -.TH NMCLI "1" "29 May 2012" +.TH NMCLI "1" "26 July 2012" .SH NAME nmcli \(en command\(hyline tool for controlling NetworkManager @@ -455,6 +454,12 @@ Connection activation failed Connection deactivation failed .IP "6" 4 Disconnecting device failed +.IP "7" 4 +Connection deletion failed +.IP "8" 4 +NetworkManager is not running +.IP "9" 4 +\fInmcli\fP and \fINetworkManager\fP versions mismatch .SH EXAMPLES .IP "\fB\f(CWnmcli \-t \-f RUNNING nm\fP\fP" diff --git a/man/nmcli.1.in b/man/nmcli.1.in index bd84edb7d..184ce40cc 100644 --- a/man/nmcli.1.in +++ b/man/nmcli.1.in @@ -15,14 +15,13 @@ .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .\" GNU General Public License for more details. .\" -.\" You should have received a copy of the GNU General Public -.\" License along with this manual; if not, write to the Free -.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, -.\" USA. +.\" You should have received a copy of the GNU General Public Licence along +.\" with this manual; if not, write to the Free Software Foundation, Inc., +.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. .\" .\" Copyright (C) 2010 - 2012 Red Hat, Inc. .\" -.TH NMCLI "1" "29 May 2012" +.TH NMCLI "1" "26 July 2012" .SH NAME nmcli \(en command\(hyline tool for controlling NetworkManager @@ -455,6 +454,12 @@ Connection activation failed Connection deactivation failed .IP "6" 4 Disconnecting device failed +.IP "7" 4 +Connection deletion failed +.IP "8" 4 +NetworkManager is not running +.IP "9" 4 +\fInmcli\fP and \fINetworkManager\fP versions mismatch .SH EXAMPLES .IP "\fB\f(CWnmcli \-t \-f RUNNING nm\fP\fP" diff --git a/src/Makefile.am b/src/Makefile.am index 7930c286b..731043451 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,10 +23,10 @@ endif SUBDIRS += . tests INCLUDES = -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/src/generated \ + -I${top_srcdir}/include \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/posix-signals \ -I${top_srcdir}/src/dns-manager \ diff --git a/src/Makefile.in b/src/Makefile.in index c81ac5f07..3e937cfd7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -545,10 +545,10 @@ SUBDIRS = generated logging posix-signals dns-manager vpn-manager \ backends dnsmasq-manager modem-manager bluez-manager \ firewall-manager wifi settings $(am__append_1) . tests INCLUDES = -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/src/generated \ + -I${top_srcdir}/include \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/posix-signals \ -I${top_srcdir}/src/dns-manager \ diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index 952b4e5d9..45d867d96 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -1038,6 +1038,7 @@ nm_utils_is_uuid (const char *str) char * nm_utils_new_vlan_name (const char *parent_iface, guint32 vlan_id) { + /* Basically VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD */ return g_strdup_printf ("%s.%d", parent_iface, vlan_id); } diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am index 10b32d255..63c6d3def 100644 --- a/src/bluez-manager/Makefile.am +++ b/src/bluez-manager/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = \ -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ + -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/generated \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging noinst_LTLIBRARIES = libbluez-manager.la diff --git a/src/bluez-manager/Makefile.in b/src/bluez-manager/Makefile.in index 7c6b08849..7a7320a98 100644 --- a/src/bluez-manager/Makefile.in +++ b/src/bluez-manager/Makefile.in @@ -335,13 +335,13 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = \ -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ + -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/generated \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging noinst_LTLIBRARIES = libbluez-manager.la diff --git a/src/bluez-manager/nm-bluez-adapter.h b/src/bluez-manager/nm-bluez-adapter.h index 36aa55dfe..8e53b40d1 100644 --- a/src/bluez-manager/nm-bluez-adapter.h +++ b/src/bluez-manager/nm-bluez-adapter.h @@ -31,7 +31,7 @@ #define NM_BLUEZ_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BLUEZ_ADAPTER, NMBluezAdapter)) #define NM_BLUEZ_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_BLUEZ_ADAPTER, NMBluezAdapterClass)) #define NM_IS_BLUEZ_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_BLUEZ_ADAPTER)) -#define NM_IS_BLUEZ_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_BLUEZ_ADAPTER)) +#define NM_IS_BLUEZ_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_BLUEZ_ADAPTER)) #define NM_BLUEZ_ADAPTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_BLUEZ_ADAPTER, NMBluezAdapterClass)) #define NM_BLUEZ_ADAPTER_PATH "path" diff --git a/src/bluez-manager/nm-bluez-device.h b/src/bluez-manager/nm-bluez-device.h index f5fdbf5fb..18f9fc30a 100644 --- a/src/bluez-manager/nm-bluez-device.h +++ b/src/bluez-manager/nm-bluez-device.h @@ -31,7 +31,7 @@ #define NM_BLUEZ_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BLUEZ_DEVICE, NMBluezDevice)) #define NM_BLUEZ_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_BLUEZ_DEVICE, NMBluezDeviceClass)) #define NM_IS_BLUEZ_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_BLUEZ_DEVICE)) -#define NM_IS_BLUEZ_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_BLUEZ_DEVICE)) +#define NM_IS_BLUEZ_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_BLUEZ_DEVICE)) #define NM_BLUEZ_DEVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_BLUEZ_DEVICE, NMBluezDeviceClass)) #define NM_BLUEZ_DEVICE_PATH "path" diff --git a/src/bluez-manager/nm-bluez-manager.c b/src/bluez-manager/nm-bluez-manager.c index 4290f618b..a68486319 100644 --- a/src/bluez-manager/nm-bluez-manager.c +++ b/src/bluez-manager/nm-bluez-manager.c @@ -185,6 +185,7 @@ default_adapter_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data) G_TYPE_INVALID)) { /* Ignore "No such adapter" errors; just means bluetooth isn't active */ if ( !dbus_g_error_has_name (err, "org.bluez.Error.NoSuchAdapter") + && !dbus_g_error_has_name (err, "org.freedesktop.systemd1.LoadFailed") && !g_error_matches (err, DBUS_GERROR, DBUS_GERROR_SERVICE_UNKNOWN)) { nm_log_warn (LOGD_BT, "bluez error getting default adapter: %s", err && err->message ? err->message : "(unknown)"); diff --git a/src/bluez-manager/nm-bluez-manager.h b/src/bluez-manager/nm-bluez-manager.h index 1549e6996..2bfc971eb 100644 --- a/src/bluez-manager/nm-bluez-manager.h +++ b/src/bluez-manager/nm-bluez-manager.h @@ -33,7 +33,7 @@ G_BEGIN_DECLS #define NM_BLUEZ_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BLUEZ_MANAGER, NMBluezManager)) #define NM_BLUEZ_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_BLUEZ_MANAGER, NMBluezManagerClass)) #define NM_IS_BLUEZ_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_BLUEZ_MANAGER)) -#define NM_IS_BLUEZ_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_BLUEZ_MANAGER)) +#define NM_IS_BLUEZ_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_BLUEZ_MANAGER)) #define NM_BLUEZ_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_BLUEZ_MANAGER, NMBluezManagerClass)) #define NM_BLUEZ_MANAGER_BDADDR_ADDED "bdaddr-added" diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am index 11560fde8..602867039 100644 --- a/src/dhcp-manager/Makefile.am +++ b/src/dhcp-manager/Makefile.am @@ -2,14 +2,14 @@ SUBDIRS=. tests INCLUDES = \ -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/src/generated \ + -I${top_srcdir}/include \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/posix-signals \ - -I${top_srcdir}/libnm-util \ -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util \ -I${top_srcdir}/src noinst_LTLIBRARIES = libdhcp-manager.la libdhcp-dhclient.la diff --git a/src/dhcp-manager/Makefile.in b/src/dhcp-manager/Makefile.in index e7934626a..34848e4cf 100644 --- a/src/dhcp-manager/Makefile.in +++ b/src/dhcp-manager/Makefile.in @@ -384,14 +384,14 @@ top_srcdir = @top_srcdir@ SUBDIRS = . tests INCLUDES = \ -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/src/generated \ + -I${top_srcdir}/include \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/posix-signals \ - -I${top_srcdir}/libnm-util \ -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util \ -I${top_srcdir}/src noinst_LTLIBRARIES = libdhcp-manager.la libdhcp-dhclient.la diff --git a/src/dhcp-manager/nm-dhcp-client.h b/src/dhcp-manager/nm-dhcp-client.h index 19c7365ed..b93515f48 100644 --- a/src/dhcp-manager/nm-dhcp-client.h +++ b/src/dhcp-manager/nm-dhcp-client.h @@ -31,7 +31,7 @@ #define NM_DHCP_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_CLIENT, NMDHCPClient)) #define NM_DHCP_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_CLIENT, NMDHCPClientClass)) #define NM_IS_DHCP_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_CLIENT)) -#define NM_IS_DHCP_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DHCP_CLIENT)) +#define NM_IS_DHCP_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_CLIENT)) #define NM_DHCP_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_CLIENT, NMDHCPClientClass)) #define NM_DHCP_CLIENT_INTERFACE "iface" diff --git a/src/dhcp-manager/nm-dhcp-dhclient.h b/src/dhcp-manager/nm-dhcp-dhclient.h index be242de05..f3da6014c 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.h +++ b/src/dhcp-manager/nm-dhcp-dhclient.h @@ -28,7 +28,7 @@ #define NM_DHCP_DHCLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclient)) #define NM_DHCP_DHCLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientClass)) #define NM_IS_DHCP_DHCLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_DHCLIENT)) -#define NM_IS_DHCP_DHCLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DHCP_DHCLIENT)) +#define NM_IS_DHCP_DHCLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_DHCLIENT)) #define NM_DHCP_DHCLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientClass)) typedef struct { diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.h b/src/dhcp-manager/nm-dhcp-dhcpcd.h index 586c56978..4ddc1089a 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.h +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.h @@ -28,7 +28,7 @@ #define NM_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_DHCPCD, NMDHCPDhcpcd)) #define NM_DHCP_DHCPCD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_DHCPCD, NMDHCPDhcpcdClass)) #define NM_IS_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_DHCPCD)) -#define NM_IS_DHCP_DHCPCD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DHCP_DHCPCD)) +#define NM_IS_DHCP_DHCPCD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_DHCPCD)) #define NM_DHCP_DHCPCD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_DHCPCD, NMDHCPDhcpcdClass)) typedef struct { diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h index d585c1425..fe3290461 100644 --- a/src/dhcp-manager/nm-dhcp-manager.h +++ b/src/dhcp-manager/nm-dhcp-manager.h @@ -47,7 +47,7 @@ GQuark nm_dhcp_manager_error_quark (void); #define NM_DHCP_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_MANAGER, NMDHCPManager)) #define NM_DHCP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_MANAGER, NMDHCPManagerClass)) #define NM_IS_DHCP_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_MANAGER)) -#define NM_IS_DHCP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DHCP_MANAGER)) +#define NM_IS_DHCP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_MANAGER)) #define NM_DHCP_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_MANAGER, NMDHCPManagerClass)) typedef struct { diff --git a/src/dns-manager/Makefile.am b/src/dns-manager/Makefile.am index fd31b140c..c6c284461 100644 --- a/src/dns-manager/Makefile.am +++ b/src/dns-manager/Makefile.am @@ -25,7 +25,8 @@ libdns_manager_la_CPPFLAGS = \ $(LIBNL_CFLAGS) \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ - -DLOCALSTATEDIR=\"$(localstatedir)\" + -DLOCALSTATEDIR=\"$(localstatedir)\" \ + -DSYSCONFDIR=\"$(sysconfdir)\" libdns_manager_la_LIBADD = \ $(top_builddir)/src/logging/libnm-logging.la \ diff --git a/src/dns-manager/Makefile.in b/src/dns-manager/Makefile.in index 3d7bfd9e3..473e34654 100644 --- a/src/dns-manager/Makefile.in +++ b/src/dns-manager/Makefile.in @@ -361,7 +361,8 @@ libdns_manager_la_CPPFLAGS = \ $(LIBNL_CFLAGS) \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ - -DLOCALSTATEDIR=\"$(localstatedir)\" + -DLOCALSTATEDIR=\"$(localstatedir)\" \ + -DSYSCONFDIR=\"$(sysconfdir)\" libdns_manager_la_LIBADD = \ $(top_builddir)/src/logging/libnm-logging.la \ diff --git a/src/dns-manager/nm-dns-bind.h b/src/dns-manager/nm-dns-bind.h index 7127265f1..d3ab38197 100644 --- a/src/dns-manager/nm-dns-bind.h +++ b/src/dns-manager/nm-dns-bind.h @@ -28,7 +28,7 @@ #define NM_DNS_BIND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNS_BIND, NMDnsBind)) #define NM_DNS_BIND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DNS_BIND, NMDnsBindClass)) #define NM_IS_DNS_BIND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DNS_BIND)) -#define NM_IS_DNS_BIND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DNS_BIND)) +#define NM_IS_DNS_BIND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DNS_BIND)) #define NM_DNS_BIND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNS_BIND, NMDnsBindClass)) typedef struct { diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index 8e216f4d2..9090e26bc 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -41,6 +41,7 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsmasq, NM_TYPE_DNS_PLUGIN) #define PIDFILE LOCALSTATEDIR "/run/nm-dns-dnsmasq.pid" #define CONFFILE LOCALSTATEDIR "/run/nm-dns-dnsmasq.conf" +#define CONFDIR SYSCONFDIR "/NetworkManager/dnsmasq.d" typedef struct { guint32 foo; @@ -246,7 +247,7 @@ update (NMDnsPlugin *plugin, NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin); GString *conf; GSList *iter; - const char *argv[11]; + const char *argv[12]; GError *error = NULL; int ignored; GPid pid = 0; @@ -309,7 +310,8 @@ update (NMDnsPlugin *plugin, argv[7] = "--conf-file=" CONFFILE; argv[8] = "--cache-size=400"; argv[9] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */ - argv[10] = NULL; + argv[10] = "--conf-dir=" CONFDIR; + argv[11] = NULL; /* And finally spawn dnsmasq */ pid = nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, PIDFILE, "bin/dnsmasq"); diff --git a/src/dns-manager/nm-dns-dnsmasq.h b/src/dns-manager/nm-dns-dnsmasq.h index 6491b271a..01ec57913 100644 --- a/src/dns-manager/nm-dns-dnsmasq.h +++ b/src/dns-manager/nm-dns-dnsmasq.h @@ -28,7 +28,7 @@ #define NM_DNS_DNSMASQ(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNS_DNSMASQ, NMDnsDnsmasq)) #define NM_DNS_DNSMASQ_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DNS_DNSMASQ, NMDnsDnsmasqClass)) #define NM_IS_DNS_DNSMASQ(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DNS_DNSMASQ)) -#define NM_IS_DNS_DNSMASQ_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DNS_DNSMASQ)) +#define NM_IS_DNS_DNSMASQ_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DNS_DNSMASQ)) #define NM_DNS_DNSMASQ_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNS_DNSMASQ, NMDnsDnsmasqClass)) typedef struct { diff --git a/src/dns-manager/nm-dns-plugin.h b/src/dns-manager/nm-dns-plugin.h index 37dd7336f..de4ad84e9 100644 --- a/src/dns-manager/nm-dns-plugin.h +++ b/src/dns-manager/nm-dns-plugin.h @@ -26,7 +26,7 @@ #define NM_DNS_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNS_PLUGIN, NMDnsPlugin)) #define NM_DNS_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DNS_PLUGIN, NMDnsPluginClass)) #define NM_IS_DNS_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DNS_PLUGIN)) -#define NM_IS_DNS_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DNS_PLUGIN)) +#define NM_IS_DNS_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DNS_PLUGIN)) #define NM_DNS_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNS_PLUGIN, NMDnsPluginClass)) #define NM_DNS_PLUGIN_FAILED "failed" diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.h b/src/dnsmasq-manager/nm-dnsmasq-manager.h index 1214d06b4..e98a6adb5 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.h +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.h @@ -30,7 +30,7 @@ #define NM_DNSMASQ_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNSMASQ_MANAGER, NMDnsMasqManager)) #define NM_DNSMASQ_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DNSMASQ_MANAGER, NMDnsMasqManagerClass)) #define NM_IS_DNSMASQ_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DNSMASQ_MANAGER)) -#define NM_IS_DNSMASQ_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DNSMASQ_MANAGER)) +#define NM_IS_DNSMASQ_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DNSMASQ_MANAGER)) #define NM_DNSMASQ_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNSMASQ_MANAGER, NMDnsMasqManagerClass)) typedef enum { diff --git a/src/generated/Makefile.am b/src/generated/Makefile.am index b7f13b88c..252973cda 100644 --- a/src/generated/Makefile.am +++ b/src/generated/Makefile.am @@ -57,9 +57,12 @@ INCLUDES = \ -I$(top_srcdir)/src/firewall-manager \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/wifi \ - -I$(top_srcdir)/src/wimax \ -I$(top_srcdir)/libnm-util +if WITH_WIMAX +INCLUDES += -I$(top_srcdir)/src/wimax +endif + libnm_generated_la_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ diff --git a/src/generated/Makefile.in b/src/generated/Makefile.in index 69c7f85c9..76697de5b 100644 --- a/src/generated/Makefile.in +++ b/src/generated/Makefile.in @@ -35,6 +35,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @WITH_WIMAX_TRUE@am__append_1 = $(top_srcdir)/src/wimax/*.[ch] +@WITH_WIMAX_TRUE@am__append_2 = -I$(top_srcdir)/src/wimax subdir = src/generated DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -359,27 +360,20 @@ nm_enum_types_sources = $(nm_daemon_sources) GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM nm_marshal_sources = $(nm_daemon_sources) -INCLUDES = \ - -I${top_srcdir}/include \ - -I${top_builddir}/include \ - -I${top_srcdir}/src \ - -I${top_srcdir}/src/logging \ +INCLUDES = -I${top_srcdir}/include -I${top_builddir}/include \ + -I${top_srcdir}/src -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/dns-manager \ -I${top_srcdir}/src/vpn-manager \ -I${top_srcdir}/src/dhcp-manager \ -I${top_srcdir}/src/ip6-manager \ -I${top_srcdir}/src/supplicant-manager \ - -I${top_srcdir}/src/backends \ - -I${top_srcdir}/src/ppp-manager \ + -I${top_srcdir}/src/backends -I${top_srcdir}/src/ppp-manager \ -I${top_srcdir}/src/dnsmasq-manager \ -I${top_srcdir}/src/modem-manager \ -I$(top_srcdir)/src/bluez-manager \ -I$(top_srcdir)/src/firewall-manager \ - -I$(top_srcdir)/src/settings \ - -I$(top_srcdir)/src/wifi \ - -I$(top_srcdir)/src/wimax \ - -I$(top_srcdir)/libnm-util - + -I$(top_srcdir)/src/settings -I$(top_srcdir)/src/wifi \ + -I$(top_srcdir)/libnm-util $(am__append_2) libnm_generated_la_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ diff --git a/src/generated/nm-enum-types.c b/src/generated/nm-enum-types.c index bdae29972..f5831a486 100644 --- a/src/generated/nm-enum-types.c +++ b/src/generated/nm-enum-types.c @@ -5,48 +5,48 @@ #include "nm-enum-types.h" -#include "nm-ip4-config.h" -#include "nm-device-olpc-mesh.h" #include "nm-hostname-provider.h" #include "nm-device.h" -#include "nm-rfkill.h" #include "NetworkManagerUtils.h" -#include "nm-device-vlan.h" +#include "nm-system.h" #include "nm-device-factory.h" #include "nm-active-connection.h" #include "nm-wifi-ap.h" +#include "nm-device-ethernet.h" #include "nm-device-bt.h" -#include "nm-device-private.h" +#include "nm-call-store.h" +#include "nm-device-infiniband.h" #include "nm-device-wifi.h" #include "nm-dbus-manager.h" +#include "nm-device-wired.h" +#include "nm-device-private.h" #include "nm-dhcp4-config.h" #include "nm-dhcp6-config.h" +#include "nm-session-utils.h" #include "nm-netlink-compat.h" #include "nm-session-monitor.h" +#include "nm-ip4-config.h" #include "nm-device-bond.h" #include "nm-wifi-ap-utils.h" #include "nm-device-adsl.h" #include "nm-policy-hosts.h" -#include "nm-udev-manager.h" +#include "nm-rfkill.h" #include "nm-connection-provider.h" #include "nm-manager.h" #include "nm-device-modem.h" -#include "nm-device-wired.h" #include "nm-activation-request.h" -#include "nm-session-utils.h" #include "nm-policy-hostname.h" -#include "nm-device-infiniband.h" #include "nm-properties-changed-signal.h" #include "nm-ip6-config.h" -#include "nm-call-store.h" #include "nm-policy.h" #include "nm-manager-auth.h" #include "nm-config.h" #include "nm-netlink-utils.h" #include "nm-netlink-monitor.h" -#include "nm-system.h" +#include "nm-udev-manager.h" #include "nm-connectivity.h" -#include "nm-device-ethernet.h" +#include "nm-device-vlan.h" +#include "nm-device-olpc-mesh.h" #include "nm-logging.h" #include "nm-dns-utils.h" #include "nm-dns-plugin.h" @@ -91,182 +91,156 @@ #include "nm-settings-error.h" #include "nm-agent-manager.h" #include "nm-inotify-helper.h" -#include "nm-secret-agent.h" -#include "nm-device-wimax.h" -#include "iwmxsdk.h" -#include "nm-wimax-types.h" -#include "nm-wimax-util.h" -#include "nm-wimax-nsp.h" +#include "nm-secret-agent.h" GType -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_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 ("NMIP4ConfigCompareFlags"), 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_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_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_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 ("NMOlpcMeshError"), 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_device_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_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_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 ("NMDeviceError"), 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_rf_kill_state_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[] = { - { RFKILL_UNBLOCKED, "RFKILL_UNBLOCKED", "unblocked" }, - { RFKILL_SOFT_BLOCKED, "RFKILL_SOFT_BLOCKED", "soft-blocked" }, - { RFKILL_HARD_BLOCKED, "RFKILL_HARD_BLOCKED", "hard-blocked" }, + { 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 ("RfKillState"), 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_type_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_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_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 ("RfKillType"), 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_vlan_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_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_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" }, { 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 ("NMWifiError"), 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_wifi_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_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_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 ("NMWifiError"), values); + g_enum_register_static (g_intern_static_string ("NMIP4ConfigCompareFlags"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } @@ -313,89 +287,90 @@ nm_adsl_error_get_type (void) return g_define_type_id__volatile; } GType -nm_manager_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_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" }, + { 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 ("NMManagerError"), 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_act_request_dependency_result_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_ACT_REQUEST_DEP_RESULT_UNKNOWN, "NM_ACT_REQUEST_DEP_RESULT_UNKNOWN", "unknown" }, - { NM_ACT_REQUEST_DEP_RESULT_WAIT, "NM_ACT_REQUEST_DEP_RESULT_WAIT", "wait" }, - { NM_ACT_REQUEST_DEP_RESULT_READY, "NM_ACT_REQUEST_DEP_RESULT_READY", "ready" }, - { NM_ACT_REQUEST_DEP_RESULT_FAILED, "NM_ACT_REQUEST_DEP_RESULT_FAILED", "failed" }, + { 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 ("NMActRequestDependencyResult"), 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_session_monitor_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_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_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" }, { 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 ("NMManagerError"), 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_act_request_dependency_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[] = { - { 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" }, + { NM_ACT_REQUEST_DEP_RESULT_UNKNOWN, "NM_ACT_REQUEST_DEP_RESULT_UNKNOWN", "unknown" }, + { NM_ACT_REQUEST_DEP_RESULT_WAIT, "NM_ACT_REQUEST_DEP_RESULT_WAIT", "wait" }, + { NM_ACT_REQUEST_DEP_RESULT_READY, "NM_ACT_REQUEST_DEP_RESULT_READY", "ready" }, + { NM_ACT_REQUEST_DEP_RESULT_FAILED, "NM_ACT_REQUEST_DEP_RESULT_FAILED", "failed" }, { 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 ("NMActRequestDependencyResult"), values); g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } @@ -515,20 +490,40 @@ nm_netlink_monitor_error_get_type (void) return g_define_type_id__volatile; } GType -nm_ethernet_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_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_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 ("NMEthernetError"), 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_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); } @@ -889,48 +884,6 @@ nm_agent_manager_error_get_type (void) return g_define_type_id__volatile; } -GType -nm_wimax_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_WIMAX_ERROR_CONNECTION_NOT_WIMAX, "NM_WIMAX_ERROR_CONNECTION_NOT_WIMAX", "ConnectionNotWimax" }, - { NM_WIMAX_ERROR_CONNECTION_INVALID, "NM_WIMAX_ERROR_CONNECTION_INVALID", "ConnectionInvalid" }, - { NM_WIMAX_ERROR_CONNECTION_INCOMPATIBLE, "NM_WIMAX_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" }, - { NM_WIMAX_ERROR_NSP_NOT_FOUND, "NM_WIMAX_ERROR_NSP_NOT_FOUND", "NspNotFound" }, - { 0, NULL, NULL } - }; - GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMWimaxError"), values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - - return g_define_type_id__volatile; -} -GType -nm_wimax_nsp_network_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_WIMAX_NSP_NETWORK_TYPE_UNKNOWN, "NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN", "unknown" }, - { NM_WIMAX_NSP_NETWORK_TYPE_HOME, "NM_WIMAX_NSP_NETWORK_TYPE_HOME", "home" }, - { NM_WIMAX_NSP_NETWORK_TYPE_PARTNER, "NM_WIMAX_NSP_NETWORK_TYPE_PARTNER", "partner" }, - { NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER, "NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER", "roaming-partner" }, - { 0, NULL, NULL } - }; - GType g_define_type_id = - g_enum_register_static (g_intern_static_string ("NMWimaxNspNetworkType"), values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - - return g_define_type_id__volatile; -} diff --git a/src/generated/nm-enum-types.h b/src/generated/nm-enum-types.h index 608eaad68..a18b12856 100644 --- a/src/generated/nm-enum-types.h +++ b/src/generated/nm-enum-types.h @@ -9,34 +9,32 @@ #include <glib-object.h> G_BEGIN_DECLS -GType nm_ip4_config_compare_flags_get_type (void) G_GNUC_CONST; -#define NM_TYPE_IP4_CONFIG_COMPARE_FLAGS (nm_ip4_config_compare_flags_get_type ()) -GType nm_olpc_mesh_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_OLPC_MESH_ERROR (nm_olpc_mesh_error_get_type ()) GType nm_device_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_DEVICE_ERROR (nm_device_error_get_type ()) -GType nm_rf_kill_state_get_type (void) G_GNUC_CONST; -#define NM_TYPE_RF_KILL_STATE (nm_rf_kill_state_get_type ()) -GType nm_rf_kill_type_get_type (void) G_GNUC_CONST; -#define NM_TYPE_RF_KILL_TYPE (nm_rf_kill_type_get_type ()) -GType nm_vlan_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_VLAN_ERROR (nm_vlan_error_get_type ()) +GType nm_ethernet_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_ETHERNET_ERROR (nm_ethernet_error_get_type ()) GType nm_bt_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_BT_ERROR (nm_bt_error_get_type ()) +GType nm_infiniband_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_INFINIBAND_ERROR (nm_infiniband_error_get_type ()) GType nm_wifi_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_WIFI_ERROR (nm_wifi_error_get_type ()) +GType nm_session_monitor_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_SESSION_MONITOR_ERROR (nm_session_monitor_error_get_type ()) +GType nm_ip4_config_compare_flags_get_type (void) G_GNUC_CONST; +#define NM_TYPE_IP4_CONFIG_COMPARE_FLAGS (nm_ip4_config_compare_flags_get_type ()) GType nm_bond_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_BOND_ERROR (nm_bond_error_get_type ()) GType nm_adsl_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_ADSL_ERROR (nm_adsl_error_get_type ()) +GType nm_rf_kill_state_get_type (void) G_GNUC_CONST; +#define NM_TYPE_RF_KILL_STATE (nm_rf_kill_state_get_type ()) +GType nm_rf_kill_type_get_type (void) G_GNUC_CONST; +#define NM_TYPE_RF_KILL_TYPE (nm_rf_kill_type_get_type ()) GType nm_manager_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_MANAGER_ERROR (nm_manager_error_get_type ()) GType nm_act_request_dependency_result_get_type (void) G_GNUC_CONST; #define NM_TYPE_ACT_REQUEST_DEPENDENCY_RESULT (nm_act_request_dependency_result_get_type ()) -GType nm_session_monitor_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_SESSION_MONITOR_ERROR (nm_session_monitor_error_get_type ()) -GType nm_infiniband_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_INFINIBAND_ERROR (nm_infiniband_error_get_type ()) GType nm_ip6_config_compare_flags_get_type (void) G_GNUC_CONST; #define NM_TYPE_IP6_CONFIG_COMPARE_FLAGS (nm_ip6_config_compare_flags_get_type ()) GType nm_auth_call_result_get_type (void) G_GNUC_CONST; @@ -47,8 +45,10 @@ GType nm_nm_nl_prop_get_type (void) G_GNUC_CONST; #define NM_TYPE_NM_NL_PROP (nm_nm_nl_prop_get_type ()) GType nm_netlink_monitor_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_NETLINK_MONITOR_ERROR (nm_netlink_monitor_error_get_type ()) -GType nm_ethernet_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_ETHERNET_ERROR (nm_ethernet_error_get_type ()) +GType nm_vlan_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_VLAN_ERROR (nm_vlan_error_get_type ()) +GType nm_olpc_mesh_error_get_type (void) G_GNUC_CONST; +#define NM_TYPE_OLPC_MESH_ERROR (nm_olpc_mesh_error_get_type ()) GType nm_logging_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_LOGGING_ERROR (nm_logging_error_get_type ()) GType nm_dns_manager_error_get_type (void) G_GNUC_CONST; @@ -79,10 +79,6 @@ GType nm_settings_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_SETTINGS_ERROR (nm_settings_error_get_type ()) GType nm_agent_manager_error_get_type (void) G_GNUC_CONST; #define NM_TYPE_AGENT_MANAGER_ERROR (nm_agent_manager_error_get_type ()) -GType nm_wimax_error_get_type (void) G_GNUC_CONST; -#define NM_TYPE_WIMAX_ERROR (nm_wimax_error_get_type ()) -GType nm_wimax_nsp_network_type_get_type (void) G_GNUC_CONST; -#define NM_TYPE_WIMAX_NSP_NETWORK_TYPE (nm_wimax_nsp_network_type_get_type ()) G_END_DECLS #endif /* __NM_ENUM_TYPES_H__ */ diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am index 016fc25dd..be4b97134 100644 --- a/src/ip6-manager/Makefile.am +++ b/src/ip6-manager/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = \ -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ + -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ - -I${top_srcdir}/src/generated \ + -I${top_srcdir}/libnm-util \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src diff --git a/src/ip6-manager/Makefile.in b/src/ip6-manager/Makefile.in index 9214f64c9..7c3989620 100644 --- a/src/ip6-manager/Makefile.in +++ b/src/ip6-manager/Makefile.in @@ -333,12 +333,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = \ -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ + -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ - -I${top_srcdir}/src/generated \ + -I${top_srcdir}/libnm-util \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src diff --git a/src/ip6-manager/nm-ip6-manager.h b/src/ip6-manager/nm-ip6-manager.h index 2732c63ec..7ad0903f1 100644 --- a/src/ip6-manager/nm-ip6-manager.h +++ b/src/ip6-manager/nm-ip6-manager.h @@ -32,7 +32,7 @@ #define NM_IP6_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IP6_MANAGER, NMIP6Manager)) #define NM_IP6_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_IP6_MANAGER, NMIP6ManagerClass)) #define NM_IS_IP6_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_IP6_MANAGER)) -#define NM_IS_IP6_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_IP6_MANAGER)) +#define NM_IS_IP6_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP6_MANAGER)) #define NM_IP6_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP6_MANAGER, NMIP6ManagerClass)) enum { diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c index f54adcdd1..8ec22982b 100644 --- a/src/logging/nm-logging.c +++ b/src/logging/nm-logging.c @@ -261,13 +261,13 @@ fallback_get_backtrace (void) syslog (LOG_CRIT, "Frame %d: %s (%s+0x%lx) [%p]", i, name, info.dli_sname, - (gulong)(frames[i] - info.dli_saddr), + (gulong)((guchar *)frames[i] - (guchar *)info.dli_saddr), frames[i]); } else { syslog (LOG_CRIT, "Frame %d: %s (%p+0x%lx) [%p]", i, name, info.dli_fbase, - (gulong)(frames[i] - info.dli_saddr), + (gulong)((guchar *)frames[i] - (guchar *)info.dli_saddr), frames[i]); } } diff --git a/src/modem-manager/Makefile.am b/src/modem-manager/Makefile.am index a5c6a6681..b9cc76449 100644 --- a/src/modem-manager/Makefile.am +++ b/src/modem-manager/Makefile.am @@ -2,13 +2,13 @@ include $(GLIB_MAKEFILE) INCLUDES = \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/generated \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/libnm-util + -I${top_srcdir}/include \ + -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util noinst_LTLIBRARIES = libmodem-manager.la diff --git a/src/modem-manager/Makefile.in b/src/modem-manager/Makefile.in index c19ac7b9c..7d6a7f7b0 100644 --- a/src/modem-manager/Makefile.in +++ b/src/modem-manager/Makefile.in @@ -335,13 +335,13 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/generated \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/libnm-util + -I${top_srcdir}/include \ + -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util noinst_LTLIBRARIES = libmodem-manager.la libmodem_manager_la_SOURCES = \ diff --git a/src/nm-activation-request.h b/src/nm-activation-request.h index d7c094e6e..16467f9c3 100644 --- a/src/nm-activation-request.h +++ b/src/nm-activation-request.h @@ -31,7 +31,7 @@ #define NM_ACT_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ACT_REQUEST, NMActRequest)) #define NM_ACT_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_ACT_REQUEST, NMActRequestClass)) #define NM_IS_ACT_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_ACT_REQUEST)) -#define NM_IS_ACT_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_ACT_REQUEST)) +#define NM_IS_ACT_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_ACT_REQUEST)) #define NM_ACT_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_ACT_REQUEST, NMActRequestClass)) typedef enum { diff --git a/src/nm-active-connection.h b/src/nm-active-connection.h index 419cbcff9..49ff5adcd 100644 --- a/src/nm-active-connection.h +++ b/src/nm-active-connection.h @@ -28,7 +28,7 @@ #define NM_ACTIVE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnection)) #define NM_ACTIVE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnectionClass)) #define NM_IS_ACTIVE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_ACTIVE_CONNECTION)) -#define NM_IS_ACTIVE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_ACTIVE_CONNECTION)) +#define NM_IS_ACTIVE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_ACTIVE_CONNECTION)) #define NM_ACTIVE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnectionClass)) /* Properties */ diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h index cecc66766..6f6ee1651 100644 --- a/src/nm-connectivity.h +++ b/src/nm-connectivity.h @@ -31,7 +31,7 @@ #define NM_CONNECTIVITY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTIVITY, NMConnectivity)) #define NM_CONNECTIVITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_CONNECTIVITY, NMConnectivityClass)) #define NM_IS_CONNECTIVITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_CONNECTIVITY)) -#define NM_IS_CONNECTIVITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_CONNECTIVITY)) +#define NM_IS_CONNECTIVITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_CONNECTIVITY)) #define NM_CONNECTIVITY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_CONNECTIVITY, NMConnectivityClass)) /* Properties */ diff --git a/src/nm-device-modem.h b/src/nm-device-modem.h index 8453e3d94..85c626a36 100644 --- a/src/nm-device-modem.h +++ b/src/nm-device-modem.h @@ -31,7 +31,7 @@ #define NM_DEVICE_MODEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_MODEM, NMDeviceModem)) #define NM_DEVICE_MODEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_MODEM, NMDeviceModemClass)) #define NM_IS_DEVICE_MODEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_MODEM)) -#define NM_IS_DEVICE_MODEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DEVICE_MODEM)) +#define NM_IS_DEVICE_MODEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_MODEM)) #define NM_DEVICE_MODEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_MODEM, NMDeviceModemClass)) #define NM_DEVICE_MODEM_MODEM "modem" diff --git a/src/nm-device-vlan.c b/src/nm-device-vlan.c index b9c932348..59d955545 100644 --- a/src/nm-device-vlan.c +++ b/src/nm-device-vlan.c @@ -636,7 +636,11 @@ nm_device_vlan_new (const char *udi, const char *iface, NMDevice *parent) int vlan_id; itype = nm_system_get_iface_type (ifindex, iface); - g_assert (itype == NM_IFACE_TYPE_VLAN); + if (itype != NM_IFACE_TYPE_VLAN) { + nm_log_err (LOGD_DEVICE, "(%s): failed to get VLAN interface type.", iface); + g_object_unref (device); + return NULL; + } if (!nm_system_get_iface_vlan_info (ifindex, &parent_ifindex, &vlan_id)) { nm_log_warn (LOGD_DEVICE, "(%s): failed to get VLAN interface info.", iface); diff --git a/src/nm-device.c b/src/nm-device.c index 6eaa94da4..9432204db 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -2478,7 +2478,8 @@ nm_device_activate_schedule_stage3_ip_config_start (NMDevice *self) g_return_if_fail (priv->act_request); state = nm_device_get_state (self); - g_warn_if_fail (state >= NM_DEVICE_STATE_PREPARE && state <= NM_DEVICE_STATE_NEED_AUTH); + if (nm_act_request_get_assumed (priv->act_request) == FALSE) + g_warn_if_fail (state >= NM_DEVICE_STATE_PREPARE && state <= NM_DEVICE_STATE_NEED_AUTH); /* Add the interface to the specified firewall zone */ connection = nm_device_get_connection (self); @@ -4687,8 +4688,6 @@ ip4_match_config (NMDevice *self, NMConnection *connection) const char *method; s_ip4 = nm_connection_get_setting_ip4_config (connection); - if (!s_ip4) - return FALSE; /* Get any saved leases that apply to this connection */ dhcp_mgr = nm_dhcp_manager_get (); @@ -4697,7 +4696,7 @@ ip4_match_config (NMDevice *self, NMConnection *connection) nm_connection_get_uuid (connection)); g_object_unref (dhcp_mgr); - method = nm_setting_ip4_config_get_method (s_ip4); + method = s_ip4 ? nm_setting_ip4_config_get_method (s_ip4) : NM_SETTING_IP4_CONFIG_METHOD_AUTO; if (!strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO)) { gboolean found = FALSE; @@ -4740,16 +4739,18 @@ ip4_match_config (NMDevice *self, NMConnection *connection) /* Everything below for static addressing */ /* Find all IP4 addresses of this connection on the device */ - num = nm_setting_ip4_config_get_num_addresses (s_ip4); - for (i = 0; i < num; i++) { - NMIP4Address *addr = nm_setting_ip4_config_get_address (s_ip4, i); - struct in_addr tmp = { .s_addr = nm_ip4_address_get_address (addr) }; - - if (!nm_netlink_find_address (nm_device_get_ip_ifindex (self), - AF_INET, - &tmp, - nm_ip4_address_get_prefix (addr))) - return FALSE; + if (s_ip4) { + num = nm_setting_ip4_config_get_num_addresses (s_ip4); + for (i = 0; i < num; i++) { + NMIP4Address *addr = nm_setting_ip4_config_get_address (s_ip4, i); + struct in_addr tmp = { .s_addr = nm_ip4_address_get_address (addr) }; + + if (!nm_netlink_find_address (nm_device_get_ip_ifindex (self), + AF_INET, + &tmp, + nm_ip4_address_get_prefix (addr))) + return FALSE; + } } /* Success; all the connection's static IP addresses are assigned to the device */ diff --git a/src/nm-dhcp4-config.h b/src/nm-dhcp4-config.h index 4729da4c1..c5d78db9e 100644 --- a/src/nm-dhcp4-config.h +++ b/src/nm-dhcp4-config.h @@ -28,7 +28,7 @@ #define NM_DHCP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP4_CONFIG, NMDHCP4Config)) #define NM_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP4_CONFIG, NMDHCP4ConfigClass)) #define NM_IS_DHCP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP4_CONFIG)) -#define NM_IS_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DHCP4_CONFIG)) +#define NM_IS_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP4_CONFIG)) #define NM_DHCP4_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP4_CONFIG, NMDHCP4ConfigClass)) typedef struct { diff --git a/src/nm-dhcp6-config.h b/src/nm-dhcp6-config.h index 5e83b904f..ef742ac4a 100644 --- a/src/nm-dhcp6-config.h +++ b/src/nm-dhcp6-config.h @@ -28,7 +28,7 @@ #define NM_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP6_CONFIG, NMDHCP6Config)) #define NM_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP6_CONFIG, NMDHCP6ConfigClass)) #define NM_IS_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP6_CONFIG)) -#define NM_IS_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DHCP6_CONFIG)) +#define NM_IS_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP6_CONFIG)) #define NM_DHCP6_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP6_CONFIG, NMDHCP6ConfigClass)) typedef struct { diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index 6b86bc477..5433768cd 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -30,7 +30,7 @@ #define NM_IP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IP4_CONFIG, NMIP4Config)) #define NM_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_IP4_CONFIG, NMIP4ConfigClass)) #define NM_IS_IP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_IP4_CONFIG)) -#define NM_IS_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_IP4_CONFIG)) +#define NM_IS_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP4_CONFIG)) #define NM_IP4_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP4_CONFIG, NMIP4ConfigClass)) typedef struct { diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h index 2e8ae18f4..158f54945 100644 --- a/src/nm-ip6-config.h +++ b/src/nm-ip6-config.h @@ -30,7 +30,7 @@ #define NM_IP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IP6_CONFIG, NMIP6Config)) #define NM_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_IP6_CONFIG, NMIP6ConfigClass)) #define NM_IS_IP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_IP6_CONFIG)) -#define NM_IS_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_IP6_CONFIG)) +#define NM_IS_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP6_CONFIG)) #define NM_IP6_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP6_CONFIG, NMIP6ConfigClass)) typedef struct { diff --git a/src/nm-manager.h b/src/nm-manager.h index 58ba46052..91d1c4109 100644 --- a/src/nm-manager.h +++ b/src/nm-manager.h @@ -32,7 +32,7 @@ #define NM_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MANAGER, NMManager)) #define NM_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_MANAGER, NMManagerClass)) #define NM_IS_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MANAGER)) -#define NM_IS_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_MANAGER)) +#define NM_IS_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_MANAGER)) #define NM_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_MANAGER, NMManagerClass)) typedef enum { diff --git a/src/nm-session-monitor-systemd.c b/src/nm-session-monitor-systemd.c index 29ba7c214..dc94aab6d 100644 --- a/src/nm-session-monitor-systemd.c +++ b/src/nm-session-monitor-systemd.c @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU Lesser General * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. * * Author: Matthias Clasen */ diff --git a/src/nm-system.c b/src/nm-system.c index b980dc539..09e1da586 100644 --- a/src/nm-system.c +++ b/src/nm-system.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2004 - 2010 Red Hat, Inc. + * Copyright (C) 2004 - 2012 Red Hat, Inc. * Copyright (C) 2005 - 2008 Novell, Inc. * Copyright (C) 1996 - 1997 Yoichi Hariguchi <yoichi@fore.com> * Copyright (C) January, 1998 Sergei Viznyuk <sv@phystech.com> @@ -44,6 +44,7 @@ #include <linux/if.h> #include <linux/sockios.h> #include <linux/if_bonding.h> +#include <linux/if_vlan.h> #include "nm-system.h" #include "nm-device.h" @@ -1734,6 +1735,63 @@ nm_system_iface_release (gint master_ifindex, } /** + * nm_system_get_iface_type_compat: + * @ifindex: interface index + * @name: name of interface + * + * Lookup the type of an interface. At least one of @ifindex or @name must + * be provided. + * + * Returns: Interface type (NM_IFACE_TYPE_*) or NM_IFACE_TYPE_UNSPEC. + **/ +static int +nm_system_compat_get_iface_type (int ifindex, const char *name) +{ + int res = NM_IFACE_TYPE_UNSPEC; + char *ifname = NULL; + struct vlan_ioctl_args ifv; + struct ifreq ifr; + struct ifbond ifb; + int fd; + + g_return_val_if_fail (ifindex > 0 || name, NM_IFACE_TYPE_UNSPEC); + + if ((fd = socket (AF_INET, SOCK_STREAM, 0)) < 0) { + nm_log_err (LOGD_DEVICE, "couldn't open control socket."); + goto out; + } + + if (!name) { + g_assert (ifindex > 0); + ifname = nm_netlink_index_to_iface (ifindex); + } + + /* Check VLAN */ + memset (&ifv, 0, sizeof (ifv)); + ifv.cmd = GET_VLAN_VID_CMD; + strncpy (ifv.device1, ifname ? ifname : name, sizeof (ifv.device1) - 1); + if (ioctl (fd, SIOCGIFVLAN, &ifv) == 0) { + res = NM_IFACE_TYPE_VLAN; + goto out; + } + + /* and bond */ + memset (&ifr, 0, sizeof (ifr)); + strncpy (ifr.ifr_name, ifname ? ifname : name, sizeof (ifr.ifr_name) - 1); + memset (&ifb, 0, sizeof (ifb)); + ifr.ifr_data = (caddr_t) &ifb; + if (ioctl (fd, SIOCBONDINFOQUERY, &ifr) == 0) { + res = NM_IFACE_TYPE_BOND; + goto out; + } + +out: + close (fd); + g_free (ifname); + return res; +} + +/** * nm_system_get_iface_type: * @ifindex: interface index * @name: name of interface @@ -1750,6 +1808,7 @@ nm_system_get_iface_type (int ifindex, const char *name) struct nl_sock *nlh; char *type; int res = NM_IFACE_TYPE_UNSPEC; + int err; g_return_val_if_fail (ifindex > 0 || name, NM_IFACE_TYPE_UNSPEC); @@ -1758,8 +1817,12 @@ nm_system_get_iface_type (int ifindex, const char *name) goto out; /* Prefer interface indexes to names */ - if (rtnl_link_get_kernel (nlh, ifindex, ifindex < 0 ? name : NULL, &result) < 0) + err = rtnl_link_get_kernel (nlh, ifindex, ifindex < 0 ? name : NULL, &result); + if (err < 0) { + if (err == -NLE_OPNOTSUPP) + res = nm_system_compat_get_iface_type (ifindex, name); goto out; + } type = rtnl_link_get_type (result); @@ -1901,7 +1964,7 @@ nm_system_iface_compat_add_vlan_device (const char *master, int vid) if_request.u.VID = vid; if (ioctl (fd, SIOCSIFVLAN, &if_request) < 0) { - nm_log_err (LOGD_DEVICE, "couldn't add vlan device %s vid %d.", master, vid); + nm_log_err (LOGD_DEVICE, "couldn't add vlan device %s vid %d: %d.", master, vid, errno); close (fd); return FALSE; } @@ -1937,8 +2000,8 @@ nm_system_iface_compat_rem_vlan_device (const char *iface) static gboolean nm_system_iface_compat_add_vlan (NMConnection *connection, - const char *iface, - int master_ifindex) + const char *iface, + int master_ifindex) { NMSettingVlan *s_vlan; int vlan_id; @@ -1947,7 +2010,8 @@ nm_system_iface_compat_add_vlan (NMConnection *connection, int ifindex; struct rtnl_link *new_link = NULL; char *master = nm_netlink_index_to_iface (master_ifindex); - char *name = NULL; + int itype; + gboolean created = FALSE; s_vlan = nm_connection_get_setting_vlan (connection); g_return_val_if_fail (s_vlan, FALSE); @@ -1959,78 +2023,106 @@ nm_system_iface_compat_add_vlan (NMConnection *connection, g_return_val_if_fail (iface != NULL, FALSE); } - /* - * Use VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD as default, - * we will overwrite it with rtnl_link_set_name() later. - */ - name = nm_utils_new_vlan_name(master, vlan_id); + itype = nm_system_get_iface_type (-1, iface); + if (itype == NM_IFACE_TYPE_UNSPEC) { + char *name; + + /* Create the VLAN interface. Use VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD as + * default and change the name later via nm_system_iface_compat_set_name(). + * The old ioctl-based VLAN kernel API has no ability to directly return + * the new interface's name or index, so we have to create it with a + * known name and do the rename dance instead. + */ + if (!nm_system_iface_compat_add_vlan_device (master, vlan_id)) + return FALSE; - /* - * vconfig add - */ + /* And rename it to what the connection wants */ + name = nm_utils_new_vlan_name (master, vlan_id); + if (strcmp (name, iface) != 0) { + if (!nm_system_iface_compat_set_name (name, iface)) { + nm_system_iface_compat_rem_vlan_device (name); + g_free (name); + return FALSE; + } + } + g_free (name); + created = TRUE; + } else if (itype != NM_IFACE_TYPE_VLAN) { + nm_log_err (LOGD_DEVICE, "(%s): already exists but is not a VLAN interface.", iface); + return FALSE; + } else { + int tmp_vlan_id = -1, tmp_master_ifindex = -1; + + /* VLAN interface with this name already exists. Be a bit paranoid and + * double-check the VLAN ID and parent ifindex. + */ + ifindex = nm_netlink_iface_to_index (iface); + if (ifindex <= 0) + return FALSE; - if (!nm_system_iface_compat_add_vlan_device (master, vlan_id)) - goto err_out; + if (!nm_system_get_iface_vlan_info (ifindex, &tmp_master_ifindex, &tmp_vlan_id)) { + nm_log_err (LOGD_DEVICE, "(%s): failed to get VLAN interface info.", iface); + return FALSE; + } - /* - * get corresponding rtnl_link - */ + if (tmp_master_ifindex != master_ifindex) { + nm_log_err (LOGD_DEVICE, "(%s): master ifindex (%d) does match expected (%d).", + iface, tmp_master_ifindex, master_ifindex); + return FALSE; + } - if (!nm_system_iface_compat_set_name (name, iface)) - goto err_out_delete_vlan_with_default_name; + if (tmp_vlan_id != vlan_id) { + nm_log_err (LOGD_DEVICE, "(%s): VLAN ID %d does match expected ID %d.", + iface, tmp_vlan_id, vlan_id); + return FALSE; + } + + nm_log_dbg (LOGD_DEVICE, "(%s): found existing VLAN interface.", iface); + } ifindex = nm_netlink_iface_to_index (iface); if (ifindex <= 0) - goto err_out; + goto error; new_link = nm_netlink_index_to_rtnl_link (ifindex); if (!new_link) - goto err_out_delete_vlan_with_default_name; + goto error; - /* - * vconfig set_flag - */ + /* vconfig set_flag */ vlan_flags = nm_setting_vlan_get_flags (s_vlan); - if (vlan_flags) + if (vlan_flags) { if (rtnl_link_vlan_set_flags (new_link, vlan_flags)) - goto err_out_delete_vlan_with_new_name; + goto error_new_link; + } - /* - * vconfig set_ingress_map - */ + /* vconfig set_ingress_map */ num = nm_setting_vlan_get_num_priorities (s_vlan, NM_VLAN_INGRESS_MAP); for (i = 0; i < num; i++) { - if (nm_setting_vlan_get_priority (s_vlan, NM_VLAN_INGRESS_MAP, i, &from, &to)) + if (nm_setting_vlan_get_priority (s_vlan, NM_VLAN_INGRESS_MAP, i, &from, &to)) { if (rtnl_link_vlan_set_ingress_map (new_link, from, to)) - goto err_out_delete_vlan_with_new_name; + goto error_new_link; + } } - /* - * vconfig set_egress_map - */ + /* vconfig set_egress_map */ num = nm_setting_vlan_get_num_priorities (s_vlan, NM_VLAN_EGRESS_MAP); for (i = 0; i < num; i++) { - if (nm_setting_vlan_get_priority (s_vlan, NM_VLAN_EGRESS_MAP, i, &from, &to)) + if (nm_setting_vlan_get_priority (s_vlan, NM_VLAN_EGRESS_MAP, i, &from, &to)) { if (rtnl_link_vlan_set_egress_map (new_link, from, to)) - goto err_out_delete_vlan_with_new_name; + goto error_new_link; + } } rtnl_link_put (new_link); return TRUE; -err_out: - g_free (name); - return FALSE; - -err_out_delete_vlan_with_default_name: - nm_system_iface_compat_rem_vlan_device (name); - g_free (name); - return FALSE; - -err_out_delete_vlan_with_new_name: +error_new_link: rtnl_link_put (new_link); - nm_system_iface_compat_rem_vlan_device (iface); - g_free (name); + /* fall through */ + +error: + if (created) + nm_system_iface_compat_rem_vlan_device (iface); return FALSE; } diff --git a/src/nm-udev-manager.h b/src/nm-udev-manager.h index 61d3b7cf2..2c982e6d0 100644 --- a/src/nm-udev-manager.h +++ b/src/nm-udev-manager.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define NM_UDEV_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_UDEV_MANAGER, NMUdevManager)) #define NM_UDEV_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_UDEV_MANAGER, NMUdevManagerClass)) #define NM_IS_UDEV_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_UDEV_MANAGER)) -#define NM_IS_UDEV_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_UDEV_MANAGER)) +#define NM_IS_UDEV_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_UDEV_MANAGER)) #define NM_UDEV_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_UDEV_MANAGER, NMUdevManagerClass)) typedef struct { diff --git a/src/nm-wifi-ap.h b/src/nm-wifi-ap.h index a00873231..2058deda6 100644 --- a/src/nm-wifi-ap.h +++ b/src/nm-wifi-ap.h @@ -31,7 +31,7 @@ #define NM_AP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_AP, NMAccessPoint)) #define NM_AP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_AP, NMAccessPointClass)) #define NM_IS_AP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_AP)) -#define NM_IS_AP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_AP)) +#define NM_IS_AP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_AP)) #define NM_AP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_AP, NMAccessPointClass)) #define NM_AP_FLAGS "flags" diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index 36e54ec93..9de581692 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = \ -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ + -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/generated \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/posix-signals diff --git a/src/ppp-manager/Makefile.in b/src/ppp-manager/Makefile.in index a7524dd06..79fdc2b3d 100644 --- a/src/ppp-manager/Makefile.in +++ b/src/ppp-manager/Makefile.in @@ -375,13 +375,13 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = \ -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ + -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/generated \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/posix-signals diff --git a/src/ppp-manager/nm-ppp-manager.h b/src/ppp-manager/nm-ppp-manager.h index c38602fc6..1b4bc1886 100644 --- a/src/ppp-manager/nm-ppp-manager.h +++ b/src/ppp-manager/nm-ppp-manager.h @@ -35,7 +35,7 @@ #define NM_PPP_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_PPP_MANAGER, NMPPPManager)) #define NM_PPP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_PPP_MANAGER, NMPPPManagerClass)) #define NM_IS_PPP_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_PPP_MANAGER)) -#define NM_IS_PPP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_PPP_MANAGER)) +#define NM_IS_PPP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_PPP_MANAGER)) #define NM_PPP_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_PPP_MANAGER, NMPPPManagerClass)) #define NM_PPP_MANAGER_PARENT_IFACE "parent-iface" diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am index 8024d5414..eb6190bbc 100644 --- a/src/settings/Makefile.am +++ b/src/settings/Makefile.am @@ -1,12 +1,12 @@ SUBDIRS=plugins . tests INCLUDES = -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ + -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ - -I${top_srcdir}/src/generated \ + -I${top_srcdir}/libnm-util \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src diff --git a/src/settings/Makefile.in b/src/settings/Makefile.in index 7cce8254b..682b8796d 100644 --- a/src/settings/Makefile.in +++ b/src/settings/Makefile.in @@ -394,12 +394,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = plugins . tests INCLUDES = -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ + -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ - -I${top_srcdir}/src/generated \ + -I${top_srcdir}/libnm-util \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src diff --git a/src/settings/nm-agent-manager.h b/src/settings/nm-agent-manager.h index 9e8de44bb..343f8a939 100644 --- a/src/settings/nm-agent-manager.h +++ b/src/settings/nm-agent-manager.h @@ -31,7 +31,7 @@ #define NM_AGENT_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_AGENT_MANAGER, NMAgentManager)) #define NM_AGENT_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_AGENT_MANAGER, NMAgentManagerClass)) #define NM_IS_AGENT_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_AGENT_MANAGER)) -#define NM_IS_AGENT_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_AGENT_MANAGER)) +#define NM_IS_AGENT_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_AGENT_MANAGER)) #define NM_AGENT_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_AGENT_MANAGER, NMAgentManagerClass)) typedef enum { diff --git a/src/settings/nm-default-wired-connection.h b/src/settings/nm-default-wired-connection.h index cf62d522a..bf185cd03 100644 --- a/src/settings/nm-default-wired-connection.h +++ b/src/settings/nm-default-wired-connection.h @@ -31,7 +31,7 @@ G_BEGIN_DECLS #define NM_DEFAULT_WIRED_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEFAULT_WIRED_CONNECTION, NMDefaultWiredConnection)) #define NM_DEFAULT_WIRED_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEFAULT_WIRED_CONNECTION, NMDefaultWiredConnectionClass)) #define NM_IS_DEFAULT_WIRED_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEFAULT_WIRED_CONNECTION)) -#define NM_IS_DEFAULT_WIRED_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DEFAULT_WIRED_CONNECTION)) +#define NM_IS_DEFAULT_WIRED_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEFAULT_WIRED_CONNECTION)) #define NM_DEFAULT_WIRED_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEFAULT_WIRED_CONNECTION, NMDefaultWiredConnectionClass)) typedef struct { diff --git a/src/settings/nm-inotify-helper.h b/src/settings/nm-inotify-helper.h index 10d43ac99..bdebaf8e4 100644 --- a/src/settings/nm-inotify-helper.h +++ b/src/settings/nm-inotify-helper.h @@ -29,7 +29,7 @@ #define NM_INOTIFY_HELPER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_INOTIFY_HELPER, NMInotifyHelper)) #define NM_INOTIFY_HELPER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_INOTIFY_HELPER, NMInotifyHelperClass)) #define NM_IS_INOTIFY_HELPER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_INOTIFY_HELPER)) -#define NM_IS_INOTIFY_HELPER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_INOTIFY_HELPER)) +#define NM_IS_INOTIFY_HELPER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_INOTIFY_HELPER)) #define NM_INOTIFY_HELPER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_INOTIFY_HELPER, NMInotifyHelperClass)) typedef struct { diff --git a/src/settings/nm-secret-agent.h b/src/settings/nm-secret-agent.h index 29b02be1b..1bb74eac5 100644 --- a/src/settings/nm-secret-agent.h +++ b/src/settings/nm-secret-agent.h @@ -34,7 +34,7 @@ #define NM_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT, NMSecretAgent)) #define NM_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SECRET_AGENT, NMSecretAgentClass)) #define NM_IS_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SECRET_AGENT)) -#define NM_IS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SECRET_AGENT)) +#define NM_IS_SECRET_AGENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SECRET_AGENT)) #define NM_SECRET_AGENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SECRET_AGENT, NMSecretAgentClass)) typedef struct { diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h index 077a145d0..9a0e866c4 100644 --- a/src/settings/nm-settings-connection.h +++ b/src/settings/nm-settings-connection.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS #define NM_SETTINGS_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTINGS_CONNECTION, NMSettingsConnection)) #define NM_SETTINGS_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTINGS_CONNECTION, NMSettingsConnectionClass)) #define NM_IS_SETTINGS_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTINGS_CONNECTION)) -#define NM_IS_SETTINGS_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTINGS_CONNECTION)) +#define NM_IS_SETTINGS_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTINGS_CONNECTION)) #define NM_SETTINGS_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTINGS_CONNECTION, NMSettingsConnectionClass)) #define NM_SETTINGS_CONNECTION_UPDATED "updated" diff --git a/src/settings/plugins/example/nm-example-connection.h b/src/settings/plugins/example/nm-example-connection.h index d6d09e16f..6d57a1ad2 100644 --- a/src/settings/plugins/example/nm-example-connection.h +++ b/src/settings/plugins/example/nm-example-connection.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS #define NM_EXAMPLE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_EXAMPLE_CONNECTION, NMExampleConnection)) #define NM_EXAMPLE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_EXAMPLE_CONNECTION, NMExampleConnectionClass)) #define NM_IS_EXAMPLE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_EXAMPLE_CONNECTION)) -#define NM_IS_EXAMPLE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_EXAMPLE_CONNECTION)) +#define NM_IS_EXAMPLE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_EXAMPLE_CONNECTION)) #define NM_EXAMPLE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_EXAMPLE_CONNECTION, NMExampleConnectionClass)) typedef struct { diff --git a/src/settings/plugins/example/plugin.h b/src/settings/plugins/example/plugin.h index 23b68e2e2..f10ee1c42 100644 --- a/src/settings/plugins/example/plugin.h +++ b/src/settings/plugins/example/plugin.h @@ -31,7 +31,7 @@ #define SC_PLUGIN_EXAMPLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_PLUGIN_EXAMPLE, SCPluginExample)) #define SC_PLUGIN_EXAMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_PLUGIN_EXAMPLE, SCPluginExampleClass)) #define SC_IS_PLUGIN_EXAMPLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_PLUGIN_EXAMPLE)) -#define SC_IS_PLUGIN_EXAMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), SC_TYPE_PLUGIN_EXAMPLE)) +#define SC_IS_PLUGIN_EXAMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_PLUGIN_EXAMPLE)) #define SC_PLUGIN_EXAMPLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SC_TYPE_PLUGIN_EXAMPLE, SCPluginExampleClass)) typedef struct { diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h index 731aa598c..5a36dcdfe 100644 --- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h +++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS #define NM_IFCFG_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IFCFG_CONNECTION, NMIfcfgConnection)) #define NM_IFCFG_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_IFCFG_CONNECTION, NMIfcfgConnectionClass)) #define NM_IS_IFCFG_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_IFCFG_CONNECTION)) -#define NM_IS_IFCFG_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_IFCFG_CONNECTION)) +#define NM_IS_IFCFG_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IFCFG_CONNECTION)) #define NM_IFCFG_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IFCFG_CONNECTION, NMIfcfgConnectionClass)) #define NM_IFCFG_CONNECTION_UNMANAGED "unmanaged" diff --git a/src/settings/plugins/ifcfg-rh/plugin.h b/src/settings/plugins/ifcfg-rh/plugin.h index d820a26e0..d37decfd6 100644 --- a/src/settings/plugins/ifcfg-rh/plugin.h +++ b/src/settings/plugins/ifcfg-rh/plugin.h @@ -30,7 +30,7 @@ #define SC_PLUGIN_IFCFG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_PLUGIN_IFCFG, SCPluginIfcfg)) #define SC_PLUGIN_IFCFG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_PLUGIN_IFCFG, SCPluginIfcfgClass)) #define SC_IS_PLUGIN_IFCFG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_PLUGIN_IFCFG)) -#define SC_IS_PLUGIN_IFCFG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), SC_TYPE_PLUGIN_IFCFG)) +#define SC_IS_PLUGIN_IFCFG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_PLUGIN_IFCFG)) #define SC_PLUGIN_IFCFG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SC_TYPE_PLUGIN_IFCFG, SCPluginIfcfgClass)) typedef struct _SCPluginIfcfg SCPluginIfcfg; diff --git a/src/settings/plugins/ifcfg-suse/plugin.h b/src/settings/plugins/ifcfg-suse/plugin.h index 97840595c..4090a11e1 100644 --- a/src/settings/plugins/ifcfg-suse/plugin.h +++ b/src/settings/plugins/ifcfg-suse/plugin.h @@ -30,7 +30,7 @@ #define SC_PLUGIN_IFCFG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_PLUGIN_IFCFG, SCPluginIfcfg)) #define SC_PLUGIN_IFCFG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_PLUGIN_IFCFG, SCPluginIfcfgClass)) #define SC_IS_PLUGIN_IFCFG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_PLUGIN_IFCFG)) -#define SC_IS_PLUGIN_IFCFG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), SC_TYPE_PLUGIN_IFCFG)) +#define SC_IS_PLUGIN_IFCFG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_PLUGIN_IFCFG)) #define SC_PLUGIN_IFCFG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SC_TYPE_PLUGIN_IFCFG, SCPluginIfcfgClass)) typedef struct _SCPluginIfcfg SCPluginIfcfg; diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.h b/src/settings/plugins/ifnet/nm-ifnet-connection.h index 9423f20d7..0647a94db 100644 --- a/src/settings/plugins/ifnet/nm-ifnet-connection.h +++ b/src/settings/plugins/ifnet/nm-ifnet-connection.h @@ -31,7 +31,7 @@ G_BEGIN_DECLS #define NM_IFNET_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IFNET_CONNECTION, NMIfnetConnection)) #define NM_IFNET_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_IFNET_CONNECTION, NMIfnetConnectionClass)) #define NM_IS_IFNET_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_IFNET_CONNECTION)) -#define NM_IS_IFNET_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_IFNET_CONNECTION)) +#define NM_IS_IFNET_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IFNET_CONNECTION)) #define NM_IFNET_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IFNET_CONNECTION, NMIfnetConnectionClass)) typedef struct { diff --git a/src/settings/plugins/ifnet/plugin.h b/src/settings/plugins/ifnet/plugin.h index eecab1596..27e71eead 100644 --- a/src/settings/plugins/ifnet/plugin.h +++ b/src/settings/plugins/ifnet/plugin.h @@ -29,7 +29,7 @@ #define SC_PLUGIN_IFNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_PLUGIN_IFNET, SCPluginIfnet)) #define SC_PLUGIN_IFNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_PLUGIN_IFNET, SCPluginIfnetClass)) #define SC_IS_PLUGIN_IFNET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_PLUGIN_IFNET)) -#define SC_IS_PLUGIN_IFNET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), SC_TYPE_PLUGIN_IFNET)) +#define SC_IS_PLUGIN_IFNET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_PLUGIN_IFNET)) #define SC_PLUGIN_IFNET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SC_TYPE_PLUGIN_IFNET, SCPluginIfnetClass)) typedef struct _SCPluginIfnet SCPluginIfnet; diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.h b/src/settings/plugins/ifupdown/nm-ifupdown-connection.h index 510a4d56a..447af78a9 100644 --- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.h +++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.h @@ -33,7 +33,7 @@ G_BEGIN_DECLS #define NM_IFUPDOWN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IFUPDOWN_CONNECTION, NMIfupdownConnection)) #define NM_IFUPDOWN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_IFUPDOWN_CONNECTION, NMIfupdownConnectionClass)) #define NM_IS_IFUPDOWN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_IFUPDOWN_CONNECTION)) -#define NM_IS_IFUPDOWN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_IFUPDOWN_CONNECTION)) +#define NM_IS_IFUPDOWN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IFUPDOWN_CONNECTION)) #define NM_IFUPDOWN_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IFUPDOWN_CONNECTION, NMIfupdownConnectionClass)) #define NM_IFUPDOWN_CONNECTION_IFBLOCK "ifblock" diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c index 6927f43fd..88fb57b6a 100644 --- a/src/settings/plugins/ifupdown/parser.c +++ b/src/settings/plugins/ifupdown/parser.c @@ -498,12 +498,20 @@ update_ip4_setting_from_if_block(NMConnection *connection, /* mask/prefix */ netmask_v = ifparser_getkey (block, "netmask"); if (netmask_v) { - if (!inet_pton (AF_INET, netmask_v, &tmp_mask)) { + if (strlen (netmask_v) < 7) { + netmask_int = atoi (netmask_v); + if (netmask_int > 32) { + g_set_error (error, eni_plugin_error_quark (), 0, + "Invalid IPv4 netmask '%s'", netmask_v); + goto error; + } + } else if (!inet_pton (AF_INET, netmask_v, &tmp_mask)) { g_set_error (error, eni_plugin_error_quark (), 0, "Invalid IPv4 netmask '%s'", netmask_v); goto error; + } else { + netmask_int = nm_utils_ip4_netmask_to_prefix (tmp_mask.s_addr); } - netmask_int = nm_utils_ip4_netmask_to_prefix (tmp_mask.s_addr); } /* gateway */ diff --git a/src/settings/plugins/ifupdown/plugin.h b/src/settings/plugins/ifupdown/plugin.h index 09f8767a0..ed7732b88 100644 --- a/src/settings/plugins/ifupdown/plugin.h +++ b/src/settings/plugins/ifupdown/plugin.h @@ -32,7 +32,7 @@ #define SC_PLUGIN_IFUPDOWN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_PLUGIN_IFUPDOWN, SCPluginIfupdown)) #define SC_PLUGIN_IFUPDOWN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_PLUGIN_IFUPDOWN, SCPluginIfupdownClass)) #define SC_IS_PLUGIN_IFUPDOWN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_PLUGIN_IFUPDOWN)) -#define SC_IS_PLUGIN_IFUPDOWN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), SC_TYPE_PLUGIN_IFUPDOWN)) +#define SC_IS_PLUGIN_IFUPDOWN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_PLUGIN_IFUPDOWN)) #define SC_PLUGIN_IFUPDOWN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SC_TYPE_PLUGIN_IFUPDOWN, SCPluginIfupdownClass)) typedef struct _SCPluginIfupdown SCPluginIfupdown; diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am index 9a9ea1f78..54eeda7e7 100644 --- a/src/settings/plugins/ifupdown/tests/Makefile.am +++ b/src/settings/plugins/ifupdown/tests/Makefile.am @@ -30,4 +30,4 @@ endif EXTRA_DIST = \ test1 test2 test3 test4 test5 test6 test7 test8 test9 test11 test12 \ test13 test14 test15 test16 test17-wired-static-verify-ip4 \ - test18-wired-static-verify-ip6 + test18-wired-static-verify-ip6 test19-wired-static-verify-ip4-plen diff --git a/src/settings/plugins/ifupdown/tests/Makefile.in b/src/settings/plugins/ifupdown/tests/Makefile.in index 134c65daa..34bdce574 100644 --- a/src/settings/plugins/ifupdown/tests/Makefile.in +++ b/src/settings/plugins/ifupdown/tests/Makefile.in @@ -353,7 +353,7 @@ test_ifupdown_LDADD = \ EXTRA_DIST = \ test1 test2 test3 test4 test5 test6 test7 test8 test9 test11 test12 \ test13 test14 test15 test16 test17-wired-static-verify-ip4 \ - test18-wired-static-verify-ip6 + test18-wired-static-verify-ip6 test19-wired-static-verify-ip4-plen all: all-am diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c index 01020bdfd..81a0c64a5 100644 --- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c +++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c @@ -838,6 +838,71 @@ test18_read_static_ipv6 (const char *path) g_object_unref (connection); } +static void +test19_read_static_ipv4_plen (const char *path) +{ + NMConnection *connection; + NMSettingIP4Config *s_ip4; + char *unmanaged = NULL; + GError *error = NULL; + const char *expected_address = "10.0.0.3"; + guint32 expected_prefix = 8; + NMIP4Address *ip4_addr; + struct in_addr addr; +#define TEST19_NAME "wired-static-verify-ip4-plen" + if_block *block = NULL; + + const char* file = "test19-" TEST19_NAME; + + init_ifparser_with_file (path, file); + block = ifparser_getfirst (); + connection = nm_connection_new(); + ifupdown_update_connection_from_if_block(connection, block, &error); + + ASSERT (connection != NULL, + TEST19_NAME, "failed to read %s: %s", file, error->message); + + ASSERT (nm_connection_verify (connection, &error), + TEST19_NAME, "failed to verify %s: %s", file, error->message); + + ASSERT (unmanaged == NULL, + TEST19_NAME, "failed to verify %s: unexpected unmanaged value", file); + + /* ===== IPv4 SETTING ===== */ + + ASSERT (inet_pton (AF_INET, expected_address, &addr) > 0, + TEST19_NAME, "failed to verify %s: couldn't convert IP address #1", + file); + + s_ip4 = nm_connection_get_setting_ip4_config (connection); + ASSERT (s_ip4 != NULL, + TEST19_NAME, "failed to verify %s: missing %s setting", + file, + NM_SETTING_IP4_CONFIG_SETTING_NAME); + + /* IP addresses */ + ASSERT (nm_setting_ip4_config_get_num_addresses (s_ip4) == 1, + TEST19_NAME, "failed to verify %s: unexpected %s / %s key value", + file, + NM_SETTING_IP4_CONFIG_SETTING_NAME, + NM_SETTING_IP4_CONFIG_ADDRESSES); + + ip4_addr = nm_setting_ip4_config_get_address (s_ip4, 0); + ASSERT (ip4_addr, + TEST19_NAME, "failed to verify %s: missing IP4 address #1", + file); + + ASSERT (nm_ip4_address_get_prefix (ip4_addr) == expected_prefix, + TEST19_NAME, "failed to verify %s: unexpected IP4 address prefix", + file); + + ASSERT (nm_ip4_address_get_address (ip4_addr) == addr.s_addr, + TEST19_NAME, "failed to verify %s: unexpected IP4 address: %s", + file, addr.s_addr); + + g_object_unref (connection); +} + #if GLIB_CHECK_VERSION(2,25,12) typedef GTestFixtureFunc TCFunc; @@ -881,6 +946,7 @@ int main (int argc, char **argv) g_test_suite_add (suite, TESTCASE (test16_missing_newline, TEST_ENI_DIR)); g_test_suite_add (suite, TESTCASE (test17_read_static_ipv4, TEST_ENI_DIR)); g_test_suite_add (suite, TESTCASE (test18_read_static_ipv6, TEST_ENI_DIR)); + g_test_suite_add (suite, TESTCASE (test19_read_static_ipv4_plen, TEST_ENI_DIR)); return g_test_run (); } diff --git a/src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen b/src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen new file mode 100644 index 000000000..441106da4 --- /dev/null +++ b/src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen @@ -0,0 +1,3 @@ +iface eth0 inet static + address 10.0.0.3 + netmask 8 diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.h b/src/settings/plugins/keyfile/nm-keyfile-connection.h index bf64e69a3..932b36f7c 100644 --- a/src/settings/plugins/keyfile/nm-keyfile-connection.h +++ b/src/settings/plugins/keyfile/nm-keyfile-connection.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS #define NM_KEYFILE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_KEYFILE_CONNECTION, NMKeyfileConnection)) #define NM_KEYFILE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_KEYFILE_CONNECTION, NMKeyfileConnectionClass)) #define NM_IS_KEYFILE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_KEYFILE_CONNECTION)) -#define NM_IS_KEYFILE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_KEYFILE_CONNECTION)) +#define NM_IS_KEYFILE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_KEYFILE_CONNECTION)) #define NM_KEYFILE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_KEYFILE_CONNECTION, NMKeyfileConnectionClass)) typedef struct { diff --git a/src/settings/plugins/keyfile/plugin.h b/src/settings/plugins/keyfile/plugin.h index 05d4e2b0d..9b317333d 100644 --- a/src/settings/plugins/keyfile/plugin.h +++ b/src/settings/plugins/keyfile/plugin.h @@ -28,7 +28,7 @@ #define SC_PLUGIN_KEYFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_PLUGIN_KEYFILE, SCPluginKeyfile)) #define SC_PLUGIN_KEYFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_PLUGIN_KEYFILE, SCPluginKeyfileClass)) #define SC_IS_PLUGIN_KEYFILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_PLUGIN_KEYFILE)) -#define SC_IS_PLUGIN_KEYFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), SC_TYPE_PLUGIN_KEYFILE)) +#define SC_IS_PLUGIN_KEYFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_PLUGIN_KEYFILE)) #define SC_PLUGIN_KEYFILE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SC_TYPE_PLUGIN_KEYFILE, SCPluginKeyfileClass)) typedef struct { diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am index e8a2ce743..1c24d0ef5 100644 --- a/src/supplicant-manager/Makefile.am +++ b/src/supplicant-manager/Makefile.am @@ -2,13 +2,13 @@ SUBDIRS=. tests INCLUDES = \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/generated \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/libnm-util + -I${top_srcdir}/include \ + -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util noinst_LTLIBRARIES = libsupplicant-manager.la diff --git a/src/supplicant-manager/Makefile.in b/src/supplicant-manager/Makefile.in index 904486674..9fb8b1fd3 100644 --- a/src/supplicant-manager/Makefile.in +++ b/src/supplicant-manager/Makefile.in @@ -375,13 +375,13 @@ top_srcdir = @top_srcdir@ SUBDIRS = . tests INCLUDES = \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/generated \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/libnm-util + -I${top_srcdir}/include \ + -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util noinst_LTLIBRARIES = libsupplicant-manager.la libsupplicant_manager_la_SOURCES = \ diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 904870429..61e2261fb 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -4,7 +4,6 @@ INCLUDES = \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/src/dhcp-manager \ - -I$(top_builddir)/marshallers \ -I$(top_srcdir)/src \ -I$(top_builddir)/src diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index 7df89d700..65b4c1d35 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -355,7 +355,6 @@ INCLUDES = \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/src/dhcp-manager \ - -I$(top_builddir)/marshallers \ -I$(top_srcdir)/src \ -I$(top_builddir)/src diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am index 12e316d89..06e04734c 100644 --- a/src/vpn-manager/Makefile.am +++ b/src/vpn-manager/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = \ -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ + -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ - -I${top_srcdir}/src/generated \ + -I${top_srcdir}/libnm-util \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/posix-signals \ -I${top_srcdir}/src \ diff --git a/src/vpn-manager/Makefile.in b/src/vpn-manager/Makefile.in index f474b154e..6cc68454b 100644 --- a/src/vpn-manager/Makefile.in +++ b/src/vpn-manager/Makefile.in @@ -336,12 +336,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = \ -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ + -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ - -I${top_srcdir}/src/generated \ + -I${top_srcdir}/libnm-util \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/posix-signals \ -I${top_srcdir}/src \ diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn-manager/nm-vpn-connection.h index 1faf5d5a5..98bf14f1d 100644 --- a/src/vpn-manager/nm-vpn-connection.h +++ b/src/vpn-manager/nm-vpn-connection.h @@ -31,7 +31,7 @@ #define NM_VPN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_CONNECTION, NMVPNConnection)) #define NM_VPN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_CONNECTION, NMVPNConnectionClass)) #define NM_IS_VPN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_CONNECTION)) -#define NM_IS_VPN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_VPN_CONNECTION)) +#define NM_IS_VPN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_CONNECTION)) #define NM_VPN_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_CONNECTION, NMVPNConnectionClass)) /* Properties */ diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h index 17225b441..efae161ed 100644 --- a/src/vpn-manager/nm-vpn-manager.h +++ b/src/vpn-manager/nm-vpn-manager.h @@ -30,7 +30,7 @@ #define NM_VPN_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_MANAGER, NMVPNManager)) #define NM_VPN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_MANAGER, NMVPNManagerClass)) #define NM_IS_VPN_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_MANAGER)) -#define NM_IS_VPN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_VPN_MANAGER)) +#define NM_IS_VPN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_MANAGER)) #define NM_VPN_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_MANAGER, NMVPNManagerClass)) typedef enum diff --git a/src/vpn-manager/nm-vpn-service.h b/src/vpn-manager/nm-vpn-service.h index e8b1cfc49..6ccdcc473 100644 --- a/src/vpn-manager/nm-vpn-service.h +++ b/src/vpn-manager/nm-vpn-service.h @@ -31,7 +31,7 @@ #define NM_VPN_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_SERVICE, NMVPNService)) #define NM_VPN_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_SERVICE, NMVPNServiceClass)) #define NM_IS_VPN_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_SERVICE)) -#define NM_IS_VPN_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_VPN_SERVICE)) +#define NM_IS_VPN_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_SERVICE)) #define NM_VPN_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_SERVICE, NMVPNServiceClass)) #define VPN_CONNECTION_GROUP "VPN Connection" diff --git a/src/wimax/Makefile.am b/src/wimax/Makefile.am index 63c95dc71..caf017d8c 100644 --- a/src/wimax/Makefile.am +++ b/src/wimax/Makefile.am @@ -1,8 +1,11 @@ INCLUDES = \ -I${top_srcdir}/src \ + -I${top_builddir}/src/generated \ -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ + -I${top_builddir}/include \ -I${top_srcdir}/include \ + -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-util pkglib_LTLIBRARIES = libnm-device-plugin-wimax.la diff --git a/src/wimax/Makefile.in b/src/wimax/Makefile.in index 5c329388b..0ca3366b7 100644 --- a/src/wimax/Makefile.in +++ b/src/wimax/Makefile.in @@ -369,9 +369,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = \ -I${top_srcdir}/src \ + -I${top_builddir}/src/generated \ -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ + -I${top_builddir}/include \ -I${top_srcdir}/include \ + -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-util pkglib_LTLIBRARIES = libnm-device-plugin-wimax.la diff --git a/src/wimax/nm-wimax-nsp.c b/src/wimax/nm-wimax-nsp.c index 491cb5da5..e3939b70f 100644 --- a/src/wimax/nm-wimax-nsp.c +++ b/src/wimax/nm-wimax-nsp.c @@ -1,4 +1,23 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager -- Network link manager + * + * 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 + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright (C) 2010 - 2012 Red Hat, Inc. + * Copyright (C) 2009 Novell, Inc. + */ #include "nm-wimax-nsp.h" #include "NetworkManager.h" |