diff options
| author | Dan Winship <danw@gnome.org> | 2014-07-15 10:17:49 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-07-15 10:17:49 -0400 |
| commit | 741ee7d0510adcd60806a12bc33cf9e4cc9e5404 (patch) | |
| tree | 90f7356343a822bfd9310fb3bad77fe1cd0c5580 | |
| parent | f352bfd2af77566e2fbb1902db807af82008af1d (diff) | |
| parent | 6e51e460df9f7ed3e886b33e7795427e5ec6ab95 (diff) | |
| download | NetworkManager-741ee7d0510adcd60806a12bc33cf9e4cc9e5404.tar.gz | |
Miscellaneous libnm-util/libnm-glib/include cleanups
https://bugzilla.gnome.org/show_bug.cgi?id=732867
161 files changed, 1201 insertions, 1316 deletions
diff --git a/.gitignore b/.gitignore index 34d3c28f26..a1a417ecd7 100644 --- a/.gitignore +++ b/.gitignore @@ -85,8 +85,6 @@ valgrind-*.log /m4/wint_t.m4 /m4/xsize.m4 -/include/nm-version.h - /docs/libnm-glib/*.stamp /docs/libnm-glib/html/ /docs/libnm-glib/tmpl/ @@ -168,6 +166,7 @@ valgrind-*.log /test/libnm_glib_test /test/nm-online /test/nmtestdevices +/libnm-util/nm-version.h /libnm-util/nm-setting-docs.xml /libnm-util/test-crypto /libnm-util/tests/test-crypto diff --git a/configure.ac b/configure.ac index e3102d15da..7b1c1221a0 100644 --- a/configure.ac +++ b/configure.ac @@ -794,7 +794,6 @@ AM_CONDITIONAL(SETTING_DOCS_AVAILABLE, test "$build_setting_docs" = "yes" -o "$h AC_CONFIG_FILES([ Makefile include/Makefile -include/nm-version.h src/Makefile src/tests/Makefile src/config/tests/Makefile @@ -829,6 +828,7 @@ src/devices/wifi/Makefile src/devices/wifi/tests/Makefile src/devices/wwan/Makefile libnm-util/libnm-util.pc +libnm-util/nm-version.h libnm-util/Makefile libnm-util/tests/Makefile libnm-util/tests/certs/Makefile diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am index c6c9edf8f4..98ce4483b4 100644 --- a/docs/libnm-glib/Makefile.am +++ b/docs/libnm-glib/Makefile.am @@ -70,8 +70,6 @@ extra_files = libnm-glib.png # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. GTKDOC_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/libnm-glib \ diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am index 45c746d97f..07bd2fe32e 100644 --- a/docs/libnm-util/Makefile.am +++ b/docs/libnm-util/Makefile.am @@ -50,7 +50,6 @@ extra_files = # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. GTKDOC_CFLAGS = \ - -I$(top_srcdir)/include \ -I$(top_srcdir)/libnm-util \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ diff --git a/examples/C/qt/Makefile.am b/examples/C/qt/Makefile.am index 15b6bf4521..b9bd1f657a 100644 --- a/examples/C/qt/Makefile.am +++ b/examples/C/qt/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ - -I${top_srcdir}/include \ - -I${top_builddir}/include \ + -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ $(DBUS_CFLAGS) \ $(QT_CFLAGS) diff --git a/include/Makefile.am b/include/Makefile.am index 087afe48f6..efc070354d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,17 +1,6 @@ EXTRA_DIST = \ - NetworkManager.h \ - NetworkManagerVPN.h \ nm-dbus-glib-types.h \ nm-glib-compat.h \ nm-gvaluearray-compat.h \ nm-test-utils.h \ - nm-version.h.in \ nm-settings-flags.h - -NetworkManagerincludedir=$(includedir)/NetworkManager - -NetworkManagerinclude_HEADERS = \ - NetworkManager.h \ - NetworkManagerVPN.h \ - nm-version.h - diff --git a/include/nm-dbus-glib-types.h b/include/nm-dbus-glib-types.h index 0f8c542e82..78a0695ad0 100644 --- a/include/nm-dbus-glib-types.h +++ b/include/nm-dbus-glib-types.h @@ -1,7 +1,5 @@ -/* NetworkManager -- Network link manager - * - * Dan Williams <dcbw@redhat.com> - * +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* * 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 @@ -16,7 +14,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2008 Red Hat, Inc. + * Copyright 2008 Red Hat, Inc. */ #ifndef DBUS_GLIB_TYPES_H @@ -40,4 +38,3 @@ #define DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_IP6_ROUTE)) #endif /* DBUS_GLIB_TYPES_H */ - diff --git a/include/nm-glib-compat.h b/include/nm-glib-compat.h index cfaddb7d31..4a1e445021 100644 --- a/include/nm-glib-compat.h +++ b/include/nm-glib-compat.h @@ -1,8 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * Dan Williams <dcbw@redhat.com> - * +/* * 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 @@ -17,7 +14,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2008 - 2011 Red Hat, Inc. + * Copyright 2008 - 2011 Red Hat, Inc. */ #ifndef NM_GLIB_COMPAT_H diff --git a/include/nm-gvaluearray-compat.h b/include/nm-gvaluearray-compat.h index e26ce37174..3e6a2fd3ed 100644 --- a/include/nm-gvaluearray-compat.h +++ b/include/nm-gvaluearray-compat.h @@ -1,6 +1,5 @@ /* -*- 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 diff --git a/include/nm-settings-flags.h b/include/nm-settings-flags.h index 57f38ea59e..360f13922a 100644 --- a/include/nm-settings-flags.h +++ b/include/nm-settings-flags.h @@ -1,6 +1,5 @@ /* -*- 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 @@ -15,7 +14,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) 2011 Red Hat, Inc. + * Copyright 2011 Red Hat, Inc. */ #ifndef NM_SETTINGS_FLAGS_H @@ -36,4 +35,3 @@ typedef enum { } NMSettingsGetSecretsFlags; #endif /* NM_SETTINGS_FLAGS_H */ - diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h index 25aad9d2bd..09ab1ad988 100644 --- a/include/nm-test-utils.h +++ b/include/nm-test-utils.h @@ -1,5 +1,4 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ - /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2014 Red Hat, Inc. + * Copyright 2014 Red Hat, Inc. */ #ifndef __NM_TEST_UTILS_H__ @@ -682,4 +681,3 @@ nmtst_ip6_config_clone (NMIP6Config *config) #endif /* __NM_TEST_UTILS_H__ */ - diff --git a/introspection/nm-vpn-plugin.xml b/introspection/nm-vpn-plugin.xml index 07397c2b97..a72fa93c2c 100644 --- a/introspection/nm-vpn-plugin.xml +++ b/introspection/nm-vpn-plugin.xml @@ -137,7 +137,7 @@ </arg> </method> - <property name="State" type="u" access="read" tp:type="NM_VPN_CONNECTION_STATE"> + <property name="State" type="u" access="read" tp:type="NM_VPN_SERVICE_STATE"> <tp:docstring> The state of the plugin. </tp:docstring> @@ -147,7 +147,7 @@ <tp:docstring> Emitted when the plugin state changes. </tp:docstring> - <arg name="state" type="u" tp:type="NM_VPN_CONNECTION_STATE"> + <arg name="state" type="u" tp:type="NM_VPN_SERVICE_STATE"> <tp:docstring> The new state of the plugin. </tp:docstring> @@ -251,6 +251,44 @@ </arg> </signal> + <tp:enum name="NM_VPN_SERVICE_STATE" type="u"> + <tp:enumvalue suffix="UNKNOWN" value="0"> + <tp:docstring> + The state of the VPN plugin is unknown. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="INIT" value="1"> + <tp:docstring> + The VPN plugin is initialized. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="SHUTDOWN" value="2"> + <tp:docstring> + (Not used.) + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="STARTING" value="3"> + <tp:docstring> + The plugin is attempting to connect to a VPN server. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="STARTED" value="4"> + <tp:docstring> + The plugin has connected to a VPN server. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="STOPPING" value="5"> + <tp:docstring> + The plugin is disconnecting from the VPN server. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="STOPPED" value="6"> + <tp:docstring> + The plugin has disconnected from the VPN server. + </tp:docstring> + </tp:enumvalue> + </tp:enum> + <tp:enum name="NM_VPN_PLUGIN_FAILURE" type="u"> <tp:enumvalue suffix="LOGIN_FAILED" value="0"> <tp:docstring> diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index 623bf45d1d..c43dab885c 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -18,8 +18,7 @@ BUILT_SOURCES = \ noinst_LTLIBRARIES = \ - libdeprecated-nm-glib.la \ - libnm-glib-test.la + libdeprecated-nm-glib.la ##################################################### # Deprecated original libnm_glib bits @@ -177,27 +176,6 @@ libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib-vpn.ver \ BUILT_SOURCES += $(GLIB_GENERATED) ##################################################### -# Test libnm-glib stuff -##################################################### - -libnm_glib_test_la_CFLAGS = \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(GUDEV_CFLAGS) \ - -DLIBNM_GLIB_TEST \ - -DNMRUNDIR=\"$(nmrundir)\" - -libnm_glib_test_la_SOURCES = \ - $(libnminclude_HEADERS) \ - $(libnm_glib_la_SOURCES) - -libnm_glib_test_la_LIBADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) \ - $(GUDEV_LIBS) - -##################################################### nm-vpn-plugin-glue.h: $(top_srcdir)/introspection/nm-vpn-plugin.xml $(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=$@ $< diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c index 5e3b8b2a0f..b462a6b169 100644 --- a/libnm-glib/nm-access-point.c +++ b/libnm-glib/nm-access-point.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2011 Red Hat, Inc. */ #include <config.h> @@ -88,9 +86,9 @@ nm_access_point_new (DBusGConnection *connection, const char *path) g_return_val_if_fail (path != NULL, NULL); return (GObject *) g_object_new (NM_TYPE_ACCESS_POINT, - NM_OBJECT_DBUS_CONNECTION, connection, - NM_OBJECT_DBUS_PATH, path, - NULL); + NM_OBJECT_DBUS_CONNECTION, connection, + NM_OBJECT_DBUS_PATH, path, + NULL); } /** @@ -377,7 +375,7 @@ nm_access_point_connection_valid (NMAccessPoint *ap, NMConnection *connection) /** * nm_access_point_filter_connections: * @ap: an #NMAccessPoint to filter connections for - * @connections: (element-type NetworkManager.Connection): a list of + * @connections: (element-type NMConnection): a list of * #NMConnection objects to filter * * Filters a given list of connections for a given #NMAccessPoint object and @@ -390,7 +388,7 @@ nm_access_point_connection_valid (NMAccessPoint *ap, NMConnection *connection) * for a given #NMDevice using nm_device_filter_connections() and finally * filter that list with this function. * - * Returns: (transfer container) (element-type NetworkManager.Connection): a + * Returns: (transfer container) (element-type NMConnection): a * list of #NMConnection objects that could be activated with the given @ap. * The elements of the list are owned by their creator and should not be freed * by the caller, but the returned list itself is owned by the caller and should diff --git a/libnm-glib/nm-access-point.h b/libnm-glib/nm-access-point.h index 4862e6b708..d3150f8eee 100644 --- a/libnm-glib/nm-access-point.h +++ b/libnm-glib/nm-access-point.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2011 Red Hat, Inc. */ #ifndef NM_ACCESS_POINT_H diff --git a/libnm-glib/nm-active-connection.c b/libnm-glib/nm-active-connection.c index 6ffe54f696..358264fd25 100644 --- a/libnm-glib/nm-active-connection.c +++ b/libnm-glib/nm-active-connection.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2014 Red Hat, Inc. - * Copyright (C) 2008 Novell, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2008 Novell, Inc. */ #include <string.h> @@ -106,9 +104,9 @@ nm_active_connection_new (DBusGConnection *connection, const char *path) g_return_val_if_fail (path != NULL, NULL); return g_object_new (NM_TYPE_ACTIVE_CONNECTION, - NM_OBJECT_DBUS_CONNECTION, connection, - NM_OBJECT_DBUS_PATH, path, - NULL); + NM_OBJECT_DBUS_CONNECTION, connection, + NM_OBJECT_DBUS_PATH, path, + NULL); } static GType @@ -308,7 +306,7 @@ nm_active_connection_get_specific_object (NMActiveConnection *connection) * * Gets the #NMDevices used for the active connections. * - * Returns: (element-type NMClient.Device): the #GPtrArray containing #NMDevices. + * Returns: (element-type NMDevice): the #GPtrArray containing #NMDevices. * This is the internal copy used by the connection, and must not be modified. **/ const GPtrArray * diff --git a/libnm-glib/nm-active-connection.h b/libnm-glib/nm-active-connection.h index b15e8340c6..e29415649c 100644 --- a/libnm-glib/nm-active-connection.h +++ b/libnm-glib/nm-active-connection.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2014 Red Hat, Inc. - * Copyright (C) 2008 Novell, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2008 Novell, Inc. */ #ifndef NM_ACTIVE_CONNECTION_H diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index 2bc19f473c..fefb18c327 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2013 Red Hat, Inc. */ #include <dbus/dbus-glib.h> @@ -116,10 +114,10 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; static void proxy_name_owner_changed (DBusGProxy *proxy, - const char *name, - const char *old_owner, - const char *new_owner, - gpointer user_data); + const char *name, + const char *old_owner, + const char *new_owner, + gpointer user_data); /**********************************************************************/ @@ -364,7 +362,7 @@ client_recheck_permissions (DBusGProxy *proxy, gpointer user_data) * returned array is, and then you may use device-specific methods such as * nm_device_ethernet_get_hw_address(). * - * Returns: (transfer none) (element-type NMClient.Device): a #GPtrArray + * Returns: (transfer none) (element-type NMDevice): a #GPtrArray * containing all the #NMDevices. The returned array is owned by the * #NMClient object and should not be modified. **/ @@ -783,11 +781,11 @@ nm_client_deactivate_connection (NMClient *client, NMActiveConnection *active) * * Gets the active connections. * - * Returns: (transfer none) (element-type NMClient.ActiveConnection): a #GPtrArray + * Returns: (transfer none) (element-type NMActiveConnection): a #GPtrArray * containing all the active #NMActiveConnections. * The returned array is owned by the client and should not be modified. **/ -const GPtrArray * +const GPtrArray * nm_client_get_active_connections (NMClient *client) { NMClientPrivate *priv; @@ -1341,10 +1339,10 @@ updated_properties (GObject *object, GAsyncResult *result, gpointer user_data) static void proxy_name_owner_changed (DBusGProxy *proxy, - const char *name, - const char *old_owner, - const char *new_owner, - gpointer user_data) + const char *name, + const char *old_owner, + const char *new_owner, + gpointer user_data) { NMClient *client = NM_CLIENT (user_data); NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (client); @@ -1784,7 +1782,7 @@ constructor (GType type, } else { if (!_nm_client_is_object_path (dbus_path)) { g_warning ("Passsed D-Bus object path '%s' is invalid; using default '%s' instead", - dbus_path, NM_DBUS_PATH); + dbus_path, NM_DBUS_PATH); g_value_set_static_string (construct_params[i].value, NM_DBUS_PATH); } } @@ -1968,8 +1966,8 @@ init_async_got_manager_running (DBusGProxy *proxy, DBusGProxyCall *call, static void init_async (GAsyncInitable *initable, int io_priority, - GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer user_data) + GCancellable *cancellable, GAsyncReadyCallback callback, + gpointer user_data) { NMClientInitData *init_data; NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (initable); @@ -1985,10 +1983,10 @@ init_async (GAsyncInitable *initable, int io_priority, else { /* Check if NM is running */ dbus_g_proxy_begin_call (priv->bus_proxy, "NameHasOwner", - init_async_got_manager_running, - init_data, NULL, - G_TYPE_STRING, NM_DBUS_SERVICE, - G_TYPE_INVALID); + init_async_got_manager_running, + init_data, NULL, + G_TYPE_STRING, NM_DBUS_SERVICE, + G_TYPE_INVALID); } } @@ -2043,7 +2041,7 @@ finalize (GObject *object) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (object); gboolean b; @@ -2304,7 +2302,7 @@ nm_client_class_init (NMClientClass *client_class) * NMClient::active-connections: * * The active connections. - * Type: GPtrArray<NMClient.ActiveConnection> + * Type: GPtrArray<NMActiveConnection> **/ g_object_class_install_property (object_class, PROP_ACTIVE_CONNECTIONS, @@ -2376,23 +2374,23 @@ nm_client_class_init (NMClientClass *client_class) /** * NMClient::device-added: * @client: the client that received the signal - * @device: (type NMClient.Device): the new device + * @device: (type NMDevice): the new device * * Notifies that a #NMDevice is added. **/ signals[DEVICE_ADDED] = g_signal_new ("device-added", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMClientClass, device_added), - NULL, NULL, NULL, - G_TYPE_NONE, 1, - G_TYPE_OBJECT); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMClientClass, device_added), + NULL, NULL, NULL, + G_TYPE_NONE, 1, + G_TYPE_OBJECT); /** * NMClient::device-removed: * @client: the client that received the signal - * @device: (type NMClient.Device): the removed device + * @device: (type NMDevice): the removed device * * Notifies that a #NMDevice is removed. **/ diff --git a/libnm-glib/nm-client.h b/libnm-glib/nm-client.h index 1baabecce8..ffe513cb03 100644 --- a/libnm-glib/nm-client.h +++ b/libnm-glib/nm-client.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2012 Red Hat, Inc. */ #ifndef NM_CLIENT_H diff --git a/libnm-glib/nm-dbus-helpers-private.h b/libnm-glib/nm-dbus-helpers-private.h index 81c772033f..8a350e783d 100644 --- a/libnm-glib/nm-dbus-helpers-private.h +++ b/libnm-glib/nm-dbus-helpers-private.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Red Hat, Inc. + * Copyright 2013 Red Hat, Inc. */ #ifndef NM_DBUS_HELPERS_PRIVATE_H diff --git a/libnm-glib/nm-dbus-helpers.c b/libnm-glib/nm-dbus-helpers.c index 731ad0c8f9..25004310d9 100644 --- a/libnm-glib/nm-dbus-helpers.c +++ b/libnm-glib/nm-dbus-helpers.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2013 Red Hat, Inc. + * Copyright 2013 Red Hat, Inc. */ #include <string.h> @@ -70,13 +68,8 @@ _nm_dbus_new_connection (GError **error) } #endif - if (connection == NULL) { -#ifdef LIBNM_GLIB_TEST - connection = dbus_g_bus_get (DBUS_BUS_SESSION, error); -#else + if (connection == NULL) connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, error); -#endif - } return connection; } @@ -104,4 +97,3 @@ _nm_dbus_new_proxy_for_connection (DBusGConnection *connection, return dbus_g_proxy_new_for_name (connection, NM_DBUS_SERVICE, path, interface); } - diff --git a/libnm-glib/nm-device-adsl.c b/libnm-glib/nm-device-adsl.c index 3dff03b280..eb54957413 100644 --- a/libnm-glib/nm-device-adsl.c +++ b/libnm-glib/nm-device-adsl.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either diff --git a/libnm-glib/nm-device-adsl.h b/libnm-glib/nm-device-adsl.h index 702d16dca5..35d2731a2c 100644 --- a/libnm-glib/nm-device-adsl.h +++ b/libnm-glib/nm-device-adsl.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 Pantelis Koukousoulas <pktoss@gmail.com> + * Copyright 2011 Pantelis Koukousoulas <pktoss@gmail.com> */ #ifndef NM_DEVICE_ADSL_H diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c index 0895132862..662b2f4a38 100644 --- a/libnm-glib/nm-device-bond.c +++ b/libnm-glib/nm-device-bond.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright 2012 Red Hat, Inc. */ #include <config.h> @@ -91,9 +89,9 @@ nm_device_bond_new (DBusGConnection *connection, const char *path) g_return_val_if_fail (path != NULL, NULL); device = g_object_new (NM_TYPE_DEVICE_BOND, - NM_OBJECT_DBUS_CONNECTION, connection, - NM_OBJECT_DBUS_PATH, path, - NULL); + NM_OBJECT_DBUS_CONNECTION, connection, + NM_OBJECT_DBUS_PATH, path, + NULL); _nm_object_ensure_inited (NM_OBJECT (device)); return device; } @@ -139,7 +137,7 @@ nm_device_bond_get_carrier (NMDeviceBond *device) * * Gets the devices currently slaved to @device. * - * Returns: (element-type NMClient.Device): the #GPtrArray containing + * Returns: (element-type NMDevice): the #GPtrArray containing * #NMDevices that are slaves of @device. This is the internal * copy used by the device, and must not be modified. * diff --git a/libnm-glib/nm-device-bond.h b/libnm-glib/nm-device-bond.h index a495689a9c..cd1a60271f 100644 --- a/libnm-glib/nm-device-bond.h +++ b/libnm-glib/nm-device-bond.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright 2012 Red Hat, Inc. */ #ifndef NM_DEVICE_BOND_H diff --git a/libnm-glib/nm-device-bridge.c b/libnm-glib/nm-device-bridge.c index 76a4e359fe..bf19737555 100644 --- a/libnm-glib/nm-device-bridge.c +++ b/libnm-glib/nm-device-bridge.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright 2012 Red Hat, Inc. */ #include <config.h> @@ -147,7 +145,7 @@ nm_device_bridge_get_carrier (NMDeviceBridge *device) * * Gets the devices currently slaved to @device. * - * Returns: (element-type NMClient.Device): the #GPtrArray containing + * Returns: (element-type NMDevice): the #GPtrArray containing * #NMDevices that are slaves of @device. This is the internal * copy used by the device, and must not be modified. * diff --git a/libnm-glib/nm-device-bridge.h b/libnm-glib/nm-device-bridge.h index 67e08df716..2eaf475d8c 100644 --- a/libnm-glib/nm-device-bridge.h +++ b/libnm-glib/nm-device-bridge.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright 2012 Red Hat, Inc. */ #ifndef NM_DEVICE_BRIDGE_H diff --git a/libnm-glib/nm-device-bt.c b/libnm-glib/nm-device-bt.c index 89ab4386d4..00616a95a8 100644 --- a/libnm-glib/nm-device-bt.c +++ b/libnm-glib/nm-device-bt.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2012 Red Hat, Inc. */ #include <config.h> @@ -373,4 +371,3 @@ nm_device_bt_class_init (NMDeviceBtClass *bt_class) G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-glib/nm-device-bt.h b/libnm-glib/nm-device-bt.h index 113b5eca2d..51dc86e39e 100644 --- a/libnm-glib/nm-device-bt.h +++ b/libnm-glib/nm-device-bt.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 - 2012 Red Hat, Inc. - * Copyright (C) 2008 Novell, Inc. + * Copyright 2008 - 2012 Red Hat, Inc. + * Copyright 2008 Novell, Inc. */ #ifndef NM_DEVICE_BT_H diff --git a/libnm-glib/nm-device-ethernet.c b/libnm-glib/nm-device-ethernet.c index 57ffec4b4f..690041a515 100644 --- a/libnm-glib/nm-device-ethernet.c +++ b/libnm-glib/nm-device-ethernet.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2012 Red Hat, Inc. */ #include <config.h> @@ -93,9 +91,9 @@ nm_device_ethernet_new (DBusGConnection *connection, const char *path) g_return_val_if_fail (path != NULL, NULL); device = g_object_new (NM_TYPE_DEVICE_ETHERNET, - NM_OBJECT_DBUS_CONNECTION, connection, - NM_OBJECT_DBUS_PATH, path, - NULL); + NM_OBJECT_DBUS_CONNECTION, connection, + NM_OBJECT_DBUS_PATH, path, + NULL); _nm_object_ensure_inited (NM_OBJECT (device)); return device; } @@ -392,4 +390,3 @@ nm_device_ethernet_class_init (NMDeviceEthernetClass *eth_class) G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-glib/nm-device-ethernet.h b/libnm-glib/nm-device-ethernet.h index a68a97ecc8..be289cdfcc 100644 --- a/libnm-glib/nm-device-ethernet.h +++ b/libnm-glib/nm-device-ethernet.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2012 Red Hat, Inc. */ #ifndef NM_DEVICE_ETHERNET_H diff --git a/libnm-glib/nm-device-generic.c b/libnm-glib/nm-device-generic.c index 0092aaf5db..875ea8eb39 100644 --- a/libnm-glib/nm-device-generic.c +++ b/libnm-glib/nm-device-generic.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -284,4 +282,3 @@ nm_device_generic_class_init (NMDeviceGenericClass *klass) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-glib/nm-device-generic.h b/libnm-glib/nm-device-generic.h index a343d988d4..5bff1e3f55 100644 --- a/libnm-glib/nm-device-generic.h +++ b/libnm-glib/nm-device-generic.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either diff --git a/libnm-glib/nm-device-infiniband.c b/libnm-glib/nm-device-infiniband.c index 07199eb9e8..d740ed006e 100644 --- a/libnm-glib/nm-device-infiniband.c +++ b/libnm-glib/nm-device-infiniband.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 - 2012 Red Hat, Inc. + * Copyright 2011 - 2012 Red Hat, Inc. */ #include <config.h> @@ -89,9 +87,9 @@ nm_device_infiniband_new (DBusGConnection *connection, const char *path) g_return_val_if_fail (path != NULL, NULL); device = g_object_new (NM_TYPE_DEVICE_INFINIBAND, - NM_OBJECT_DBUS_CONNECTION, connection, - NM_OBJECT_DBUS_PATH, path, - NULL); + NM_OBJECT_DBUS_CONNECTION, connection, + NM_OBJECT_DBUS_PATH, path, + NULL); _nm_object_ensure_inited (NM_OBJECT (device)); return device; } @@ -311,4 +309,3 @@ nm_device_infiniband_class_init (NMDeviceInfinibandClass *eth_class) G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-glib/nm-device-infiniband.h b/libnm-glib/nm-device-infiniband.h index 72d8fc6c38..ba587d93b9 100644 --- a/libnm-glib/nm-device-infiniband.h +++ b/libnm-glib/nm-device-infiniband.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 - 2012 Red Hat, Inc. + * Copyright 2011 - 2012 Red Hat, Inc. */ #ifndef NM_DEVICE_INFINIBAND_H diff --git a/libnm-glib/nm-device-modem.c b/libnm-glib/nm-device-modem.c index bedf6a71aa..7d286190f3 100644 --- a/libnm-glib/nm-device-modem.c +++ b/libnm-glib/nm-device-modem.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 - 2012 Red Hat, Inc. - * Copyright (C) 2008 Novell, Inc. + * Copyright 2011 - 2012 Red Hat, Inc. + * Copyright 2008 Novell, Inc. */ #include <config.h> @@ -36,9 +34,7 @@ G_DEFINE_TYPE (NMDeviceModem, nm_device_modem, NM_TYPE_DEVICE) -#define NM_DEVICE_MODEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ - NM_TYPE_DEVICE_MODEM, \ - NMDeviceModemPrivate)) +#define NM_DEVICE_MODEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_MODEM, NMDeviceModemPrivate)) typedef struct { DBusGProxy *proxy; @@ -293,4 +289,3 @@ nm_device_modem_class_init (NMDeviceModemClass *modem_class) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-glib/nm-device-modem.h b/libnm-glib/nm-device-modem.h index 62719e2b91..226cd04695 100644 --- a/libnm-glib/nm-device-modem.h +++ b/libnm-glib/nm-device-modem.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 - 2012 Red Hat, Inc. - * Copyright (C) 2008 Novell, Inc. + * Copyright 2011 - 2012 Red Hat, Inc. + * Copyright 2008 Novell, Inc. */ #ifndef NM_DEVICE_MODEM_H diff --git a/libnm-glib/nm-device-olpc-mesh.c b/libnm-glib/nm-device-olpc-mesh.c index 57854f7c76..666ddc2636 100644 --- a/libnm-glib/nm-device-olpc-mesh.c +++ b/libnm-glib/nm-device-olpc-mesh.c @@ -1,8 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* vim: set ft=c ts=4 sts=4 sw=4 noexpandtab smartindent: */ /* - * libnm-glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright 2012 Red Hat, Inc. */ #include <config.h> @@ -90,9 +87,9 @@ nm_device_olpc_mesh_new (DBusGConnection *connection, const char *path) g_return_val_if_fail (path != NULL, NULL); device = g_object_new (NM_TYPE_DEVICE_OLPC_MESH, - NM_OBJECT_DBUS_CONNECTION, connection, - NM_OBJECT_DBUS_PATH, path, - NULL); + NM_OBJECT_DBUS_CONNECTION, connection, + NM_OBJECT_DBUS_PATH, path, + NULL); _nm_object_ensure_inited (NM_OBJECT (device)); return device; @@ -327,4 +324,3 @@ nm_device_olpc_mesh_class_init (NMDeviceOlpcMeshClass *olpc_mesh_class) G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-glib/nm-device-olpc-mesh.h b/libnm-glib/nm-device-olpc-mesh.h index 93cb2cdebd..fcef83bcd1 100644 --- a/libnm-glib/nm-device-olpc-mesh.h +++ b/libnm-glib/nm-device-olpc-mesh.h @@ -1,8 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* vim: set ft=c ts=4 sts=4 sw=4 noexpandtab smartindent: */ /* - * libnm-glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright 2012 Red Hat, Inc. */ #ifndef NM_DEVICE_OLPC_MESH_H diff --git a/libnm-glib/nm-device-private.h b/libnm-glib/nm-device-private.h index 5c674f2f78..82d676f92e 100644 --- a/libnm-glib/nm-device-private.h +++ b/libnm-glib/nm-device-private.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2012 Red Hat, Inc. */ #ifndef NM_DEVICE_PRIVATE_H diff --git a/libnm-glib/nm-device-team.c b/libnm-glib/nm-device-team.c index 4b14971ba6..c9ac2d8b85 100644 --- a/libnm-glib/nm-device-team.c +++ b/libnm-glib/nm-device-team.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -16,6 +14,8 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. + * + * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ #include <config.h> @@ -93,9 +93,9 @@ nm_device_team_new (DBusGConnection *connection, const char *path) g_return_val_if_fail (path != NULL, NULL); device = g_object_new (NM_TYPE_DEVICE_TEAM, - NM_OBJECT_DBUS_CONNECTION, connection, - NM_OBJECT_DBUS_PATH, path, - NULL); + NM_OBJECT_DBUS_CONNECTION, connection, + NM_OBJECT_DBUS_PATH, path, + NULL); _nm_object_ensure_inited (NM_OBJECT (device)); return device; } @@ -145,7 +145,7 @@ nm_device_team_get_carrier (NMDeviceTeam *device) * * Gets the devices currently enslaved to @device. * - * Returns: (element-type NMClient.Device): the #GPtrArray containing + * Returns: (element-type NMDevice): the #GPtrArray containing * #NMDevices that are slaves of @device. This is the internal * copy used by the device, and must not be modified. * diff --git a/libnm-glib/nm-device-team.h b/libnm-glib/nm-device-team.h index 054f9ae2b3..46e910bad1 100644 --- a/libnm-glib/nm-device-team.h +++ b/libnm-glib/nm-device-team.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -16,6 +14,8 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. + * + * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ #ifndef NM_DEVICE_TEAM_H diff --git a/libnm-glib/nm-device-vlan.c b/libnm-glib/nm-device-vlan.c index 5a230eea13..8df3025ebb 100644 --- a/libnm-glib/nm-device-vlan.c +++ b/libnm-glib/nm-device-vlan.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright 2012 Red Hat, Inc. */ #include <config.h> diff --git a/libnm-glib/nm-device-vlan.h b/libnm-glib/nm-device-vlan.h index 9608710932..511d02215b 100644 --- a/libnm-glib/nm-device-vlan.h +++ b/libnm-glib/nm-device-vlan.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright 2012 Red Hat, Inc. */ #ifndef NM_DEVICE_VLAN_H diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c index 85ead2c33c..a4c108fb08 100644 --- a/libnm-glib/nm-device-wifi.c +++ b/libnm-glib/nm-device-wifi.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2012 Red Hat, Inc. */ #include <config.h> @@ -270,7 +268,7 @@ nm_device_wifi_get_active_access_point (NMDeviceWifi *device) * * Gets all the scanned access points of the #NMDeviceWifi. * - * Returns: (element-type NMClient.AccessPoint): a #GPtrArray containing all the + * Returns: (element-type NMAccessPoint): a #GPtrArray containing all the * scanned #NMAccessPoints. * The returned array is owned by the client and should not be modified. **/ @@ -419,7 +417,7 @@ clean_up_aps (NMDeviceWifi *self, gboolean notify) **/ void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, - gboolean enabled) + gboolean enabled) { g_return_if_fail (NM_IS_DEVICE_WIFI (device)); @@ -813,13 +811,13 @@ nm_device_wifi_class_init (NMDeviceWifiClass *wifi_class) **/ signals[ACCESS_POINT_ADDED] = g_signal_new ("access-point-added", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMDeviceWifiClass, access_point_added), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - G_TYPE_OBJECT); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMDeviceWifiClass, access_point_added), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + G_TYPE_OBJECT); /** * NMDeviceWifi::access-point-removed: @@ -830,11 +828,11 @@ nm_device_wifi_class_init (NMDeviceWifiClass *wifi_class) **/ signals[ACCESS_POINT_REMOVED] = g_signal_new ("access-point-removed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMDeviceWifiClass, access_point_removed), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - G_TYPE_OBJECT); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMDeviceWifiClass, access_point_removed), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + G_TYPE_OBJECT); } diff --git a/libnm-glib/nm-device-wifi.h b/libnm-glib/nm-device-wifi.h index f9b30d92b4..2bb432a7b0 100644 --- a/libnm-glib/nm-device-wifi.h +++ b/libnm-glib/nm-device-wifi.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2012 Red Hat, Inc. */ #ifndef NM_DEVICE_WIFI_H diff --git a/libnm-glib/nm-device-wimax.c b/libnm-glib/nm-device-wimax.c index 30fc69adcd..8fac2a5ac7 100644 --- a/libnm-glib/nm-device-wimax.c +++ b/libnm-glib/nm-device-wimax.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 - 2012 Red Hat, Inc. - * Copyright (C) 2009 Novell, Inc. + * Copyright 2011 - 2012 Red Hat, Inc. + * Copyright 2009 Novell, Inc. */ #include <config.h> @@ -114,9 +112,9 @@ nm_device_wimax_new (DBusGConnection *connection, const char *path) g_return_val_if_fail (path != NULL, NULL); device = g_object_new (NM_TYPE_DEVICE_WIMAX, - NM_OBJECT_DBUS_CONNECTION, connection, - NM_OBJECT_DBUS_PATH, path, - NULL); + NM_OBJECT_DBUS_CONNECTION, connection, + NM_OBJECT_DBUS_PATH, path, + NULL); _nm_object_ensure_inited (NM_OBJECT (device)); return device; } @@ -180,7 +178,7 @@ nm_device_wimax_get_active_nsp (NMDeviceWimax *wimax) * * Gets all the scanned NSPs of the #NMDeviceWimax. * - * Returns: (element-type NMClient.WimaxNsp): a #GPtrArray containing + * Returns: (element-type NMWimaxNsp): a #GPtrArray containing * all the scanned #NMWimaxNsps. * The returned array is owned by the client and should not be modified. **/ @@ -204,7 +202,7 @@ nm_device_wimax_get_nsps (NMDeviceWimax *wimax) **/ NMWimaxNsp * nm_device_wimax_get_nsp_by_path (NMDeviceWimax *wimax, - const char *path) + const char *path) { const GPtrArray *nsps; int i; @@ -730,13 +728,13 @@ nm_device_wimax_class_init (NMDeviceWimaxClass *wimax_class) **/ signals[NSP_ADDED] = g_signal_new ("nsp-added", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMDeviceWimaxClass, nsp_added), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - G_TYPE_OBJECT); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMDeviceWimaxClass, nsp_added), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + G_TYPE_OBJECT); /** * NMDeviceWimax::nsp-removed: @@ -747,11 +745,11 @@ nm_device_wimax_class_init (NMDeviceWimaxClass *wimax_class) **/ signals[NSP_REMOVED] = g_signal_new ("nsp-removed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMDeviceWimaxClass, nsp_removed), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - G_TYPE_OBJECT); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMDeviceWimaxClass, nsp_removed), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + G_TYPE_OBJECT); } diff --git a/libnm-glib/nm-device-wimax.h b/libnm-glib/nm-device-wimax.h index b2282d4f11..1b889d95fe 100644 --- a/libnm-glib/nm-device-wimax.h +++ b/libnm-glib/nm-device-wimax.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 - 2012 Red Hat, Inc. - * Copyright (C) 2009 Novell, Inc. + * Copyright 2011 - 2012 Red Hat, Inc. + * Copyright 2009 Novell, Inc. */ #ifndef NM_DEVICE_WIMAX_H @@ -79,12 +77,12 @@ typedef struct { GType nm_device_wimax_get_type (void); GObject *nm_device_wimax_new (DBusGConnection *connection, - const char *path); + const char *path); const char *nm_device_wimax_get_hw_address (NMDeviceWimax *wimax); NMWimaxNsp *nm_device_wimax_get_active_nsp (NMDeviceWimax *wimax); NMWimaxNsp *nm_device_wimax_get_nsp_by_path (NMDeviceWimax *wimax, - const char *path); + const char *path); const GPtrArray *nm_device_wimax_get_nsps (NMDeviceWimax *wimax); diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index de4193df5f..1a63d28d21 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2012 Red Hat, Inc. */ #include <string.h> @@ -346,9 +344,9 @@ constructed (GObject *object) register_properties (NM_DEVICE (object)); dbus_g_object_register_marshaller (g_cclosure_marshal_generic, - G_TYPE_NONE, - G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, - G_TYPE_INVALID); + G_TYPE_NONE, + G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, + G_TYPE_INVALID); dbus_g_proxy_add_signal (priv->proxy, "StateChanged", @@ -356,9 +354,9 @@ constructed (GObject *object) G_TYPE_INVALID); dbus_g_proxy_connect_signal (priv->proxy, "StateChanged", - G_CALLBACK (device_state_changed), - NM_DEVICE (object), - NULL); + G_CALLBACK (device_state_changed), + NM_DEVICE (object), + NULL); } static void @@ -847,12 +845,12 @@ nm_device_class_init (NMDeviceClass *device_class) **/ signals[STATE_CHANGED] = g_signal_new ("state-changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMDeviceClass, state_changed), - NULL, NULL, NULL, - G_TYPE_NONE, 3, - G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMDeviceClass, state_changed), + NULL, NULL, NULL, + G_TYPE_NONE, 3, + G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); } /** @@ -1425,7 +1423,7 @@ nm_device_get_active_connection (NMDevice *device) * Gets the #NMRemoteConnections currently known to the daemon that could * be activated on @device. * - * Returns: (element-type NMClient.RemoteConnection): the #GPtrArray + * Returns: (element-type NMRemoteConnection): the #GPtrArray * containing #NMRemoteConnections. This is the internal copy used by * the connection, and must not be modified. * @@ -2163,7 +2161,7 @@ connection_compatible (NMDevice *device, NMConnection *connection, GError **erro device_iface = nm_device_get_iface (device); if (config_iface && g_strcmp0 (config_iface, device_iface) != 0) { g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INTERFACE_MISMATCH, - "The interface names of the device and the connection didn't match."); + "The interface names of the device and the connection didn't match."); return FALSE; } @@ -2204,7 +2202,7 @@ nm_device_connection_compatible (NMDevice *device, NMConnection *connection, GEr /** * nm_device_filter_connections: * @device: an #NMDevice to filter connections for - * @connections: (element-type NetworkManager.Connection): a list of #NMConnection objects to filter + * @connections: (element-type NMConnection): a list of #NMConnection objects to filter * * Filters a given list of connections for a given #NMDevice object and return * connections which may be activated with the device. For example if @device @@ -2215,7 +2213,7 @@ nm_device_connection_compatible (NMDevice *device, NMConnection *connection, GEr * incompatible with the device. To get the full list of connections see * nm_remote_settings_list_connections(). * - * Returns: (transfer container) (element-type NetworkManager.Connection): a + * Returns: (transfer container) (element-type NMConnection): a * list of #NMConnection objects that could be activated with the given @device. * The elements of the list are owned by their creator and should not be freed * by the caller, but the returned list itself is owned by the caller and should diff --git a/libnm-glib/nm-device.h b/libnm-glib/nm-device.h index ed0f687671..3c57744a00 100644 --- a/libnm-glib/nm-device.h +++ b/libnm-glib/nm-device.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2013 Red Hat, Inc. */ #ifndef NM_DEVICE_H diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c index 2a4803de7c..4fccee9034 100644 --- a/libnm-glib/nm-dhcp4-config.c +++ b/libnm-glib/nm-dhcp4-config.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 - 2011 Red Hat, Inc. - * Copyright (C) 2008 Novell, Inc. + * Copyright 2008 - 2011 Red Hat, Inc. + * Copyright 2008 Novell, Inc. */ #include <string.h> @@ -175,9 +173,9 @@ GObject * nm_dhcp4_config_new (DBusGConnection *connection, const char *object_path) { return (GObject *) g_object_new (NM_TYPE_DHCP4_CONFIG, - NM_OBJECT_DBUS_CONNECTION, connection, - NM_OBJECT_DBUS_PATH, object_path, - NULL); + NM_OBJECT_DBUS_CONNECTION, connection, + NM_OBJECT_DBUS_PATH, object_path, + NULL); } /** @@ -215,4 +213,3 @@ nm_dhcp4_config_get_one_option (NMDHCP4Config *config, const char *option) return g_hash_table_lookup (nm_dhcp4_config_get_options (config), option); } - diff --git a/libnm-glib/nm-dhcp4-config.h b/libnm-glib/nm-dhcp4-config.h index 9ca1a7695c..c64e9a9c8d 100644 --- a/libnm-glib/nm-dhcp4-config.h +++ b/libnm-glib/nm-dhcp4-config.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2008 Novell, Inc. + * Copyright 2008 Red Hat, Inc. + * Copyright 2008 Novell, Inc. */ #ifndef NM_DHCP4_CONFIG_H diff --git a/libnm-glib/nm-dhcp6-config.c b/libnm-glib/nm-dhcp6-config.c index 40818baba3..32cc3b4755 100644 --- a/libnm-glib/nm-dhcp6-config.c +++ b/libnm-glib/nm-dhcp6-config.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 - 2011 Red Hat, Inc. - * Copyright (C) 2008 Novell, Inc. + * Copyright 2008 - 2011 Red Hat, Inc. + * Copyright 2008 Novell, Inc. */ #include <string.h> @@ -175,9 +173,9 @@ GObject * nm_dhcp6_config_new (DBusGConnection *connection, const char *object_path) { return (GObject *) g_object_new (NM_TYPE_DHCP6_CONFIG, - NM_OBJECT_DBUS_CONNECTION, connection, - NM_OBJECT_DBUS_PATH, object_path, - NULL); + NM_OBJECT_DBUS_CONNECTION, connection, + NM_OBJECT_DBUS_PATH, object_path, + NULL); } /** @@ -215,4 +213,3 @@ nm_dhcp6_config_get_one_option (NMDHCP6Config *config, const char *option) return g_hash_table_lookup (nm_dhcp6_config_get_options (config), option); } - diff --git a/libnm-glib/nm-dhcp6-config.h b/libnm-glib/nm-dhcp6-config.h index 44002940b2..939b3fdbe4 100644 --- a/libnm-glib/nm-dhcp6-config.h +++ b/libnm-glib/nm-dhcp6-config.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 - 2010 Red Hat, Inc. - * Copyright (C) 2008 Novell, Inc. + * Copyright 2008 - 2010 Red Hat, Inc. + * Copyright 2008 Novell, Inc. */ #ifndef NM_DHCP6_CONFIG_H diff --git a/libnm-glib/nm-ip4-config.c b/libnm-glib/nm-ip4-config.c index 88c4cfbd01..3ac75254cf 100644 --- a/libnm-glib/nm-ip4-config.c +++ b/libnm-glib/nm-ip4-config.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2011 Novell, Inc. - * Copyright (C) 2008 Red Hat, Inc. + * Copyright 2007 - 2011 Novell, Inc. + * Copyright 2008 Red Hat, Inc. */ #include <string.h> @@ -361,7 +359,7 @@ nm_ip4_config_get_gateway (NMIP4Config *config) * * Gets the IP4 addresses (containing the address, prefix, and gateway). * - * Returns: (element-type NetworkManager.IP4Address): the #GSList containing #NMIP4Address<!-- -->es. + * Returns: (element-type NMIP4Address): the #GSList containing #NMIP4Address<!-- -->es. * This is the internal copy used by the configuration and must not be modified. **/ const GSList * @@ -398,7 +396,7 @@ nm_ip4_config_get_nameservers (NMIP4Config *config) * * Gets the domain names. * - * Returns: (element-type utf8): the #GPtrArray containing domains as strings. This is the + * Returns: (element-type utf8): the #GPtrArray containing domains as strings. This is the * internal copy used by the configuration, and must not be modified. **/ const GPtrArray * @@ -455,7 +453,7 @@ nm_ip4_config_get_wins_servers (NMIP4Config *config) * * Gets the routes. * - * Returns: (element-type NetworkManager.IP4Route): the #GSList containing + * Returns: (element-type NMIP4Route): the #GSList containing * #NMIP4Routes. This is the internal copy used by the configuration, * and must not be modified. **/ @@ -467,4 +465,3 @@ nm_ip4_config_get_routes (NMIP4Config *config) _nm_object_ensure_inited (NM_OBJECT (config)); return NM_IP4_CONFIG_GET_PRIVATE (config)->routes; } - diff --git a/libnm-glib/nm-ip4-config.h b/libnm-glib/nm-ip4-config.h index aa2e66eb8e..58b6b3714d 100644 --- a/libnm-glib/nm-ip4-config.h +++ b/libnm-glib/nm-ip4-config.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2008 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2008 Red Hat, Inc. */ #ifndef NM_IP4_CONFIG_H diff --git a/libnm-glib/nm-ip6-config.c b/libnm-glib/nm-ip6-config.c index 985b61b4cc..21156090bd 100644 --- a/libnm-glib/nm-ip6-config.c +++ b/libnm-glib/nm-ip6-config.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2008 - 2014 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2008 - 2014 Red Hat, Inc. */ #include <string.h> @@ -70,9 +68,9 @@ GObject * nm_ip6_config_new (DBusGConnection *connection, const char *object_path) { return (GObject *) g_object_new (NM_TYPE_IP6_CONFIG, - NM_OBJECT_DBUS_CONNECTION, connection, - NM_OBJECT_DBUS_PATH, object_path, - NULL); + NM_OBJECT_DBUS_CONNECTION, connection, + NM_OBJECT_DBUS_PATH, object_path, + NULL); } static gboolean @@ -179,7 +177,7 @@ nm_ip6_config_get_gateway (NMIP6Config *config) * * Gets the IP6 addresses (containing the address, prefix, and gateway). * - * Returns: (element-type NetworkManager.IP6Address): the #GSList containing + * Returns: (element-type NMIP6Address): the #GSList containing * #NMIP6Address<!-- -->es. This is the internal copy used by the configuration * and must not be modified. **/ @@ -306,7 +304,7 @@ nm_ip6_config_get_searches (NMIP6Config *config) * * Gets the routes. * - * Returns: (element-type NetworkManager.IP6Route): the #GSList containing + * Returns: (element-type NMIP6Route): the #GSList containing * #NMIP6Routes. This is the internal copy used by the configuration, * and must not be modified. **/ @@ -493,4 +491,3 @@ nm_ip6_config_class_init (NMIP6ConfigClass *config_class) G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-glib/nm-ip6-config.h b/libnm-glib/nm-ip6-config.h index feef69f19a..7a64805b68 100644 --- a/libnm-glib/nm-ip6-config.h +++ b/libnm-glib/nm-ip6-config.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2008 - 2014 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2008 - 2014 Red Hat, Inc. */ #ifndef NM_IP6_CONFIG_H diff --git a/libnm-glib/nm-object-cache.c b/libnm-glib/nm-object-cache.c index 2748b1df3a..833ee24092 100644 --- a/libnm-glib/nm-object-cache.c +++ b/libnm-glib/nm-object-cache.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 Red Hat, Inc. + * Copyright 2008 Red Hat, Inc. */ #include <string.h> @@ -88,4 +86,3 @@ _nm_object_cache_clear (NMObject *except) } } } - diff --git a/libnm-glib/nm-object-cache.h b/libnm-glib/nm-object-cache.h index 84752134bc..87b4689617 100644 --- a/libnm-glib/nm-object-cache.h +++ b/libnm-glib/nm-object-cache.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 Red Hat, Inc. + * Copyright 2008 Red Hat, Inc. */ #ifndef NM_OBJECT_CACHE_H diff --git a/libnm-glib/nm-object-private.h b/libnm-glib/nm-object-private.h index 3253c2ec2d..75e63b2e7e 100644 --- a/libnm-glib/nm-object-private.h +++ b/libnm-glib/nm-object-private.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 - 2011 Red Hat, Inc. + * Copyright 2008 - 2011 Red Hat, Inc. */ #ifndef NM_OBJECT_PRIVATE_H @@ -47,8 +45,8 @@ DBusGProxy *_nm_object_new_proxy (NMObject *self, gboolean _nm_object_is_connection_private (NMObject *self); void _nm_object_register_properties (NMObject *object, - DBusGProxy *proxy, - const NMPropertiesInfo *info); + DBusGProxy *proxy, + const NMPropertiesInfo *info); gboolean _nm_object_reload_properties (NMObject *object, GError **error); diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c index 2374e15deb..2e6167d7fd 100644 --- a/libnm-glib/nm-object.c +++ b/libnm-glib/nm-object.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2012 Red Hat, Inc. */ #include <string.h> @@ -338,7 +336,7 @@ finalize (GObject *object) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object); @@ -361,7 +359,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object); @@ -404,7 +402,8 @@ nm_object_class_init (NMObjectClass *nm_object_class) (object_class, PROP_DBUS_CONNECTION, g_param_spec_boxed (NM_OBJECT_DBUS_CONNECTION, "", "", DBUS_TYPE_G_CONNECTION, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); /** @@ -416,7 +415,8 @@ nm_object_class_init (NMObjectClass *nm_object_class) (object_class, PROP_DBUS_PATH, g_param_spec_string (NM_OBJECT_DBUS_PATH, "", "", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); /* signals */ @@ -1184,10 +1184,10 @@ _nm_object_register_properties (NMObject *object, dbus_g_proxy_add_signal (proxy, "PropertiesChanged", DBUS_TYPE_G_MAP_OF_VARIANT, G_TYPE_INVALID); dbus_g_proxy_connect_signal (proxy, - "PropertiesChanged", - G_CALLBACK (properties_changed_proxy), - object, - NULL); + "PropertiesChanged", + G_CALLBACK (properties_changed_proxy), + object, + NULL); instance = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); priv->property_tables = g_slist_prepend (priv->property_tables, instance); @@ -1441,4 +1441,3 @@ _nm_object_is_connection_private (NMObject *self) { return _nm_dbus_is_connection_private (NM_OBJECT_GET_PRIVATE (self)->connection); } - diff --git a/libnm-glib/nm-object.h b/libnm-glib/nm-object.h index ae97184f3b..07348f2491 100644 --- a/libnm-glib/nm-object.h +++ b/libnm-glib/nm-object.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2012 Red Hat, Inc. */ #ifndef NM_OBJECT_H diff --git a/libnm-glib/nm-remote-connection-private.h b/libnm-glib/nm-remote-connection-private.h index 3df5760623..e3f35428cd 100644 --- a/libnm-glib/nm-remote-connection-private.h +++ b/libnm-glib/nm-remote-connection-private.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2009 Red Hat, Inc. + * Copyright 2009 Red Hat, Inc. */ #ifndef __NM_REMOTE_CONNECTION_PRIVATE_H__ @@ -33,4 +31,3 @@ typedef enum { } NMRemoteConnectionInitResult; #endif /* __NM_REMOTE_CONNECTION_PRIVATE__ */ - diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index 9f5d611c34..53f257a349 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2011 Red Hat, Inc. */ #include <string.h> @@ -125,7 +123,7 @@ _nm_remote_connection_ensure_inited (NMRemoteConnection *self) */ if (!g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NO_REPLY)) { g_warning ("%s: (NMRemoteConnection) error initializing: %s\n", - __func__, error->message); + __func__, error->message); } g_error_free (error); } @@ -712,8 +710,8 @@ init_get_settings_cb (DBusGProxy *proxy, static void init_async (GAsyncInitable *initable, int io_priority, - GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer user_data) + GCancellable *cancellable, GAsyncReadyCallback callback, + gpointer user_data) { NMRemoteConnectionInitData *init_data; NMRemoteConnectionPrivate *priv = NM_REMOTE_CONNECTION_GET_PRIVATE (initable); @@ -868,7 +866,8 @@ nm_remote_connection_class_init (NMRemoteConnectionClass *remote_class) (object_class, PROP_BUS, g_param_spec_boxed (NM_REMOTE_CONNECTION_BUS, "", "", DBUS_TYPE_G_CONNECTION, - G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_WRITABLE | + G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); /* These are needed so _nm_object_create() can create NMRemoteConnections */ @@ -876,13 +875,15 @@ nm_remote_connection_class_init (NMRemoteConnectionClass *remote_class) (object_class, PROP_DBUS_CONNECTION, g_param_spec_boxed (NM_REMOTE_CONNECTION_DBUS_CONNECTION, "", "", DBUS_TYPE_G_CONNECTION, - G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_WRITABLE | + G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (object_class, PROP_DBUS_PATH, g_param_spec_string (NM_REMOTE_CONNECTION_DBUS_PATH, "", "", NULL, - G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_WRITABLE | + G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); /** @@ -908,7 +909,7 @@ nm_remote_connection_class_init (NMRemoteConnectionClass *remote_class) * This signal is emitted when a connection changes, and it is * still visible to the user. */ - signals[UPDATED] = + signals[UPDATED] = g_signal_new (NM_REMOTE_CONNECTION_UPDATED, G_TYPE_FROM_CLASS (remote_class), G_SIGNAL_RUN_FIRST, @@ -924,12 +925,12 @@ nm_remote_connection_class_init (NMRemoteConnectionClass *remote_class) * This signal is emitted when a connection is either deleted or becomes * invisible to the current user. */ - signals[REMOVED] = + signals[REMOVED] = g_signal_new (NM_REMOTE_CONNECTION_REMOVED, G_TYPE_FROM_CLASS (remote_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (NMRemoteConnectionClass, removed), - NULL, NULL, + NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); diff --git a/libnm-glib/nm-remote-connection.h b/libnm-glib/nm-remote-connection.h index 911885c47c..8292c23545 100644 --- a/libnm-glib/nm-remote-connection.h +++ b/libnm-glib/nm-remote-connection.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2011 Red Hat, Inc. */ #ifndef __NM_REMOTE_CONNECTION_H__ @@ -149,4 +147,3 @@ gboolean nm_remote_connection_get_unsaved (NMRemoteConnection *connection); G_END_DECLS #endif /* __NM_REMOTE_CONNECTION__ */ - diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c index c36a92c856..e21751ce21 100644 --- a/libnm-glib/nm-remote-settings.c +++ b/libnm-glib/nm-remote-settings.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 Novell, Inc. - * Copyright (C) 2009 - 2012 Red Hat, Inc. + * Copyright 2008 Novell, Inc. + * Copyright 2009 - 2012 Red Hat, Inc. */ #include <string.h> @@ -143,7 +141,7 @@ typedef struct { /* AddConnectionInfo objects that are waiting for the connection to become initialized */ GSList *add_list; - + DBusGProxy *props_proxy; char *hostname; gboolean can_modify; @@ -206,7 +204,7 @@ _nm_remote_settings_ensure_inited (NMRemoteSettings *self) */ if (!g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NO_REPLY)) { g_warning ("%s: (NMRemoteSettings) error initializing: %s\n", - __func__, error->message); + __func__, error->message); } g_error_free (error); } @@ -559,7 +557,7 @@ fetch_connections_done (DBusGProxy *proxy, g_warn_if_fail (priv->listcon_call == call); priv->listcon_call = NULL; - if (!dbus_g_proxy_end_call (proxy, call, &error, + if (!dbus_g_proxy_end_call (proxy, call, &error, DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH, &connections, G_TYPE_INVALID)) { if ( !g_error_matches (error, DBUS_GERROR, DBUS_GERROR_SERVICE_UNKNOWN) @@ -567,8 +565,8 @@ fetch_connections_done (DBusGProxy *proxy, && priv->service_running) { g_warning ("%s: error fetching connections: (%d) %s.", __func__, - error->code, - error->message ? error->message : "(unknown)"); + error->code, + error->message ? error->message : "(unknown)"); } g_clear_error (&error); @@ -597,7 +595,7 @@ fetch_connections_done (DBusGProxy *proxy, * nm_remote_settings_list_connections: * @settings: the %NMRemoteSettings * - * Returns: (transfer container) (element-type NMClient.RemoteConnection): a + * Returns: (transfer container) (element-type NMRemoteConnection): a * list containing all connections provided by the remote settings service. * Each element of the returned list is a %NMRemoteConnection instance, which is * owned by the %NMRemoteSettings object and should not be freed by the caller. @@ -939,7 +937,7 @@ nm_remote_settings_save_hostname (NMRemoteSettings *settings, g_return_val_if_fail (NM_IS_REMOTE_SETTINGS (settings), FALSE); g_return_val_if_fail (hostname != NULL, FALSE); g_return_val_if_fail (callback != NULL, FALSE); - + priv = NM_REMOTE_SETTINGS_GET_PRIVATE (settings); _nm_remote_settings_ensure_inited (settings); @@ -1354,8 +1352,8 @@ init_async_got_manager_running (DBusGProxy *proxy, DBusGProxyCall *call, static void init_async (GAsyncInitable *initable, int io_priority, - GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer user_data) + GCancellable *cancellable, GAsyncReadyCallback callback, + gpointer user_data) { NMRemoteSettingsInitData *init_data; NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (initable); @@ -1488,7 +1486,8 @@ nm_remote_settings_class_init (NMRemoteSettingsClass *class) (object_class, PROP_BUS, g_param_spec_boxed (NM_REMOTE_SETTINGS_BUS, "", "", DBUS_TYPE_G_CONNECTION, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); g_object_class_install_property @@ -1513,21 +1512,21 @@ nm_remote_settings_class_init (NMRemoteSettingsClass *class) G_PARAM_STATIC_STRINGS)); /* Signals */ - signals[NEW_CONNECTION] = - g_signal_new (NM_REMOTE_SETTINGS_NEW_CONNECTION, - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMRemoteSettingsClass, new_connection), - NULL, NULL, NULL, - G_TYPE_NONE, 1, G_TYPE_OBJECT); - - signals[CONNECTIONS_READ] = - g_signal_new (NM_REMOTE_SETTINGS_CONNECTIONS_READ, - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMRemoteSettingsClass, connections_read), - NULL, NULL, NULL, - G_TYPE_NONE, 0); + signals[NEW_CONNECTION] = + g_signal_new (NM_REMOTE_SETTINGS_NEW_CONNECTION, + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMRemoteSettingsClass, new_connection), + NULL, NULL, NULL, + G_TYPE_NONE, 1, G_TYPE_OBJECT); + + signals[CONNECTIONS_READ] = + g_signal_new (NM_REMOTE_SETTINGS_CONNECTIONS_READ, + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMRemoteSettingsClass, connections_read), + NULL, NULL, NULL, + G_TYPE_NONE, 0); } static void diff --git a/libnm-glib/nm-remote-settings.h b/libnm-glib/nm-remote-settings.h index 5ca646e665..92049adee0 100644 --- a/libnm-glib/nm-remote-settings.h +++ b/libnm-glib/nm-remote-settings.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 Novell, Inc. - * Copyright (C) 2009 - 2011 Red Hat, Inc. + * Copyright 2008 Novell, Inc. + * Copyright 2009 - 2011 Red Hat, Inc. */ #ifndef NM_REMOTE_SETTINGS_H diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c index e5150d3304..ea6197743c 100644 --- a/libnm-glib/nm-secret-agent.c +++ b/libnm-glib/nm-secret-agent.c @@ -15,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2010 - 2011 Red Hat, Inc. + * Copyright 2010 - 2011 Red Hat, Inc. */ #include <config.h> @@ -55,9 +55,7 @@ static void impl_secret_agent_delete_secrets (NMSecretAgent *self, G_DEFINE_ABSTRACT_TYPE (NMSecretAgent, nm_secret_agent, G_TYPE_OBJECT) -#define NM_SECRET_AGENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ - NM_TYPE_SECRET_AGENT, \ - NMSecretAgentPrivate)) +#define NM_SECRET_AGENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SECRET_AGENT, NMSecretAgentPrivate)) static gboolean auto_register_cb (gpointer user_data); @@ -124,11 +122,11 @@ get_nm_owner (NMSecretAgent *self) if (!priv->nm_owner) { if (!dbus_g_proxy_call_with_timeout (priv->dbus_proxy, - "GetNameOwner", 2000, &error, - G_TYPE_STRING, NM_DBUS_SERVICE, - G_TYPE_INVALID, - G_TYPE_STRING, &owner, - G_TYPE_INVALID)) + "GetNameOwner", 2000, &error, + G_TYPE_STRING, NM_DBUS_SERVICE, + G_TYPE_INVALID, + G_TYPE_STRING, &owner, + G_TYPE_INVALID)) return NULL; priv->nm_owner = g_strdup (owner); @@ -1006,7 +1004,8 @@ nm_secret_agent_class_init (NMSecretAgentClass *class) (object_class, PROP_IDENTIFIER, g_param_spec_string (NM_SECRET_AGENT_IDENTIFIER, "", "", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); /** @@ -1024,7 +1023,8 @@ nm_secret_agent_class_init (NMSecretAgentClass *class) (object_class, PROP_AUTO_REGISTER, g_param_spec_boolean (NM_SECRET_AGENT_AUTO_REGISTER, "", "", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1049,7 +1049,8 @@ nm_secret_agent_class_init (NMSecretAgentClass *class) g_param_spec_flags (NM_SECRET_AGENT_CAPABILITIES, "", "", NM_TYPE_SECRET_AGENT_CAPABILITIES, NM_SECRET_AGENT_CAPABILITY_NONE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1062,10 +1063,10 @@ nm_secret_agent_class_init (NMSecretAgentClass *class) **/ signals[REGISTRATION_RESULT] = g_signal_new (NM_SECRET_AGENT_REGISTRATION_RESULT, - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, NULL, - G_TYPE_NONE, 1, G_TYPE_POINTER); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + 0, NULL, NULL, NULL, + G_TYPE_NONE, 1, G_TYPE_POINTER); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (class), &dbus_glib_nm_secret_agent_object_info); @@ -1074,4 +1075,3 @@ nm_secret_agent_class_init (NMSecretAgentClass *class) NM_DBUS_INTERFACE_SECRET_AGENT, NM_TYPE_SECRET_AGENT_ERROR); } - diff --git a/libnm-glib/nm-secret-agent.h b/libnm-glib/nm-secret-agent.h index c70f8d0762..f593b3e648 100644 --- a/libnm-glib/nm-secret-agent.h +++ b/libnm-glib/nm-secret-agent.h @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* +/* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -15,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2010 - 2011 Red Hat, Inc. + * Copyright 2010 - 2011 Red Hat, Inc. */ #ifndef NM_SECRET_AGENT_H diff --git a/libnm-glib/nm-types-private.h b/libnm-glib/nm-types-private.h index 178890da11..c34d9a8f7c 100644 --- a/libnm-glib/nm-types-private.h +++ b/libnm-glib/nm-types-private.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Red Hat, Inc. + * Copyright 2007 - 2008 Red Hat, Inc. */ #ifndef NM_TYPES_PRIVATE_H @@ -31,9 +29,9 @@ gboolean _nm_ssid_demarshal (GValue *value, GByteArray **dest); gboolean _nm_uint_array_demarshal (GValue *value, GArray **dest); gboolean _nm_string_array_demarshal (GValue *value, GPtrArray **dest); gboolean _nm_object_array_demarshal (GValue *value, - GPtrArray **dest, - DBusGConnection *connection, - NMObjectCreatorFunc func); + GPtrArray **dest, + DBusGConnection *connection, + NMObjectCreatorFunc func); gboolean _nm_ip6_address_array_demarshal (GValue *value, GSList **dest); #endif /* NM_TYPES_PRIVATE_H */ diff --git a/libnm-glib/nm-types.c b/libnm-glib/nm-types.c index f9ba6d240b..cb0ff8ba6c 100644 --- a/libnm-glib/nm-types.c +++ b/libnm-glib/nm-types.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 Red Hat, Inc. + * Copyright 2008 Red Hat, Inc. */ #include <glib.h> @@ -232,9 +230,9 @@ nm_object_array_get_type (void) gboolean _nm_object_array_demarshal (GValue *value, - GPtrArray **dest, - DBusGConnection *connection, - NMObjectCreatorFunc func) + GPtrArray **dest, + DBusGConnection *connection, + NMObjectCreatorFunc func) { GPtrArray *temp = NULL; GPtrArray *array; @@ -419,4 +417,3 @@ nm_ip6_route_object_array_get_type (void) (GBoxedFreeFunc) _nm_ip6_route_object_array_free); return our_type; } - diff --git a/libnm-glib/nm-types.h b/libnm-glib/nm-types.h index adccafb729..81bd299e69 100644 --- a/libnm-glib/nm-types.h +++ b/libnm-glib/nm-types.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 Red Hat, Inc. + * Copyright 2008 Red Hat, Inc. */ #ifndef NM_TYPES_H diff --git a/libnm-glib/nm-vpn-connection.c b/libnm-glib/nm-vpn-connection.c index 0cf9914aec..689f58fd8d 100644 --- a/libnm-glib/nm-vpn-connection.c +++ b/libnm-glib/nm-vpn-connection.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2012 Red Hat, Inc. */ #include <string.h> @@ -70,7 +68,7 @@ nm_vpn_connection_new (DBusGConnection *connection, const char *path) g_return_val_if_fail (connection != NULL, NULL); g_return_val_if_fail (path != NULL, NULL); - return g_object_new (NM_TYPE_VPN_CONNECTION, + return g_object_new (NM_TYPE_VPN_CONNECTION, NM_OBJECT_DBUS_CONNECTION, connection, NM_OBJECT_DBUS_PATH, path, NULL); @@ -176,10 +174,10 @@ constructed (GObject *object) G_TYPE_INVALID); dbus_g_proxy_add_signal (priv->proxy, "VpnStateChanged", G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID); dbus_g_proxy_connect_signal (priv->proxy, - "VpnStateChanged", - G_CALLBACK (vpn_state_changed_proxy), - object, - NULL); + "VpnStateChanged", + G_CALLBACK (vpn_state_changed_proxy), + object, + NULL); register_properties (NM_VPN_CONNECTION (object)); } @@ -261,10 +259,10 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class) /* signals */ signals[VPN_STATE_CHANGED] = g_signal_new ("vpn-state-changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMVPNConnectionClass, vpn_state_changed), - NULL, NULL, NULL, - G_TYPE_NONE, 2, - G_TYPE_UINT, G_TYPE_UINT); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMVPNConnectionClass, vpn_state_changed), + NULL, NULL, NULL, + G_TYPE_NONE, 2, + G_TYPE_UINT, G_TYPE_UINT); } diff --git a/libnm-glib/nm-vpn-connection.h b/libnm-glib/nm-vpn-connection.h index 8727bb86d0..0495310f38 100644 --- a/libnm-glib/nm-vpn-connection.h +++ b/libnm-glib/nm-vpn-connection.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2010 Red Hat, Inc. */ #ifndef NM_VPN_CONNECTION_H diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.c b/libnm-glib/nm-vpn-plugin-ui-interface.c index f1ac87fa8c..791d47ad43 100644 --- a/libnm-glib/nm-vpn-plugin-ui-interface.c +++ b/libnm-glib/nm-vpn-plugin-ui-interface.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 - 2010 Red Hat, Inc. - * Copyright (C) 2008 Novell, Inc. + * Copyright 2008 - 2010 Red Hat, Inc. + * Copyright 2008 Novell, Inc. */ #include "nm-vpn-plugin-ui-interface.h" @@ -73,9 +71,9 @@ nm_vpn_plugin_ui_interface_get_type (void) }; vpn_plugin_ui_interface_type = g_type_register_static (G_TYPE_INTERFACE, - "NMVpnPluginUiInterface", - &vpn_plugin_ui_interface_info, - 0); + "NMVpnPluginUiInterface", + &vpn_plugin_ui_interface_info, + 0); g_type_interface_add_prerequisite (vpn_plugin_ui_interface_type, G_TYPE_OBJECT); } @@ -163,12 +161,12 @@ widget_interface_init (gpointer g_iface) /* Signals */ g_signal_new ("changed", - iface_type, - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMVpnPluginUiWidgetInterface, changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + iface_type, + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMVpnPluginUiWidgetInterface, changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); initialized = TRUE; } @@ -231,4 +229,3 @@ nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInterface *if /* Deprecated and no longer used */ return TRUE; } - diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.h b/libnm-glib/nm-vpn-plugin-ui-interface.h index 2753de4467..9c6e49ebe6 100644 --- a/libnm-glib/nm-vpn-plugin-ui-interface.h +++ b/libnm-glib/nm-vpn-plugin-ui-interface.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 - 2010 Red Hat, Inc. - * Copyright (C) 2008 Novell, Inc. + * Copyright 2008 - 2010 Red Hat, Inc. + * Copyright 2008 Novell, Inc. */ #ifndef NM_VPN_PLUGIN_UI_INTERFACE_H diff --git a/libnm-glib/nm-vpn-plugin-utils.c b/libnm-glib/nm-vpn-plugin-utils.c index b9838df936..0e800e9c16 100644 --- a/libnm-glib/nm-vpn-plugin-utils.c +++ b/libnm-glib/nm-vpn-plugin-utils.c @@ -15,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 Red Hat, Inc. + * Copyright 2011 Red Hat, Inc. */ #include <errno.h> diff --git a/libnm-glib/nm-vpn-plugin-utils.h b/libnm-glib/nm-vpn-plugin-utils.h index aab73c4e68..d87ef16aa4 100644 --- a/libnm-glib/nm-vpn-plugin-utils.h +++ b/libnm-glib/nm-vpn-plugin-utils.h @@ -15,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 Red Hat, Inc. + * Copyright 2011 Red Hat, Inc. */ #ifndef NM_VPN_PLUGIN_UTILS_H diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index 52f757eabe..0104129448 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2008 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2008 Red Hat, Inc. */ #include <signal.h> @@ -125,7 +123,7 @@ GQuark nm_vpn_plugin_error_quark (void) { static GQuark quark = 0; - + if (!quark) quark = g_quark_from_static_string ("nm_vpn_plugin_error"); @@ -729,8 +727,8 @@ nm_vpn_plugin_init (NMVPNPlugin *plugin) { active_plugins = g_slist_append (active_plugins, plugin); g_object_weak_ref (G_OBJECT (plugin), - one_plugin_destroyed, - NULL); + one_plugin_destroyed, + NULL); } static GObject * @@ -747,8 +745,8 @@ constructor (GType type, GError *err = NULL; object = G_OBJECT_CLASS (nm_vpn_plugin_parent_class)->constructor (type, - n_construct_params, - construct_params); + n_construct_params, + construct_params); if (!object) return NULL; @@ -823,7 +821,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (object); @@ -957,7 +955,8 @@ nm_vpn_plugin_class_init (NMVPNPluginClass *plugin_class) (object_class, PROP_DBUS_SERVICE_NAME, g_param_spec_string (NM_VPN_PLUGIN_DBUS_SERVICE_NAME, "", "", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); g_object_class_install_property diff --git a/libnm-glib/nm-vpn-plugin.h b/libnm-glib/nm-vpn-plugin.h index 4f020f31fd..323017f035 100644 --- a/libnm-glib/nm-vpn-plugin.h +++ b/libnm-glib/nm-vpn-plugin.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2013 Red Hat, Inc. */ #ifndef NM_VPN_PLUGIN_H diff --git a/libnm-glib/nm-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c index 24f5d3ea61..1cbd3eefd0 100644 --- a/libnm-glib/nm-wimax-nsp.c +++ b/libnm-glib/nm-wimax-nsp.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 Red Hat, Inc. + * Copyright 2011 Red Hat, Inc. */ #include <config.h> @@ -71,9 +69,9 @@ nm_wimax_nsp_new (DBusGConnection *connection, const char *path) g_return_val_if_fail (path != NULL, NULL); return (GObject *) g_object_new (NM_TYPE_WIMAX_NSP, - NM_OBJECT_DBUS_CONNECTION, connection, - NM_OBJECT_DBUS_PATH, path, - NULL); + NM_OBJECT_DBUS_CONNECTION, connection, + NM_OBJECT_DBUS_PATH, path, + NULL); } /** @@ -173,14 +171,14 @@ nm_wimax_nsp_connection_valid (NMWimaxNsp *nsp, NMConnection *connection) /** * nm_wimax_nsp_filter_connections: * @nsp: an #NMWimaxNsp to filter connections for - * @connections: (element-type NetworkManager.Connection): a list of + * @connections: (element-type NMConnection): a list of * #NMConnection objects to filter * * Filters a given list of connections for a given #NMWimaxNsp object and * return connections which may be activated with the access point. Any * returned connections will match the @nsp's network name and other attributes. * - * Returns: (transfer container) (element-type NetworkManager.Connection): a + * Returns: (transfer container) (element-type NMConnection): a * list of #NMConnection objects that could be activated with the given @nsp. * The elements of the list are owned by their creator and should not be freed * by the caller, but the returned list itself is owned by the caller and should diff --git a/libnm-glib/nm-wimax-nsp.h b/libnm-glib/nm-wimax-nsp.h index b8e91079d1..e0cfe1e895 100644 --- a/libnm-glib/nm-wimax-nsp.h +++ b/libnm-glib/nm-wimax-nsp.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * libnm_glib -- Access network status & information from glib applications - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 Red Hat, Inc. - * Copyright (C) 2009 Novell, Inc. + * Copyright 2011 Red Hat, Inc. + * Copyright 2009 Novell, Inc. */ #ifndef NM_WIMAX_NSP_H diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am index 38f449ac1a..b287147bcc 100644 --- a/libnm-glib/tests/Makefile.am +++ b/libnm-glib/tests/Makefile.am @@ -19,7 +19,7 @@ test_nm_client_SOURCES = \ test_nm_client_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/libnm-glib/libnm-glib-test.la \ + $(top_builddir)/libnm-glib/libnm-glib.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) @@ -30,7 +30,7 @@ test_remote_settings_client_SOURCES = \ test_remote_settings_client_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/libnm-glib/libnm-glib-test.la \ + $(top_builddir)/libnm-glib/libnm-glib.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c index d5a79c75bc..572e1fdc6b 100644 --- a/libnm-glib/tests/test-nm-client.c +++ b/libnm-glib/tests/test-nm-client.c @@ -14,7 +14,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) 2010 - 2014 Red Hat, Inc. + * Copyright 2010 - 2014 Red Hat, Inc. * */ @@ -127,6 +127,7 @@ name_exists (GDBusConnection *c, const char *name) static ServiceInfo * service_init (void) { + DBusGConnection *bus; ServiceInfo *sinfo; const char *args[2] = { fake_exec, NULL }; GError *error = NULL; @@ -165,9 +166,19 @@ service_init (void) NULL, NULL); test_assert (sinfo->proxy); - sinfo->client = nm_client_new (); + bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error); + g_assert_no_error (error); + + sinfo->client = g_object_new (NM_TYPE_CLIENT, + NM_OBJECT_DBUS_CONNECTION, bus, + NM_OBJECT_DBUS_PATH, NM_DBUS_PATH, + NULL); test_assert (sinfo->client != NULL); + dbus_g_connection_unref (bus); + g_initable_init (G_INITABLE (sinfo->client), NULL, &error); + g_assert_no_error (error); + return sinfo; } diff --git a/libnm-glib/tests/test-remote-settings-client.c b/libnm-glib/tests/test-remote-settings-client.c index e3ef7f22ef..d92583a112 100644 --- a/libnm-glib/tests/test-remote-settings-client.c +++ b/libnm-glib/tests/test-remote-settings-client.c @@ -14,7 +14,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) 2010 - 2011 Red Hat, Inc. + * Copyright 2010 - 2011 Red Hat, Inc. * */ @@ -392,6 +392,7 @@ main (int argc, char **argv) ret = g_test_run (); cleanup (); + dbus_g_connection_unref (bus); return ret; } diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index 064aca0082..cb08a14b4f 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -23,6 +23,8 @@ endif lib_LTLIBRARIES=libnm-util.la libnm_util_include_HEADERS = \ + NetworkManager.h \ + NetworkManagerVPN.h \ nm-connection.h \ nm-setting.h \ nm-setting-8021x.h \ @@ -52,7 +54,8 @@ libnm_util_include_HEADERS = \ nm-setting-wireless-security.h \ nm-setting-vpn.h \ nm-utils-enum-types.h \ - nm-utils.h + nm-utils.h \ + nm-version.h libnm_util_la_private_headers = \ crypto.h \ @@ -101,7 +104,7 @@ libnm_util_la_SOURCES = \ GLIB_GENERATED = nm-utils-enum-types.h nm-utils-enum-types.c BUILT_SOURCES = $(GLIB_GENERATED) -nm_utils_enum_types_sources = $(libnm_util_include_HEADERS) +nm_utils_enum_types_sources = $(filter-out NetworkManager%,$(libnm_util_include_HEADERS)) GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM @@ -152,7 +155,7 @@ pkgconfig_DATA = libnm-util.pc DISTCLEANFILES = libnm-util.pc CLEANFILES = -EXTRA_DIST = libnm-util.pc.in libnm-util.ver +EXTRA_DIST = libnm-util.pc.in libnm-util.ver nm-version.h.in -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = @@ -160,7 +163,7 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) if HAVE_INTROSPECTION -introspection_sources = $(libnm_util_include_HEADERS) $(libnm_util_la_csources) $(top_srcdir)/include/NetworkManager.h $(top_srcdir)/include/NetworkManagerVPN.h +introspection_sources = $(libnm_util_include_HEADERS) $(libnm_util_la_csources) NetworkManager-1.0.gir: libnm-util.la NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0 diff --git a/include/NetworkManager.h b/libnm-util/NetworkManager.h index 3fee1af00d..3d0e2ed261 100644 --- a/include/NetworkManager.h +++ b/libnm-util/NetworkManager.h @@ -1,8 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * Dan Williams <dcbw@redhat.com> - * +/* * 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 @@ -17,7 +14,13 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2004 - 2013 Red Hat, Inc. + * Copyright 2004 - 2013 Red Hat, Inc. + */ + +/* Definitions related to NetworkManager's D-Bus interfaces. + * + * Note that although this header is installed as part of libnm-util, it is also + * used by some external code that does not link to libnm-util. */ #ifndef NETWORK_MANAGER_H @@ -28,11 +31,11 @@ /* * dbus services details */ -#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager" +#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager" -#define NM_DBUS_PATH "/org/freedesktop/NetworkManager" -#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager" -#define NM_DBUS_INTERFACE_DEVICE NM_DBUS_INTERFACE ".Device" +#define NM_DBUS_PATH "/org/freedesktop/NetworkManager" +#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager" +#define NM_DBUS_INTERFACE_DEVICE NM_DBUS_INTERFACE ".Device" #define NM_DBUS_INTERFACE_DEVICE_WIRED NM_DBUS_INTERFACE_DEVICE ".Wired" #define NM_DBUS_INTERFACE_DEVICE_ADSL NM_DBUS_INTERFACE_DEVICE ".Adsl" #define NM_DBUS_INTERFACE_DEVICE_WIRELESS NM_DBUS_INTERFACE_DEVICE ".Wireless" @@ -87,6 +90,8 @@ * @NM_STATE_CONNECTED_GLOBAL: there is global IPv4 and/or IPv6 Internet connectivity * * #NMState values indicate the current overall networking state. + * + * (Corresponds to the NM_STATE type in nm-manager.xml.) **/ typedef enum { NM_STATE_UNKNOWN = 0, @@ -113,6 +118,8 @@ typedef enum { * @NM_CONNECTIVITY_FULL: The host is connected to a network, and * appears to be able to reach the full Internet. * + * (Corresponds to the NM_CONNECTIVITY type in nm-manager.xml.) + * * Since: 0.9.8.6 */ typedef enum { @@ -145,6 +152,8 @@ typedef enum { * * #NMDeviceType values indicate the type of hardware represented by * an #NMDevice. + * + * (Corresponds to the NM_DEVICE_TYPE type in nm-device.xml.) **/ typedef enum { NM_DEVICE_TYPE_UNKNOWN = 0, @@ -172,6 +181,8 @@ typedef enum { * @NM_DEVICE_CAP_CARRIER_DETECT: this device can indicate carrier status * * General device capability flags. + * + * (Corresponds to the NM_DEVICE_CAP type in nm-device-wifi.xml.) **/ typedef enum { NM_DEVICE_CAP_NONE = 0x00000000, @@ -193,6 +204,8 @@ typedef enum { * @NM_WIFI_DEVICE_CAP_ADHOC: device supports Ad-Hoc mode * * 802.11 specific device encryption and authentication capabilities. + * + * (Corresponds to the NM_802_11_DEVICE_CAP type in nm-device-wifi.xml.) **/ typedef enum { NM_WIFI_DEVICE_CAP_NONE = 0x00000000, @@ -213,7 +226,9 @@ typedef enum { * @NM_802_11_AP_FLAGS_PRIVACY: access point requires authentication and * encryption (usually means WEP) * - * 802.11 access point flags. + * 802.11 access point flags. + * + * (Corresponds to the NM_802_11_AP_FLAGS type in nm-access-point.xml.) **/ typedef enum { NM_802_11_AP_FLAGS_NONE = 0x00000000, @@ -236,7 +251,7 @@ typedef enum { * @NM_802_11_AP_SEC_GROUP_TKIP: TKIP is supported for group/broadcast encryption * @NM_802_11_AP_SEC_GROUP_CCMP: AES/CCMP is supported for group/broadcast * encryption - * @NM_802_11_AP_SEC_KEY_MGMT_PSK: WPA/RSN Pre-Shared Key encryption is + * @NM_802_11_AP_SEC_KEY_MGMT_PSK: WPA/RSN Pre-Shared Key encryption is * supported * @NM_802_11_AP_SEC_KEY_MGMT_802_1X: 802.1x authentication and key management * is supported @@ -244,6 +259,8 @@ typedef enum { * 802.11 access point security and authentication flags. These flags describe * the current security requirements of an access point as determined from the * access point's beacon. + * + * (Corresponds to the NM_802_11_AP_SEC type in nm-access-point.xml.) **/ typedef enum { NM_802_11_AP_SEC_NONE = 0x00000000, @@ -273,6 +290,8 @@ typedef enum { * access point objects; used only for hotspot mode on the local machine. * * Indicates the 802.11 mode an access point or device is currently in. + * + * (Corresponds to the NM_802_11_MODE type in generic-types.xml.) **/ typedef enum { NM_802_11_MODE_UNKNOWN = 0, @@ -289,6 +308,8 @@ typedef enum { * * #NMBluetoothCapabilities values indicate the usable capabilities of a * Bluetooth device. + * + * (Corresponds to the NM_BT_CAPABILITY type in nm-device-bt.xml.) **/ typedef enum { NM_BT_CAPABILITY_NONE = 0x00000000, @@ -311,6 +332,8 @@ typedef enum { * technology families a modem device supports. For more information on the * specific access technologies the device supports use the ModemManager D-Bus * API. + * + * (Corresponds to the NM_DEVICE_MODEM_CAPABILITY type in nm-device-modem.xml.) **/ typedef enum { NM_DEVICE_MODEM_CAPABILITY_NONE = 0x00000000, @@ -359,6 +382,7 @@ typedef enum { * @NM_DEVICE_STATE_FAILED: the device failed to connect to the requested * network and is cleaning up the connection request * + * (Corresponds to the NM_DEVICE_STATE type in nm-device.xml.) **/ typedef enum { NM_DEVICE_STATE_UNKNOWN = 0, @@ -377,191 +401,135 @@ typedef enum { } NMDeviceState; -/* +/** + * NMDeviceStateReason: + * @NM_DEVICE_STATE_REASON_NONE: No reason given + * @NM_DEVICE_STATE_REASON_UNKNOWN: Unknown error + * @NM_DEVICE_STATE_REASON_NOW_MANAGED: Device is now managed + * @NM_DEVICE_STATE_REASON_NOW_UNMANAGED: Device is now unmanaged + * @NM_DEVICE_STATE_REASON_CONFIG_FAILED: The device could not be readied for configuration + * @NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE: IP configuration could not be reserved (no available address, timeout, etc) + * @NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED: The IP config is no longer valid + * @NM_DEVICE_STATE_REASON_NO_SECRETS: Secrets were required, but not provided + * @NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT: 802.1x supplicant disconnected + * @NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED: 802.1x supplicant configuration failed + * @NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED: 802.1x supplicant failed + * @NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT: 802.1x supplicant took too long to authenticate + * @NM_DEVICE_STATE_REASON_PPP_START_FAILED: PPP service failed to start + * @NM_DEVICE_STATE_REASON_PPP_DISCONNECT: PPP service disconnected + * @NM_DEVICE_STATE_REASON_PPP_FAILED: PPP failed + * @NM_DEVICE_STATE_REASON_DHCP_START_FAILED: DHCP client failed to start + * @NM_DEVICE_STATE_REASON_DHCP_ERROR: DHCP client error + * @NM_DEVICE_STATE_REASON_DHCP_FAILED: DHCP client failed + * @NM_DEVICE_STATE_REASON_SHARED_START_FAILED: Shared connection service failed to start + * @NM_DEVICE_STATE_REASON_SHARED_FAILED: Shared connection service failed + * @NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED: AutoIP service failed to start + * @NM_DEVICE_STATE_REASON_AUTOIP_ERROR: AutoIP service error + * @NM_DEVICE_STATE_REASON_AUTOIP_FAILED: AutoIP service failed + * @NM_DEVICE_STATE_REASON_MODEM_BUSY: The line is busy + * @NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE: No dial tone + * @NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER: No carrier could be established + * @NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT: The dialing request timed out + * @NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED: The dialing attempt failed + * @NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED: Modem initialization failed + * @NM_DEVICE_STATE_REASON_GSM_APN_FAILED: Failed to select the specified APN + * @NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING: Not searching for networks + * @NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED: Network registration denied + * @NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT: Network registration timed out + * @NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED: Failed to register with the requested network + * @NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED: PIN check failed + * @NM_DEVICE_STATE_REASON_FIRMWARE_MISSING: Necessary firmware for the device may be missing + * @NM_DEVICE_STATE_REASON_REMOVED: The device was removed + * @NM_DEVICE_STATE_REASON_SLEEPING: NetworkManager went to sleep + * @NM_DEVICE_STATE_REASON_CONNECTION_REMOVED: The device's active connection disappeared + * @NM_DEVICE_STATE_REASON_USER_REQUESTED: Device disconnected by user or client + * @NM_DEVICE_STATE_REASON_CARRIER: Carrier/link changed + * @NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED: The device's existing connection was assumed + * @NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE: The supplicant is now available + * @NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND: The modem could not be found + * @NM_DEVICE_STATE_REASON_BT_FAILED: The Bluetooth connection failed or timed out + * @NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED: GSM Modem's SIM Card not inserted + * @NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED: GSM Modem's SIM Pin required + * @NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED: GSM Modem's SIM Puk required + * @NM_DEVICE_STATE_REASON_GSM_SIM_WRONG: GSM Modem's SIM wrong + * @NM_DEVICE_STATE_REASON_INFINIBAND_MODE: InfiniBand device does not support connected mode + * @NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: A dependency of the connection failed + * @NM_DEVICE_STATE_REASON_BR2684_FAILED: Problem with the RFC 2684 Ethernet over ADSL bridge + * @NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE: ModemManager not running + * @NM_DEVICE_STATE_REASON_SSID_NOT_FOUND: The WiFi network could not be found + * @NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED: A secondary connection of the base connection failed + * @NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED: DCB or FCoE setup failed + * @NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED: teamd control failed + * @NM_DEVICE_STATE_REASON_MODEM_FAILED: Modem failed or no longer available + * @NM_DEVICE_STATE_REASON_MODEM_AVAILABLE: Modem now ready and available + * @NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT: SIM PIN was incorrect + * * Device state change reason codes + * + * (Corresponds to the NM_DEVICE_STATE_REASON type in nm-device.xml.) */ typedef enum { - /* No reason given */ NM_DEVICE_STATE_REASON_NONE = 0, - - /* Unknown error */ NM_DEVICE_STATE_REASON_UNKNOWN = 1, - - /* Device is now managed */ NM_DEVICE_STATE_REASON_NOW_MANAGED = 2, - - /* Device is now unmanaged */ NM_DEVICE_STATE_REASON_NOW_UNMANAGED = 3, - - /* The device could not be readied for configuration */ NM_DEVICE_STATE_REASON_CONFIG_FAILED = 4, - - /* IP configuration could not be reserved (no available address, timeout, etc) */ NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE = 5, - - /* The IP config is no longer valid */ NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED = 6, - - /* Secrets were required, but not provided */ NM_DEVICE_STATE_REASON_NO_SECRETS = 7, - - /* 802.1x supplicant disconnected */ NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT = 8, - - /* 802.1x supplicant configuration failed */ NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED = 9, - - /* 802.1x supplicant failed */ NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED = 10, - - /* 802.1x supplicant took too long to authenticate */ NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT = 11, - - /* PPP service failed to start */ NM_DEVICE_STATE_REASON_PPP_START_FAILED = 12, - - /* PPP service disconnected */ NM_DEVICE_STATE_REASON_PPP_DISCONNECT = 13, - - /* PPP failed */ NM_DEVICE_STATE_REASON_PPP_FAILED = 14, - - /* DHCP client failed to start */ NM_DEVICE_STATE_REASON_DHCP_START_FAILED = 15, - - /* DHCP client error */ NM_DEVICE_STATE_REASON_DHCP_ERROR = 16, - - /* DHCP client failed */ NM_DEVICE_STATE_REASON_DHCP_FAILED = 17, - - /* Shared connection service failed to start */ NM_DEVICE_STATE_REASON_SHARED_START_FAILED = 18, - - /* Shared connection service failed */ NM_DEVICE_STATE_REASON_SHARED_FAILED = 19, - - /* AutoIP service failed to start */ NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED = 20, - - /* AutoIP service error */ NM_DEVICE_STATE_REASON_AUTOIP_ERROR = 21, - - /* AutoIP service failed */ NM_DEVICE_STATE_REASON_AUTOIP_FAILED = 22, - - /* The line is busy */ NM_DEVICE_STATE_REASON_MODEM_BUSY = 23, - - /* No dial tone */ NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE = 24, - - /* No carrier could be established */ NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER = 25, - - /* The dialing request timed out */ NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT = 26, - - /* The dialing attempt failed */ NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED = 27, - - /* Modem initialization failed */ NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED = 28, - - /* Failed to select the specified APN */ NM_DEVICE_STATE_REASON_GSM_APN_FAILED = 29, - - /* Not searching for networks */ NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING = 30, - - /* Network registration denied */ NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED = 31, - - /* Network registration timed out */ NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT = 32, - - /* Failed to register with the requested network */ NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED = 33, - - /* PIN check failed */ NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED = 34, - - /* Necessary firmware for the device may be missing */ NM_DEVICE_STATE_REASON_FIRMWARE_MISSING = 35, - - /* The device was removed */ NM_DEVICE_STATE_REASON_REMOVED = 36, - - /* NetworkManager went to sleep */ NM_DEVICE_STATE_REASON_SLEEPING = 37, - - /* The device's active connection disappeared */ NM_DEVICE_STATE_REASON_CONNECTION_REMOVED = 38, - - /* Device disconnected by user or client */ NM_DEVICE_STATE_REASON_USER_REQUESTED = 39, - - /* Carrier/link changed */ NM_DEVICE_STATE_REASON_CARRIER = 40, - - /* The device's existing connection was assumed */ NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED = 41, - - /* The supplicant is now available */ NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE = 42, - - /* The modem could not be found */ NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND = 43, - - /* The Bluetooth connection failed or timed out */ NM_DEVICE_STATE_REASON_BT_FAILED = 44, - - /* GSM Modem's SIM Card not inserted */ NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED = 45, - - /* GSM Modem's SIM Pin required */ NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED = 46, - - /* GSM Modem's SIM Puk required */ NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED = 47, - - /* GSM Modem's SIM wrong */ NM_DEVICE_STATE_REASON_GSM_SIM_WRONG = 48, - - /* InfiniBand device does not support connected mode */ NM_DEVICE_STATE_REASON_INFINIBAND_MODE = 49, - - /* A dependency of the connection failed */ NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED = 50, - - /* Problem with the RFC 2684 Ethernet over ADSL bridge */ NM_DEVICE_STATE_REASON_BR2684_FAILED = 51, - - /* ModemManager not running */ NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE = 52, - - /* The WiFi network could not be found */ NM_DEVICE_STATE_REASON_SSID_NOT_FOUND = 53, - - /* A secondary connection of the base connection failed */ NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED = 54, - - /* DCB or FCoE setup failed */ NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED = 55, - - /* teamd control failed */ NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED = 56, - - /* Modem failed or no longer available */ NM_DEVICE_STATE_REASON_MODEM_FAILED = 57, - - /* Modem now ready and available */ NM_DEVICE_STATE_REASON_MODEM_AVAILABLE = 58, - - /* SIM PIN was incorrect */ NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT = 59, - /* Unused */ NM_DEVICE_STATE_REASON_LAST = 0xFFFF } NMDeviceStateReason; @@ -579,6 +547,8 @@ typedef enum { * #NMActiveConnectionState values indicate the state of a connection to a * specific network while it is starting, connected, or disconnecting from that * network. + * + * (Corresponds to the NM_ACTIVE_CONNECTION_STATE type in nm-active-connection.xml.) **/ typedef enum { NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0, @@ -589,4 +559,3 @@ typedef enum { } NMActiveConnectionState; #endif /* NETWORK_MANAGER_H */ - diff --git a/include/NetworkManagerVPN.h b/libnm-util/NetworkManagerVPN.h index 5997c99f9d..be07a14894 100644 --- a/include/NetworkManagerVPN.h +++ b/libnm-util/NetworkManagerVPN.h @@ -1,7 +1,5 @@ -/* NetworkManager -- Network link manager - * - * Dan Williams <dcbw@redhat.com> - * +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* * 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 @@ -16,7 +14,13 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2004 Red Hat, Inc. + * Copyright 2004 Red Hat, Inc. + */ + +/* D-Bus-related definitions for NetworkManager VPN plugins. + * + * Note that although this header is installed as part of libnm-util, it is also + * used by some external code that does not link to libnm-util. */ #ifndef NETWORK_MANAGER_VPN_H @@ -25,11 +29,11 @@ /* * dbus services details */ -#define NM_DBUS_PATH_VPN "/org/freedesktop/NetworkManager/VPN/Manager" -#define NM_DBUS_INTERFACE_VPN "org.freedesktop.NetworkManager.VPN.Manager" +#define NM_DBUS_PATH_VPN "/org/freedesktop/NetworkManager/VPN/Manager" +#define NM_DBUS_INTERFACE_VPN "org.freedesktop.NetworkManager.VPN.Manager" -#define NM_DBUS_PATH_VPN_CONNECTION "/org/freedesktop/NetworkManager/VPN/Connection" -#define NM_DBUS_INTERFACE_VPN_CONNECTION "org.freedesktop.NetworkManager.VPN.Connection" +#define NM_DBUS_PATH_VPN_CONNECTION "/org/freedesktop/NetworkManager/VPN/Connection" +#define NM_DBUS_INTERFACE_VPN_CONNECTION "org.freedesktop.NetworkManager.VPN.Connection" #define NM_VPN_DBUS_PLUGIN_PATH "/org/freedesktop/NetworkManager/VPN/Plugin" #define NM_VPN_DBUS_PLUGIN_INTERFACE "org.freedesktop.NetworkManager.VPN.Plugin" @@ -37,37 +41,47 @@ /* * VPN Errors */ -#define NM_DBUS_NO_ACTIVE_VPN_CONNECTION "org.freedesktop.NetworkManager.VPNConnections.NoActiveVPNConnection" -#define NM_DBUS_NO_VPN_CONNECTIONS "org.freedesktop.NetworkManager.VPNConnections.NoVPNConnections" -#define NM_DBUS_INVALID_VPN_CONNECTION "org.freedesktop.NetworkManager.VPNConnections.InvalidVPNConnection" +#define NM_DBUS_NO_ACTIVE_VPN_CONNECTION "org.freedesktop.NetworkManager.VPNConnections.NoActiveVPNConnection" +#define NM_DBUS_NO_VPN_CONNECTIONS "org.freedesktop.NetworkManager.VPNConnections.NoVPNConnections" +#define NM_DBUS_INVALID_VPN_CONNECTION "org.freedesktop.NetworkManager.VPNConnections.InvalidVPNConnection" -#define NM_DBUS_VPN_ERROR_PREFIX "org.freedesktop.NetworkManager.VPN.Error" -#define NM_DBUS_VPN_STARTING_IN_PROGRESS "StartingInProgress" -#define NM_DBUS_VPN_ALREADY_STARTED "AlreadyStarted" -#define NM_DBUS_VPN_STOPPING_IN_PROGRESS "StoppingInProgress" -#define NM_DBUS_VPN_ALREADY_STOPPED "AlreadyStopped" -#define NM_DBUS_VPN_WRONG_STATE "WrongState" -#define NM_DBUS_VPN_BAD_ARGUMENTS "BadArguments" -#define NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED "InteractiveNotSupported" +#define NM_DBUS_VPN_ERROR_PREFIX "org.freedesktop.NetworkManager.VPN.Error" +#define NM_DBUS_VPN_STARTING_IN_PROGRESS "StartingInProgress" +#define NM_DBUS_VPN_ALREADY_STARTED "AlreadyStarted" +#define NM_DBUS_VPN_STOPPING_IN_PROGRESS "StoppingInProgress" +#define NM_DBUS_VPN_ALREADY_STOPPED "AlreadyStopped" +#define NM_DBUS_VPN_WRONG_STATE "WrongState" +#define NM_DBUS_VPN_BAD_ARGUMENTS "BadArguments" +#define NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED "InteractiveNotSupported" /* * VPN daemon signals */ -#define NM_DBUS_VPN_SIGNAL_LOGIN_BANNER "LoginBanner" -#define NM_DBUS_VPN_SIGNAL_LOGIN_FAILED "LoginFailed" -#define NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED "LaunchFailed" -#define NM_DBUS_VPN_SIGNAL_CONNECT_FAILED "ConnectFailed" -#define NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD "VPNConfigBad" -#define NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD "IPConfigBad" -#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange" -#define NM_DBUS_VPN_SIGNAL_IP4_CONFIG "IP4Config" - -/* +#define NM_DBUS_VPN_SIGNAL_LOGIN_BANNER "LoginBanner" +#define NM_DBUS_VPN_SIGNAL_LOGIN_FAILED "LoginFailed" +#define NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED "LaunchFailed" +#define NM_DBUS_VPN_SIGNAL_CONNECT_FAILED "ConnectFailed" +#define NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD "VPNConfigBad" +#define NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD "IPConfigBad" +#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange" +#define NM_DBUS_VPN_SIGNAL_IP4_CONFIG "IP4Config" + +/** + * NMVPNServiceState: + * @NM_VPN_SERVICE_UNKNOWN: The state of the VPN plugin is unknown. + * @NM_VPN_SERVICE_INIT: The VPN plugin is initialized. + * @NM_VPN_SERVICE_SHUTDOWN: Not used. + * @NM_VPN_SERVICE_STARTING: The plugin is attempting to connect to a VPN server. + * @NM_VPN_SERVICE_STARTED: The plugin has connected to a VPN server. + * @NM_VPN_SERVICE_STOPPING: The plugin is disconnecting from the VPN server. + * @NM_VPN_SERVICE_STOPPED: The plugin has disconnected from the VPN server. + * * VPN daemon states + * + * (Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.) */ -typedef enum NMVPNServiceState -{ +typedef enum NMVPNServiceState { NM_VPN_SERVICE_STATE_UNKNOWN = 0, NM_VPN_SERVICE_STATE_INIT, NM_VPN_SERVICE_STATE_SHUTDOWN, @@ -78,11 +92,26 @@ typedef enum NMVPNServiceState } NMVPNServiceState; -/* +/** + * NMVPNConnectionState: + * @NM_VPN_CONNECTION_STATE_UNKNOWN: The state of the VPN connection is + * unknown. + * @NM_VPN_CONNECTION_STATE_PREPARE: The VPN connection is preparing to + * connect. + * @NM_VPN_CONNECTION_STATE_NEED_AUTH: The VPN connection needs authorization + * credentials. + * @NM_VPN_CONNECTION_STATE_CONNECT: The VPN connection is being established. + * @NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: The VPN connection is getting an IP + * address. + * @NM_VPN_CONNECTION_STATE_ACTIVATED: The VPN connection is active. + * @NM_VPN_CONNECTION_STATE_FAILED: The VPN connection failed. + * @NM_VPN_CONNECTION_STATE_DISCONNECTED: The VPN connection is disconnected. + * * VPN connection states + * + * (Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.) */ -typedef enum NMVPNConnectionState -{ +typedef enum NMVPNConnectionState { NM_VPN_CONNECTION_STATE_UNKNOWN = 0, NM_VPN_CONNECTION_STATE_PREPARE, NM_VPN_CONNECTION_STATE_NEED_AUTH, @@ -93,8 +122,38 @@ typedef enum NMVPNConnectionState NM_VPN_CONNECTION_STATE_DISCONNECTED } NMVPNConnectionState; -typedef enum NMVPNConnectionStateReason -{ +/** + * NMVPNConnectionStateReason: + * @NM_VPN_CONNECTION_STATE_REASON_UNKNOWN: The reason for the VPN connection + * state change is unknown. + * @NM_VPN_CONNECTION_STATE_REASON_NONE: No reason was given for the VPN + * connection state change. + * @NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED: The VPN connection changed + * state because the user disconnected it. + * @NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED: The VPN connection + * changed state because the device it was using was disconnected. + * @NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED: The service providing the + * VPN connection was stopped. + * @NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID: The IP config of the VPN + * connection was invalid. + * @NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT: The connection attempt to + * the VPN service timed out. + * @NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT: A timeout occurred + * while starting the service providing the VPN connection. + * @NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED: Starting the service + * starting the service providing the VPN connection failed. + * @NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS: Necessary secrets for the VPN + * connection were not provided. + * @NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED: Authentication to the VPN + * server failed. + * @NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED: The connection was + * deleted from settings. + * + * VPN connection state reasons + * + * (Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.) + */ +typedef enum NMVPNConnectionStateReason { NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0, NM_VPN_CONNECTION_STATE_REASON_NONE, NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED, @@ -109,6 +168,17 @@ typedef enum NMVPNConnectionStateReason NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED } NMVPNConnectionStateReason; +/** + * NMVPNPluginFailure: + * @NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED: Login failed. + * @NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED: Connect failed. + * @NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG: Invalid IP configuration returned from + * the VPN plugin. + * + * VPN plugin failure reasons + * + * (Corresponds to the NM_VPN_PLUGIN_FAILURE type in nm-vpn-plugin.xml.) + */ typedef enum { NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED, NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED, diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c index 0ac4fbacd4..d5f7608d6e 100644 --- a/libnm-util/crypto.c +++ b/libnm-util/crypto.c @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2011 Red Hat, Inc. */ #include "config.h" @@ -360,8 +360,8 @@ convert_iv (const char *src, conv[2] = '\0'; for (i = 0; i < num; i++) { - conv[0] = src[(i * 2)]; - conv[1] = src[(i * 2) + 1]; + conv[0] = src[(i * 2)]; + conv[1] = src[(i * 2) + 1]; if (!g_ascii_isxdigit (conv[0]) || !g_ascii_isxdigit (conv[1])) { g_set_error (error, NM_CRYPTO_ERROR, NM_CRYPTO_ERR_RAW_IV_INVALID, @@ -526,11 +526,11 @@ crypto_decrypt_private_key_data (const GByteArray *contents, if (password) { decrypted = decrypt_key (cipher, - key_type, - data, - iv, - password, - error); + key_type, + data, + iv, + password, + error); } g_byte_array_free (data, TRUE); } @@ -569,18 +569,18 @@ extract_pem_cert_data (GByteArray *contents, GError **error) if (!find_tag (PEM_CERT_BEGIN, contents, 0, &start)) { g_set_error (error, NM_CRYPTO_ERROR, - NM_CRYPTO_ERR_FILE_FORMAT_INVALID, - _("PEM certificate had no start tag '%s'."), - PEM_CERT_BEGIN); + NM_CRYPTO_ERR_FILE_FORMAT_INVALID, + _("PEM certificate had no start tag '%s'."), + PEM_CERT_BEGIN); goto done; } start += strlen (PEM_CERT_BEGIN); if (!find_tag (PEM_CERT_END, contents, start, &end)) { g_set_error (error, NM_CRYPTO_ERROR, - NM_CRYPTO_ERR_FILE_FORMAT_INVALID, - _("PEM certificate had no end tag '%s'."), - PEM_CERT_END); + NM_CRYPTO_ERR_FILE_FORMAT_INVALID, + _("PEM certificate had no end tag '%s'."), + PEM_CERT_END); goto done; } @@ -596,8 +596,8 @@ extract_pem_cert_data (GByteArray *contents, GError **error) g_assert (cert->len == length); } else { g_set_error (error, NM_CRYPTO_ERROR, - NM_CRYPTO_ERR_DECODE_FAILED, - _("Failed to decode certificate.")); + NM_CRYPTO_ERR_DECODE_FAILED, + _("Failed to decode certificate.")); } done: @@ -747,4 +747,3 @@ crypto_verify_private_key (const char *filename, } return format; } - diff --git a/libnm-util/crypto.h b/libnm-util/crypto.h index 1cbf61c120..edb79007f1 100644 --- a/libnm-util/crypto.h +++ b/libnm-util/crypto.h @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ #ifndef __CRYPTO_H__ diff --git a/libnm-util/crypto_gnutls.c b/libnm-util/crypto_gnutls.c index d9316fcac7..be16d135af 100644 --- a/libnm-util/crypto_gnutls.c +++ b/libnm-util/crypto_gnutls.c @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2009 Red Hat, Inc. + * Copyright 2007 - 2009 Red Hat, Inc. */ #include "config.h" @@ -105,7 +105,7 @@ crypto_md5_hash (const char *salt, gcry_md_final (ctx); memcpy (digest, gcry_md_read (ctx, 0), digest_len); gcry_md_reset (ctx); - + while (nkey && (i < digest_len)) { *(p++) = digest[i++]; nkey--; @@ -475,9 +475,9 @@ crypto_verify_pkcs8 (const GByteArray *data, */ } else { g_set_error (error, NM_CRYPTO_ERROR, - NM_CRYPTO_ERR_FILE_FORMAT_INVALID, - _("Couldn't decode PKCS#8 file: %s"), - gnutls_strerror (err)); + NM_CRYPTO_ERR_FILE_FORMAT_INVALID, + _("Couldn't decode PKCS#8 file: %s"), + gnutls_strerror (err)); return FALSE; } } @@ -491,4 +491,3 @@ crypto_randomize (void *buffer, gsize buffer_len, GError **error) gcry_randomize (buffer, buffer_len, GCRY_STRONG_RANDOM); return TRUE; } - diff --git a/libnm-util/crypto_nss.c b/libnm-util/crypto_nss.c index af3de6664c..1e589ea709 100644 --- a/libnm-util/crypto_nss.c +++ b/libnm-util/crypto_nss.c @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2009 Red Hat, Inc. + * Copyright 2007 - 2009 Red Hat, Inc. */ #include "config.h" @@ -560,4 +560,3 @@ crypto_randomize (void *buffer, gsize buffer_len, GError **error) } return TRUE; } - diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index 572b9108f4..9125d93110 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2013 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include <glib-object.h> @@ -480,7 +477,7 @@ nm_connection_compare (NMConnection *a, /* B / A: ensure settings in B that are not in A make the comparison fail */ if (g_hash_table_size (NM_CONNECTION_GET_PRIVATE (a)->settings) != - g_hash_table_size (NM_CONNECTION_GET_PRIVATE (b)->settings)) + g_hash_table_size (NM_CONNECTION_GET_PRIVATE (b)->settings)) return FALSE; /* A / B: ensure all settings in A match corresponding ones in B */ @@ -832,11 +829,11 @@ _nm_connection_verify (NMConnection *connection, GError **error) if (!_nm_setting_is_base_type (base)) { g_set_error (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID, - "connection type '%s' is not a base type", - ctype); - goto EXIT; + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID, + "connection type '%s' is not a base type", + ctype); + return FALSE; } s_ip4 = nm_connection_get_setting_ip4_config (connection); @@ -1025,8 +1022,8 @@ nm_connection_update_secrets (NMConnection *connection, g_signal_handlers_block_by_func (setting, (GCallback) setting_changed_cb, connection); success_detail = _nm_setting_update_secrets (setting, - setting_hash ? setting_hash : secrets, - error); + setting_hash ? setting_hash : secrets, + error); g_signal_handlers_unblock_by_func (setting, (GCallback) setting_changed_cb, connection); if (success_detail == NM_SETTING_UPDATE_SECRET_ERROR) @@ -1257,7 +1254,7 @@ nm_connection_to_hash (NMConnection *connection, NMSettingHashFlags flags) /** * nm_connection_is_type: * @connection: the #NMConnection - * @type: a setting name to check the connection's type against (like + * @type: a setting name to check the connection's type against (like * %NM_SETTING_WIRELESS_SETTING_NAME or %NM_SETTING_WIRED_SETTING_NAME) * * A convenience function to check if the given @connection is a particular @@ -2077,7 +2074,7 @@ finalize (GObject *object) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMConnection *connection = NM_CONNECTION (object); @@ -2093,7 +2090,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMConnection *connection = NM_CONNECTION (object); @@ -2132,37 +2129,38 @@ nm_connection_class_init (NMConnectionClass *klass) (object_class, PROP_PATH, g_param_spec_string (NM_CONNECTION_PATH, "", "", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /* Signals */ /** - * NMConnection::secrets-updated: - * @connection: the object on which the signal is emitted - * @setting_name: the setting name of the #NMSetting for which secrets were - * updated - * - * The ::secrets-updated signal is emitted when the secrets of a setting - * have been changed. - */ + * NMConnection::secrets-updated: + * @connection: the object on which the signal is emitted + * @setting_name: the setting name of the #NMSetting for which secrets were + * updated + * + * The ::secrets-updated signal is emitted when the secrets of a setting + * have been changed. + */ signals[SECRETS_UPDATED] = g_signal_new (NM_CONNECTION_SECRETS_UPDATED, - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMConnectionClass, secrets_updated), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, - G_TYPE_STRING); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (NMConnectionClass, secrets_updated), + NULL, NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); /** - * NMConnection::secrets-cleared: - * @connection: the object on which the signal is emitted - * - * The ::secrets-cleared signal is emitted when the secrets of a connection - * are cleared. - */ + * NMConnection::secrets-cleared: + * @connection: the object on which the signal is emitted + * + * The ::secrets-cleared signal is emitted when the secrets of a connection + * are cleared. + */ signals[SECRETS_CLEARED] = g_signal_new (NM_CONNECTION_SECRETS_CLEARED, G_OBJECT_CLASS_TYPE (object_class), @@ -2172,15 +2170,15 @@ nm_connection_class_init (NMConnectionClass *klass) G_TYPE_NONE, 0); /** - * NMConnection::changed: - * @connection: the object on which the signal is emitted - * - * The ::changed signal is emitted when any property of any property - * (including secrets) of any setting of the connection is modified, - * or when settings are added or removed. - * - * Since: 0.9.10 - */ + * NMConnection::changed: + * @connection: the object on which the signal is emitted + * + * The ::changed signal is emitted when any property of any property + * (including secrets) of any setting of the connection is modified, + * or when settings are added or removed. + * + * Since: 0.9.10 + */ signals[CHANGED] = g_signal_new (NM_CONNECTION_CHANGED, G_OBJECT_CLASS_TYPE (object_class), @@ -2189,4 +2187,3 @@ nm_connection_class_init (NMConnectionClass *klass) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); } - diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h index 692bdc688b..2cee2be560 100644 --- a/libnm-util/nm-connection.h +++ b/libnm-util/nm-connection.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2013 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_CONNECTION_H diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c index 27e498b5be..2b4ca230a0 100644 --- a/libnm-util/nm-param-spec-specialized.c +++ b/libnm-util/nm-param-spec-specialized.c @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2011 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include "nm-param-spec-specialized.h" @@ -246,7 +243,7 @@ static void iterate_collection (const GValue *value, gpointer user_data) { GSList **list = (GSList **) user_data; - + *list = g_slist_prepend (*list, _gvalue_dup (value)); } @@ -286,8 +283,8 @@ _gvalues_compare_collection (const GValue *value1, const GValue *value2) GSList *iter2; for (iter1 = list1, iter2 = list2, ret = 0; - ret == 0 && iter1 && iter2; - iter1 = iter1->next, iter2 = iter2->next) + ret == 0 && iter1 && iter2; + iter1 = iter1->next, iter2 = iter2->next) ret = _gvalues_compare ((GValue *) iter1->data, (GValue *) iter2->data); } @@ -300,8 +297,8 @@ _gvalues_compare_collection (const GValue *value1, const GValue *value2) static void iterate_map (const GValue *key_val, - const GValue *value_val, - gpointer user_data) + const GValue *value_val, + gpointer user_data) { GHashTable **hash = (GHashTable **) user_data; @@ -340,7 +337,7 @@ _gvalues_compare_map (const GValue *value1, const GValue *value2) if (dbus_g_type_get_map_key_specialization (G_VALUE_TYPE (value1)) != G_TYPE_STRING) { g_warning ("Can not compare maps with '%s' for keys", - g_type_name (dbus_g_type_get_map_key_specialization (G_VALUE_TYPE (value1)))); + g_type_name (dbus_g_type_get_map_key_specialization (G_VALUE_TYPE (value1)))); return 0; } @@ -528,7 +525,7 @@ _gvalues_compare (const GValue *value1, const GValue *value2) if (type_is_fixed_size (type1, NULL)) ret = _gvalues_compare_fixed (value1, value2); - else if (type1 == G_TYPE_STRING) + else if (type1 == G_TYPE_STRING) ret = _gvalues_compare_string (value1, value2); else if (G_VALUE_HOLDS_BOXED (value1)) { gpointer p1 = g_value_get_boxed (value1); @@ -592,8 +589,8 @@ param_specialized_validate (GParamSpec *pspec, GValue *value) static gint param_specialized_values_cmp (GParamSpec *pspec, - const GValue *value1, - const GValue *value2) + const GValue *value1, + const GValue *value2) { return _gvalues_compare (value1, value2); } @@ -622,17 +619,17 @@ _nm_param_spec_specialized_get_type (void) GParamSpec * _nm_param_spec_specialized (const char *name, - const char *nick, - const char *blurb, - GType specialized_type, - GParamFlags flags) + const char *nick, + const char *blurb, + GType specialized_type, + GParamFlags flags) { NMParamSpecSpecialized *pspec; g_return_val_if_fail (g_type_is_a (specialized_type, G_TYPE_BOXED), NULL); pspec = g_param_spec_internal (NM_TYPE_PARAM_SPEC_SPECIALIZED, - name, nick, blurb, flags); + name, nick, blurb, flags); G_PARAM_SPEC (pspec)->value_type = specialized_type; diff --git a/libnm-util/nm-param-spec-specialized.h b/libnm-util/nm-param-spec-specialized.h index a6173674da..7803e919ae 100644 --- a/libnm-util/nm-param-spec-specialized.h +++ b/libnm-util/nm-param-spec-specialized.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2008 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2008 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_PARAM_SPEC_SPECIALIZED_H @@ -38,9 +35,9 @@ typedef struct _NMParamSpecSpecialized NMParamSpecSpecialized; GType _nm_param_spec_specialized_get_type (void); GParamSpec *_nm_param_spec_specialized (const char *name, - const char *nick, - const char *blurb, - GType specialized_type, - GParamFlags flags); + const char *nick, + const char *blurb, + GType specialized_type, + GParamFlags flags); #endif /* NM_PARAM_SPEC_SPECIALIZED_H */ diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index 27a05a61d6..4543642bd8 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2013 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include <string.h> @@ -408,7 +405,7 @@ nm_setting_802_1x_get_ca_path (NMSetting8021x *setting) * properties are ignored if the #NMSetting8021x:system-ca-certs property is * %TRUE, in which case a system-wide CA certificate directory specified at * compile time (using the --system-ca-path configure option) is used in place - * of these properties. + * of these properties. * * Returns: %TRUE if a system CA certificate path should be used, %FALSE if not **/ @@ -2819,7 +2816,7 @@ set_cert_prop_helper (const GValue *value, const char *prop_name, GError **error static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMSetting8021x *setting = NM_SETTING_802_1X (object); NMSetting8021xPrivate *priv = NM_SETTING_802_1X_GET_PRIVATE (setting); @@ -3005,7 +3002,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMSetting8021x *setting = NM_SETTING_802_1X (object); NMSetting8021xPrivate *priv = NM_SETTING_802_1X_GET_PRIVATE (setting); @@ -3467,7 +3464,8 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_PASSWORD, g_param_spec_string (NM_SETTING_802_1X_PASSWORD, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** @@ -3496,7 +3494,8 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_PASSWORD_RAW, _nm_param_spec_specialized (NM_SETTING_802_1X_PASSWORD_RAW, "", "", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** @@ -3564,7 +3563,8 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_PRIVATE_KEY_PASSWORD, g_param_spec_string (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** @@ -3628,7 +3628,8 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_PHASE2_PRIVATE_KEY_PASSWORD, g_param_spec_string (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** @@ -3655,7 +3656,8 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_PIN, g_param_spec_string (NM_SETTING_802_1X_PIN, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** @@ -3686,7 +3688,8 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) (object_class, PROP_SYSTEM_CA_CERTS, g_param_spec_boolean (NM_SETTING_802_1X_SYSTEM_CA_CERTS, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /* Initialize crypto lbrary. */ diff --git a/libnm-util/nm-setting-8021x.h b/libnm-util/nm-setting-8021x.h index 263630ec00..2121f63b62 100644 --- a/libnm-util/nm-setting-8021x.h +++ b/libnm-util/nm-setting-8021x.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2014 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_SETTING_8021X_H diff --git a/libnm-util/nm-setting-adsl.c b/libnm-util/nm-setting-adsl.c index d1629166d7..0a8eba7c0d 100644 --- a/libnm-util/nm-setting-adsl.c +++ b/libnm-util/nm-setting-adsl.c @@ -1,10 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Hicham HAOUARI <hicham.haouari@gmail.com> - * Pantelis Koukousoulas <pktoss@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -20,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2011 - 2013 Red Hat, Inc. + * Copyright 2011 - 2013 Red Hat, Inc. */ #include <string.h> @@ -401,7 +397,8 @@ nm_setting_adsl_class_init (NMSettingAdslClass *setting_class) (object_class, PROP_PASSWORD, g_param_spec_string (NM_SETTING_ADSL_PASSWORD, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** diff --git a/libnm-util/nm-setting-adsl.h b/libnm-util/nm-setting-adsl.h index 484e8a395d..82af6ebdd0 100644 --- a/libnm-util/nm-setting-adsl.h +++ b/libnm-util/nm-setting-adsl.h @@ -1,10 +1,6 @@ /* -*- mode: c; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Hicham HAOUARI <hicham.haouari@gmail.com> - * Pantelis Koukousoulas <pantelis@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -20,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2008 Red Hat, Inc. + * Copyright 2007 - 2008 Red Hat, Inc. */ #ifndef NM_SETTING_ADSL_H diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c index 7c2566cad4..506ecbddee 100644 --- a/libnm-util/nm-setting-bluetooth.c +++ b/libnm-util/nm-setting-bluetooth.c @@ -1,10 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Bastien Nocera <hadess@hadess.net> - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -20,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2013 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include <string.h> @@ -163,7 +159,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) g_prefix_error (error, "%s.%s: ", NM_SETTING_BLUETOOTH_SETTING_NAME, NM_SETTING_BLUETOOTH_TYPE); return FALSE; } else if (!g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_DUN) && - !g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_PANU)) { + !g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_PANU)) { g_set_error (error, NM_SETTING_BLUETOOTH_ERROR, NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY, @@ -217,7 +213,7 @@ finalize (GObject *object) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMSettingBluetoothPrivate *priv = NM_SETTING_BLUETOOTH_GET_PRIVATE (object); @@ -239,7 +235,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMSettingBluetooth *setting = NM_SETTING_BLUETOOTH (object); @@ -281,7 +277,8 @@ nm_setting_bluetooth_class_init (NMSettingBluetoothClass *setting_class) (object_class, PROP_BDADDR, _nm_param_spec_specialized (NM_SETTING_BLUETOOTH_BDADDR, "", "", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -294,6 +291,7 @@ nm_setting_bluetooth_class_init (NMSettingBluetoothClass *setting_class) (object_class, PROP_TYPE, g_param_spec_string (NM_SETTING_BLUETOOTH_TYPE, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); } diff --git a/libnm-util/nm-setting-bluetooth.h b/libnm-util/nm-setting-bluetooth.h index 95a8852abd..caf12158c0 100644 --- a/libnm-util/nm-setting-bluetooth.h +++ b/libnm-util/nm-setting-bluetooth.h @@ -1,10 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Bastien Nocera <hadess@hadess.net> - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -20,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2009 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2009 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_SETTING_BLUETOOTH_H diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c index a6032415f3..10766f564d 100644 --- a/libnm-util/nm-setting-bond.c +++ b/libnm-util/nm-setting-bond.c @@ -1,8 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Thomas Graf <tgraf@redhat.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2011 - 2013 Red Hat, Inc. + * Copyright 2011 - 2013 Red Hat, Inc. */ #include <string.h> @@ -313,8 +311,8 @@ nm_setting_bond_validate_option (const char *name, case TYPE_STR: return validate_list (name, value, &defaults[i]); case TYPE_BOTH: - return validate_int (name, value, &defaults[i]) - || validate_list (name, value, &defaults[i]); + return ( validate_int (name, value, &defaults[i]) + || validate_list (name, value, &defaults[i])); case TYPE_IP: return validate_ip (name, value); case TYPE_IFNAME: @@ -753,7 +751,7 @@ get_property (GObject *object, guint prop_id, break; case PROP_OPTIONS: g_value_set_boxed (value, priv->options); - break; + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -785,7 +783,8 @@ nm_setting_bond_class_init (NMSettingBondClass *setting_class) (object_class, PROP_INTERFACE_NAME, g_param_spec_string (NM_SETTING_BOND_INTERFACE_NAME, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -799,6 +798,7 @@ nm_setting_bond_class_init (NMSettingBondClass *setting_class) (object_class, PROP_OPTIONS, _nm_param_spec_specialized (NM_SETTING_BOND_OPTIONS, "", "", DBUS_TYPE_G_MAP_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); } diff --git a/libnm-util/nm-setting-bond.h b/libnm-util/nm-setting-bond.h index f3358c7f8d..e7807380bf 100644 --- a/libnm-util/nm-setting-bond.h +++ b/libnm-util/nm-setting-bond.h @@ -1,8 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Thomas Graf <tgraf@redhat.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2011 - 2013 Red Hat, Inc. + * Copyright 2011 - 2013 Red Hat, Inc. */ #ifndef NM_SETTING_BOND_H diff --git a/libnm-util/nm-setting-bridge-port.c b/libnm-util/nm-setting-bridge-port.c index 7430f36c2f..496de581ab 100644 --- a/libnm-util/nm-setting-bridge-port.c +++ b/libnm-util/nm-setting-bridge-port.c @@ -1,8 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2012 - 2013 Red Hat, Inc. + * Copyright 2012 - 2013 Red Hat, Inc. */ #include <string.h> @@ -266,7 +264,9 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) (object_class, PROP_PRIORITY, g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PRIORITY, "", "", 0, BR_MAX_PORT_PRIORITY, BR_DEF_PRIORITY, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -281,7 +281,9 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) (object_class, PROP_PATH_COST, g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PATH_COST, "", "", 0, BR_MAX_PATH_COST, 100, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -296,6 +298,7 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) (object_class, PROP_HAIRPIN_MODE, g_param_spec_boolean (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "", "", FALSE, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); } diff --git a/libnm-util/nm-setting-bridge-port.h b/libnm-util/nm-setting-bridge-port.h index 7848b75fff..fcaf22ed09 100644 --- a/libnm-util/nm-setting-bridge-port.h +++ b/libnm-util/nm-setting-bridge-port.h @@ -1,8 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2012 Red Hat, Inc. + * Copyright 2012 Red Hat, Inc. */ #ifndef NM_SETTING_BRIDGE_PORT_H diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c index ddcd6ae30e..789660036f 100644 --- a/libnm-util/nm-setting-bridge.c +++ b/libnm-util/nm-setting-bridge.c @@ -1,8 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Thomas Graf <tgraf@redhat.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2011 - 2013 Red Hat, Inc. + * Copyright 2011 - 2013 Red Hat, Inc. */ #include <string.h> @@ -457,7 +455,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) (object_class, PROP_INTERFACE_NAME, g_param_spec_string (NM_SETTING_BRIDGE_INTERFACE_NAME, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -473,7 +472,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) (object_class, PROP_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_BRIDGE_MAC_ADDRESS, "", "", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -487,7 +487,9 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) (object_class, PROP_STP, g_param_spec_boolean (NM_SETTING_BRIDGE_STP, "", "", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -503,7 +505,9 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) (object_class, PROP_PRIORITY, g_param_spec_uint (NM_SETTING_BRIDGE_PRIORITY, "", "", 0, G_MAXUINT16, 0x8000, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -517,7 +521,9 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) (object_class, PROP_FORWARD_DELAY, g_param_spec_uint (NM_SETTING_BRIDGE_FORWARD_DELAY, "", "", 0, BR_MAX_FORWARD_DELAY, 15, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -531,7 +537,9 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) (object_class, PROP_HELLO_TIME, g_param_spec_uint (NM_SETTING_BRIDGE_HELLO_TIME, "", "", 0, BR_MAX_HELLO_TIME, 2, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -545,7 +553,9 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) (object_class, PROP_MAX_AGE, g_param_spec_uint (NM_SETTING_BRIDGE_MAX_AGE, "", "", 0, BR_MAX_MAX_AGE, 20, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -559,7 +569,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) (object_class, PROP_AGEING_TIME, g_param_spec_uint (NM_SETTING_BRIDGE_AGEING_TIME, "", "", 0, BR_MAX_AGEING_TIME, 300, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-util/nm-setting-bridge.h b/libnm-util/nm-setting-bridge.h index 1e8957045b..f6b59262b8 100644 --- a/libnm-util/nm-setting-bridge.h +++ b/libnm-util/nm-setting-bridge.h @@ -1,8 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Thomas Graf <tgraf@redhat.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2011 - 2012 Red Hat, Inc. + * Copyright 2011 - 2012 Red Hat, Inc. */ #ifndef NM_SETTING_BRIDGE_H diff --git a/libnm-util/nm-setting-cdma.c b/libnm-util/nm-setting-cdma.c index ab62d1fc96..976a59680a 100644 --- a/libnm-util/nm-setting-cdma.c +++ b/libnm-util/nm-setting-cdma.c @@ -1,8 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2013 Red Hat, Inc. */ #include <string.h> @@ -231,7 +229,7 @@ finalize (GObject *object) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMSettingCdmaPrivate *priv = NM_SETTING_CDMA_GET_PRIVATE (object); @@ -259,7 +257,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMSettingCdma *setting = NM_SETTING_CDMA (object); @@ -338,7 +336,8 @@ nm_setting_cdma_class_init (NMSettingCdmaClass *setting_class) (object_class, PROP_PASSWORD, g_param_spec_string (NM_SETTING_CDMA_PASSWORD, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** diff --git a/libnm-util/nm-setting-cdma.h b/libnm-util/nm-setting-cdma.h index 0dc290dac4..eee4420592 100644 --- a/libnm-util/nm-setting-cdma.h +++ b/libnm-util/nm-setting-cdma.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2011 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_SETTING_CDMA_H diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c index c49413bef3..f206bbb032 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2013 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include <string.h> @@ -459,7 +456,7 @@ nm_setting_connection_remove_permission (NMSettingConnection *setting, * be a username. See #NMSettingConnection:permissions: for more details. * * Returns: %TRUE if the permission was found and removed; %FALSE if it was not. - * + * * Since: 0.9.10 */ gboolean @@ -1109,7 +1106,8 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) (object_class, PROP_ID, g_param_spec_string (NM_SETTING_CONNECTION_ID, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -1132,7 +1130,8 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) (object_class, PROP_UUID, g_param_spec_string (NM_SETTING_CONNECTION_UUID, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -1156,7 +1155,8 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) (object_class, PROP_INTERFACE_NAME, g_param_spec_string (NM_SETTING_CONNECTION_INTERFACE_NAME, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -1172,7 +1172,8 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) (object_class, PROP_TYPE, g_param_spec_string (NM_SETTING_CONNECTION_TYPE, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -1209,7 +1210,9 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) (object_class, PROP_AUTOCONNECT, g_param_spec_boolean (NM_SETTING_CONNECTION_AUTOCONNECT, "", "", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -1227,7 +1230,9 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) (object_class, PROP_TIMESTAMP, g_param_spec_uint64 (NM_SETTING_CONNECTION_TIMESTAMP, "", "", 0, G_MAXUINT64, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -1241,7 +1246,9 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) (object_class, PROP_READ_ONLY, g_param_spec_boolean (NM_SETTING_CONNECTION_READ_ONLY, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -1256,7 +1263,9 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) (object_class, PROP_ZONE, g_param_spec_string (NM_SETTING_CONNECTION_ZONE, "", "", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -1268,7 +1277,9 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) (object_class, PROP_MASTER, g_param_spec_string (NM_SETTING_CONNECTION_MASTER, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_FUZZY_IGNORE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -1282,7 +1293,9 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) (object_class, PROP_SLAVE_TYPE, g_param_spec_string (NM_SETTING_CONNECTION_SLAVE_TYPE, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_FUZZY_IGNORE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -1298,7 +1311,8 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) (object_class, PROP_SECONDARIES, _nm_param_spec_specialized (NM_SETTING_CONNECTION_SECONDARIES, "", "", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -1313,6 +1327,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) (object_class, PROP_GATEWAY_PING_TIMEOUT, g_param_spec_uint (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, "", "", 0, 30, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); } diff --git a/libnm-util/nm-setting-connection.h b/libnm-util/nm-setting-connection.h index ff2af7a2c8..143fa11d58 100644 --- a/libnm-util/nm-setting-connection.h +++ b/libnm-util/nm-setting-connection.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2014 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_SETTING_CONNECTION_H @@ -136,7 +133,7 @@ gboolean nm_setting_connection_remove_permission_by_value (NMSettingConnectio const char *nm_setting_connection_get_master (NMSettingConnection *setting); gboolean nm_setting_connection_is_slave_type (NMSettingConnection *setting, - const char *type); + const char *type); const char *nm_setting_connection_get_slave_type (NMSettingConnection *setting); guint32 nm_setting_connection_get_num_secondaries (NMSettingConnection *setting); diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c index f9c9d39f13..4839f7fe75 100644 --- a/libnm-util/nm-setting-dcb.c +++ b/libnm-util/nm-setting-dcb.c @@ -1,8 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2013 Red Hat, Inc. + * Copyright 2013 Red Hat, Inc. */ #include <string.h> @@ -987,7 +985,8 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) (object_class, PROP_APP_FCOE_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_FCOE_PRIORITY, "", "", -1, 7, -1, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1002,7 +1001,8 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) (object_class, PROP_APP_FCOE_MODE, g_param_spec_string (NM_SETTING_DCB_APP_FCOE_MODE, "", "", NM_SETTING_DCB_FCOE_MODE_FABRIC, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1034,7 +1034,8 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) (object_class, PROP_APP_ISCSI_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_ISCSI_PRIORITY, "", "", -1, 7, -1, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1066,7 +1067,8 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) (object_class, PROP_APP_FIP_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_FIP_PRIORITY, "", "", -1, 7, -1, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1203,4 +1205,3 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-util/nm-setting-dcb.h b/libnm-util/nm-setting-dcb.h index 37dd36e7b7..ac34521e0d 100644 --- a/libnm-util/nm-setting-dcb.h +++ b/libnm-util/nm-setting-dcb.h @@ -1,8 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2013 Red Hat, Inc. + * Copyright 2013 Red Hat, Inc. */ #ifndef NM_SETTING_DCB_H diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c index 3b814cd7c1..51ad390249 100644 --- a/libnm-util/nm-setting-gsm.c +++ b/libnm-util/nm-setting-gsm.c @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2013 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include <string.h> @@ -424,7 +421,7 @@ finalize (GObject *object) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMSettingGsmPrivate *priv = NM_SETTING_GSM_GET_PRIVATE (object); char *tmp; @@ -483,7 +480,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMSettingGsm *setting = NM_SETTING_GSM (object); @@ -584,7 +581,8 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) (object_class, PROP_PASSWORD, g_param_spec_string (NM_SETTING_GSM_PASSWORD, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** @@ -657,7 +655,8 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) NM_SETTING_GSM_NETWORK_TYPE_ANY, NM_SETTING_GSM_NETWORK_TYPE_4G, NM_SETTING_GSM_NETWORK_TYPE_ANY, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -676,7 +675,8 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) NM_SETTING_GSM_BAND_UNKNOWN, NM_SETTING_GSM_BANDS_MAX, NM_SETTING_GSM_BAND_ANY, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -690,7 +690,8 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class) (object_class, PROP_PIN, g_param_spec_string (NM_SETTING_GSM_PIN, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** diff --git a/libnm-util/nm-setting-gsm.h b/libnm-util/nm-setting-gsm.h index 6d8e46d0ad..564a8b4b9d 100644 --- a/libnm-util/nm-setting-gsm.h +++ b/libnm-util/nm-setting-gsm.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2011 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_SETTING_GSM_H diff --git a/libnm-util/nm-setting-infiniband.c b/libnm-util/nm-setting-infiniband.c index b244a9d4c5..4e470e561b 100644 --- a/libnm-util/nm-setting-infiniband.c +++ b/libnm-util/nm-setting-infiniband.c @@ -401,7 +401,8 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) (object_class, PROP_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_INFINIBAND_MAC_ADDRESS, "", "", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -414,7 +415,9 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) (object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_INFINIBAND_MTU, "", "", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -427,7 +430,9 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) (object_class, PROP_TRANSPORT_MODE, g_param_spec_string (NM_SETTING_INFINIBAND_TRANSPORT_MODE, "", "", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -442,7 +447,9 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) (object_class, PROP_P_KEY, g_param_spec_int (NM_SETTING_INFINIBAND_P_KEY, "", "", -1, 0xFFFF, -1, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -457,7 +464,9 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) (object_class, PROP_PARENT, g_param_spec_string (NM_SETTING_INFINIBAND_PARENT, "", "", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); } diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index 39804b0cbf..bc2ef8731a 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2014 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include <string.h> @@ -1074,7 +1071,7 @@ finalize (GObject *object) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMSettingIP4Config *setting = NM_SETTING_IP4_CONFIG (object); NMSettingIP4ConfigPrivate *priv = NM_SETTING_IP4_CONFIG_GET_PRIVATE (setting); @@ -1152,7 +1149,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMSettingIP4Config *setting = NM_SETTING_IP4_CONFIG (object); NMSettingIP4ConfigPrivate *priv = NM_SETTING_IP4_CONFIG_GET_PRIVATE (setting); @@ -1238,7 +1235,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) (object_class, PROP_METHOD, g_param_spec_string (NM_SETTING_IP4_CONFIG_METHOD, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -1290,7 +1288,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) (object_class, PROP_ADDRESSES, _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ADDRESSES, "", "", DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -1302,7 +1301,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) (object_class, PROP_ADDRESS_LABELS, _nm_param_spec_specialized ("address-labels", "", "", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -1321,7 +1321,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) (object_class, PROP_ROUTES, _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ROUTES, "", "", DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -1335,7 +1336,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) (object_class, PROP_IGNORE_AUTO_ROUTES, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1351,7 +1353,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) (object_class, PROP_IGNORE_AUTO_DNS, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1380,7 +1383,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) (object_class, PROP_DHCP_SEND_HOSTNAME, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME, "", "", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1393,7 +1397,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) (object_class, PROP_DHCP_HOSTNAME, g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -1406,7 +1411,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) (object_class, PROP_NEVER_DEFAULT, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1423,7 +1429,8 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) (object_class, PROP_MAY_FAIL, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_MAY_FAIL, "", "", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); } @@ -1886,4 +1893,3 @@ nm_ip4_route_set_metric (NMIP4Route *route, guint32 metric) route->metric = metric; } - diff --git a/libnm-util/nm-setting-ip4-config.h b/libnm-util/nm-setting-ip4-config.h index 3f0d006bfa..1b7c23072d 100644 --- a/libnm-util/nm-setting-ip4-config.h +++ b/libnm-util/nm-setting-ip4-config.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2014 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_SETTING_IP4_CONFIG_H diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 708e7b857d..49c32dd662 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * David Cantrell <dcantrel@redhat.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ #include <string.h> @@ -174,7 +171,7 @@ const struct in6_addr * nm_setting_ip6_config_get_dns (NMSettingIP6Config *setting, guint32 i) { NMSettingIP6ConfigPrivate *priv; - + g_return_val_if_fail (NM_IS_SETTING_IP6_CONFIG (setting), NULL); @@ -905,7 +902,7 @@ finalize (GObject *object) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMSettingIP6ConfigPrivate *priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (object); @@ -957,7 +954,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMSettingIP6ConfigPrivate *priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (object); @@ -1034,7 +1031,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) (object_class, PROP_METHOD, g_param_spec_string (NM_SETTING_IP6_CONFIG_METHOD, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -1104,7 +1102,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) (object_class, PROP_ADDRESSES, _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ADDRESSES, "", "", DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -1123,7 +1122,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) (object_class, PROP_ROUTES, _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ROUTES, "", "", DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -1137,7 +1137,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) (object_class, PROP_IGNORE_AUTO_ROUTES, g_param_spec_boolean (NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1153,7 +1154,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) (object_class, PROP_IGNORE_AUTO_DNS, g_param_spec_boolean (NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1167,7 +1169,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) (object_class, PROP_NEVER_DEFAULT, g_param_spec_boolean (NM_SETTING_IP6_CONFIG_NEVER_DEFAULT, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1184,7 +1187,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) (object_class, PROP_MAY_FAIL, g_param_spec_boolean (NM_SETTING_IP6_CONFIG_MAY_FAIL, "", "", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1204,7 +1208,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR, NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); } diff --git a/libnm-util/nm-setting-ip6-config.h b/libnm-util/nm-setting-ip6-config.h index d1f4ca842c..4486a40e26 100644 --- a/libnm-util/nm-setting-ip6-config.h +++ b/libnm-util/nm-setting-ip6-config.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * David Cantrell <dcantrel@redhat.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ #ifndef NM_SETTING_IP6_CONFIG_H @@ -186,7 +183,7 @@ void nm_ip6_route_set_dest (NMIP6Route *route, guint32 nm_ip6_route_get_prefix (NMIP6Route *route); void nm_ip6_route_set_prefix (NMIP6Route *route, - guint32 prefix); + guint32 prefix); const struct in6_addr *nm_ip6_route_get_next_hop (NMIP6Route *route); void nm_ip6_route_set_next_hop (NMIP6Route *route, diff --git a/libnm-util/nm-setting-olpc-mesh.c b/libnm-util/nm-setting-olpc-mesh.c index 462b80b958..408f6833f5 100644 --- a/libnm-util/nm-setting-olpc-mesh.c +++ b/libnm-util/nm-setting-olpc-mesh.c @@ -1,10 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * Sjoerd Simons <sjoerd.simons@collabora.co.uk> - * Daniel Drake <dsd@laptop.org> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -20,9 +15,9 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2013 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. - * (C) Copyright 2009 One Laptop per Child + * Copyright 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2009 One Laptop per Child */ #include <string.h> @@ -175,7 +170,7 @@ finalize (GObject *object) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMSettingOlpcMeshPrivate *priv = NM_SETTING_OLPC_MESH_GET_PRIVATE (object); @@ -201,7 +196,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMSettingOlpcMesh *setting = NM_SETTING_OLPC_MESH (object); @@ -245,7 +240,8 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *setting_class) (object_class, PROP_SSID, _nm_param_spec_specialized (NM_SETTING_OLPC_MESH_SSID, "", "", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -257,7 +253,9 @@ nm_setting_olpc_mesh_class_init (NMSettingOlpcMeshClass *setting_class) (object_class, PROP_CHANNEL, g_param_spec_uint (NM_SETTING_OLPC_MESH_CHANNEL, "", "", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** diff --git a/libnm-util/nm-setting-olpc-mesh.h b/libnm-util/nm-setting-olpc-mesh.h index 59c03b485e..54b268e2c6 100644 --- a/libnm-util/nm-setting-olpc-mesh.h +++ b/libnm-util/nm-setting-olpc-mesh.h @@ -1,10 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * Sjoerd Simons <sjoerd.simons@collabora.co.uk> - * Daniel Drake <dsd@laptop.org> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -20,9 +15,9 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2008 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. - * (C) Copyright 2009 One Laptop per Child + * Copyright 2007 - 2008 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. + * Copyright 2009 One Laptop per Child */ #ifndef NM_SETTING_OLPC_MESH_H diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c index f7c3317550..0e7c598b90 100644 --- a/libnm-util/nm-setting-ppp.c +++ b/libnm-util/nm-setting-ppp.c @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2013 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include <glib/gi18n.h> @@ -417,7 +414,7 @@ nm_setting_ppp_init (NMSettingPPP *setting) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMSettingPPPPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (object); @@ -484,7 +481,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMSettingPPP *setting = NM_SETTING_PPP (object); @@ -574,7 +571,8 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_NOAUTH, g_param_spec_boolean (NM_SETTING_PPP_NOAUTH, "", "", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -586,7 +584,8 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_REFUSE_EAP, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_EAP, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -598,7 +597,8 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_REFUSE_PAP, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_PAP, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -610,7 +610,8 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_REFUSE_CHAP, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_CHAP, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -622,7 +623,8 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_REFUSE_MSCHAP, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAP, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -634,7 +636,8 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_REFUSE_MSCHAPV2, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAPV2, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -646,7 +649,9 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_NOBSDCOMP, g_param_spec_boolean (NM_SETTING_PPP_NOBSDCOMP, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -658,7 +663,9 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_NODEFLATE, g_param_spec_boolean (NM_SETTING_PPP_NODEFLATE, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -670,7 +677,9 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_NO_VJ_COMP, g_param_spec_boolean (NM_SETTING_PPP_NO_VJ_COMP, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -685,7 +694,8 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_REQUIRE_MPPE, g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -712,7 +722,8 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_MPPE_STATEFUL, g_param_spec_boolean (NM_SETTING_PPP_MPPE_STATEFUL, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -726,7 +737,8 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_CRTSCTS, g_param_spec_boolean (NM_SETTING_PPP_CRTSCTS, "", "", FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -740,7 +752,9 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_BAUD, g_param_spec_uint (NM_SETTING_PPP_BAUD, "", "", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -754,7 +768,8 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_MRU, g_param_spec_uint (NM_SETTING_PPP_MRU, "", "", 0, 16384, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -767,7 +782,9 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_PPP_MTU, "", "", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -782,7 +799,9 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_LCP_ECHO_FAILURE, g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_FAILURE, "", "", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -797,6 +816,8 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) (object_class, PROP_LCP_ECHO_INTERVAL, g_param_spec_uint (NM_SETTING_PPP_LCP_ECHO_INTERVAL, "", "", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); } diff --git a/libnm-util/nm-setting-ppp.h b/libnm-util/nm-setting-ppp.h index 17a7181dbd..5733902b83 100644 --- a/libnm-util/nm-setting-ppp.h +++ b/libnm-util/nm-setting-ppp.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2008 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2008 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_SETTING_PPP_H diff --git a/libnm-util/nm-setting-pppoe.c b/libnm-util/nm-setting-pppoe.c index 6e57e987b0..a3923336c1 100644 --- a/libnm-util/nm-setting-pppoe.c +++ b/libnm-util/nm-setting-pppoe.c @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2013 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include <string.h> @@ -210,7 +207,7 @@ nm_setting_pppoe_init (NMSettingPPPOE *setting) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMSettingPPPOEPrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (object); @@ -238,7 +235,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMSettingPPPOE *setting = NM_SETTING_PPPOE (object); @@ -325,7 +322,8 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class) (object_class, PROP_PASSWORD, g_param_spec_string (NM_SETTING_PPPOE_PASSWORD, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** diff --git a/libnm-util/nm-setting-pppoe.h b/libnm-util/nm-setting-pppoe.h index 9be90ddb59..9d04af9e24 100644 --- a/libnm-util/nm-setting-pppoe.h +++ b/libnm-util/nm-setting-pppoe.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2011 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_SETTING_PPPOE_H diff --git a/libnm-util/nm-setting-private.h b/libnm-util/nm-setting-private.h index fae03762f2..99590b9e14 100644 --- a/libnm-util/nm-setting-private.h +++ b/libnm-util/nm-setting-private.h @@ -15,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2011 Red Hat, Inc. + * Copyright 2011 Red Hat, Inc. */ #ifndef NM_SETTING_PRIVATE_H @@ -123,4 +123,3 @@ NMSettingVerifyResult _nm_setting_verify (NMSetting *setting, GError **error); #endif /* NM_SETTING_PRIVATE_H */ - diff --git a/libnm-util/nm-setting-serial.c b/libnm-util/nm-setting-serial.c index f0d26fad9f..4a7ee89e65 100644 --- a/libnm-util/nm-setting-serial.c +++ b/libnm-util/nm-setting-serial.c @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2011 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include <string.h> @@ -183,7 +180,7 @@ nm_setting_serial_init (NMSettingSerial *setting) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMSettingSerialPrivate *priv = NM_SETTING_SERIAL_GET_PRIVATE (object); @@ -211,7 +208,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMSettingSerial *setting = NM_SETTING_SERIAL (object); @@ -263,7 +260,8 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class) (object_class, PROP_BAUD, g_param_spec_uint (NM_SETTING_SERIAL_BAUD, "", "", 0, G_MAXUINT, 57600, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -275,7 +273,8 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class) (object_class, PROP_BITS, g_param_spec_uint (NM_SETTING_SERIAL_BITS, "", "", 5, 8, 8, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -288,7 +287,8 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class) (object_class, PROP_PARITY, g_param_spec_char (NM_SETTING_SERIAL_PARITY, "", "", 'E', 'o', 'n', - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -301,7 +301,8 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class) (object_class, PROP_STOPBITS, g_param_spec_uint (NM_SETTING_SERIAL_STOPBITS, "", "", 1, 2, 1, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -313,6 +314,7 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class) (object_class, PROP_SEND_DELAY, g_param_spec_uint64 (NM_SETTING_SERIAL_SEND_DELAY, "", "", 0, G_MAXUINT64, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); } diff --git a/libnm-util/nm-setting-serial.h b/libnm-util/nm-setting-serial.h index 5a73d10301..44d46cf37a 100644 --- a/libnm-util/nm-setting-serial.h +++ b/libnm-util/nm-setting-serial.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2008 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2008 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_SETTING_SERIAL_H diff --git a/libnm-util/nm-setting-team-port.c b/libnm-util/nm-setting-team-port.c index a14b0f099e..ad9d8327ed 100644 --- a/libnm-util/nm-setting-team-port.c +++ b/libnm-util/nm-setting-team-port.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -16,6 +14,8 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. + * + * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ #include <string.h> @@ -178,6 +178,7 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *setting_class) (object_class, PROP_CONFIG, g_param_spec_string (NM_SETTING_TEAM_PORT_CONFIG, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); } diff --git a/libnm-util/nm-setting-team-port.h b/libnm-util/nm-setting-team-port.h index 50b9f7e360..4e8022202a 100644 --- a/libnm-util/nm-setting-team-port.h +++ b/libnm-util/nm-setting-team-port.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -16,6 +14,8 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. + * + * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ #ifndef NM_SETTING_TEAM_PORT_H diff --git a/libnm-util/nm-setting-team.c b/libnm-util/nm-setting-team.c index 1a5ed5d6ce..046ce51129 100644 --- a/libnm-util/nm-setting-team.c +++ b/libnm-util/nm-setting-team.c @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -16,6 +14,8 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. + * + * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ #include <string.h> @@ -232,7 +232,8 @@ nm_setting_team_class_init (NMSettingTeamClass *setting_class) (object_class, PROP_INTERFACE_NAME, g_param_spec_string (NM_SETTING_TEAM_INTERFACE_NAME, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -247,6 +248,7 @@ nm_setting_team_class_init (NMSettingTeamClass *setting_class) (object_class, PROP_CONFIG, g_param_spec_string (NM_SETTING_TEAM_CONFIG, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); } diff --git a/libnm-util/nm-setting-team.h b/libnm-util/nm-setting-team.h index 978eed07b7..d67c8c71b6 100644 --- a/libnm-util/nm-setting-team.h +++ b/libnm-util/nm-setting-team.h @@ -1,7 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -16,6 +14,8 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. + * + * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ #ifndef NM_SETTING_TEAM_H diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index 925fd9f051..21adfdb25d 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -1,8 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Weiping Pan <wpan@redhat.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2011 - 2014 Red Hat, Inc. + * Copyright 2011 - 2014 Red Hat, Inc. */ #include <stdlib.h> @@ -756,7 +754,9 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) (object_class, PROP_INTERFACE_NAME, g_param_spec_string (NM_SETTING_VLAN_INTERFACE_NAME, "", "", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -771,7 +771,9 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) (object_class, PROP_PARENT, g_param_spec_string (NM_SETTING_VLAN_PARENT, "", "", NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -784,7 +786,9 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) (object_class, PROP_ID, g_param_spec_uint (NM_SETTING_VLAN_ID, "", "", 0, 4095, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -800,7 +804,9 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) (object_class, PROP_FLAGS, g_param_spec_uint (NM_SETTING_VLAN_FLAGS, "", "", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -814,7 +820,8 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) (object_class, PROP_INGRESS_PRIORITY_MAP, _nm_param_spec_specialized (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, "", "", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -828,6 +835,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) (object_class, PROP_EGRESS_PRIORITY_MAP, _nm_param_spec_specialized (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, "", "", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); } diff --git a/libnm-util/nm-setting-vlan.h b/libnm-util/nm-setting-vlan.h index ca77f6fed8..3e209480c8 100644 --- a/libnm-util/nm-setting-vlan.h +++ b/libnm-util/nm-setting-vlan.h @@ -1,8 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Weiping Pan <wpan@redhat.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2011 - 2014 Red Hat, Inc. + * Copyright 2011 - 2014 Red Hat, Inc. */ #ifndef NM_SETTING_VLAN_H diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c index 5c1c30fe0f..3afc4dd93c 100644 --- a/libnm-util/nm-setting-vpn.c +++ b/libnm-util/nm-setting-vpn.c @@ -1,8 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,8 +15,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2013 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include <string.h> @@ -479,7 +476,7 @@ update_secret_hash (NMSetting *setting, if (!value || !strlen (value)) { g_set_error (error, NM_SETTING_ERROR, NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH, - "Secret %s value was empty", name); + "Secret %s value was empty", name); return NM_SETTING_UPDATE_SECRET_ERROR; } } @@ -659,9 +656,9 @@ compare_property (NMSetting *setting, static gboolean clear_secrets_with_flags (NMSetting *setting, - GParamSpec *pspec, - NMSettingClearSecretsWithFlagsFn func, - gpointer user_data) + GParamSpec *pspec, + NMSettingClearSecretsWithFlagsFn func, + gpointer user_data) { NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); GHashTableIter iter; @@ -731,7 +728,7 @@ copy_hash (gpointer key, gpointer value, gpointer user_data) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (object); GHashTable *new_hash; @@ -767,7 +764,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMSettingVPN *setting = NM_SETTING_VPN (object); NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); @@ -867,7 +864,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class) (object_class, PROP_SECRETS, _nm_param_spec_specialized (NM_SETTING_VPN_SECRETS, "", "", DBUS_TYPE_G_MAP_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-util/nm-setting-vpn.h b/libnm-util/nm-setting-vpn.h index 259384bfd9..3eb51ee9d6 100644 --- a/libnm-util/nm-setting-vpn.h +++ b/libnm-util/nm-setting-vpn.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2013 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2013 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_SETTING_VPN_H diff --git a/libnm-util/nm-setting-wimax.c b/libnm-util/nm-setting-wimax.c index 3554724d00..1a4a6ec384 100644 --- a/libnm-util/nm-setting-wimax.c +++ b/libnm-util/nm-setting-wimax.c @@ -16,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2011 - 2013 Red Hat, Inc. - * (C) Copyright 2009 Novell, Inc. + * Copyright 2011 - 2013 Red Hat, Inc. + * Copyright 2009 Novell, Inc. */ #include <string.h> @@ -179,7 +179,7 @@ finalize (GObject *object) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMSettingWimaxPrivate *priv = NM_SETTING_WIMAX_GET_PRIVATE (object); @@ -201,7 +201,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMSettingWimax *setting = NM_SETTING_WIMAX (object); diff --git a/libnm-util/nm-setting-wimax.h b/libnm-util/nm-setting-wimax.h index 935960d8f9..781d717c2d 100644 --- a/libnm-util/nm-setting-wimax.h +++ b/libnm-util/nm-setting-wimax.h @@ -16,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2009 Novell, Inc. + * Copyright 2009 Novell, Inc. */ #ifndef NM_SETTING_WIMAX_H diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c index e10ebeb4e7..bc82bf3477 100644 --- a/libnm-util/nm-setting-wired.c +++ b/libnm-util/nm-setting-wired.c @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2014 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include <string.h> @@ -892,7 +889,8 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) (object_class, PROP_SPEED, g_param_spec_uint (NM_SETTING_WIRED_SPEED, "", "", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -919,7 +917,8 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) (object_class, PROP_AUTO_NEGOTIATE, g_param_spec_boolean (NM_SETTING_WIRED_AUTO_NEGOTIATE, "", "", TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -933,7 +932,8 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) (object_class, PROP_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_WIRED_MAC_ADDRESS, "", "", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -946,7 +946,8 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) (object_class, PROP_CLONED_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_WIRED_CLONED_MAC_ADDRESS, "", "", DBUS_TYPE_G_UCHAR_ARRAY, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -961,7 +962,8 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) (object_class, PROP_MAC_ADDRESS_BLACKLIST, _nm_param_spec_specialized (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, "", "", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -974,7 +976,9 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) (object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_WIRED_MTU, "", "", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -992,7 +996,8 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) (object_class, PROP_S390_SUBCHANNELS, _nm_param_spec_specialized (NM_SETTING_WIRED_S390_SUBCHANNELS, "", "", DBUS_TYPE_G_ARRAY_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -1005,7 +1010,8 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) (object_class, PROP_S390_NETTYPE, g_param_spec_string (NM_SETTING_WIRED_S390_NETTYPE, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); /** @@ -1020,7 +1026,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) (object_class, PROP_S390_OPTIONS, _nm_param_spec_specialized (NM_SETTING_WIRED_S390_OPTIONS, "", "", DBUS_TYPE_G_MAP_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-util/nm-setting-wired.h b/libnm-util/nm-setting-wired.h index 9580b0a8b4..33d6d54dde 100644 --- a/libnm-util/nm-setting-wired.h +++ b/libnm-util/nm-setting-wired.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2014 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_SETTING_WIRED_H diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index fad6c8e72b..2c46766476 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2014 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include <config.h> @@ -1068,7 +1065,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) g_set_error_literal (error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, - _("property is invalid")); + _("property is invalid")); g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_SETTING_WIRELESS_SECURITY_PAIRWISE); return FALSE; } @@ -1183,7 +1180,7 @@ finalize (GObject *object) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMSettingWirelessSecurity *setting = NM_SETTING_WIRELESS_SECURITY (object); NMSettingWirelessSecurityPrivate *priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (setting); @@ -1263,7 +1260,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMSettingWirelessSecurity *setting = NM_SETTING_WIRELESS_SECURITY (object); NMSettingWirelessSecurityPrivate *priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (setting); @@ -1357,7 +1354,8 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting (object_class, PROP_KEY_MGMT, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_REQUIRED | + G_PARAM_READWRITE | + NM_SETTING_PARAM_REQUIRED | G_PARAM_STATIC_STRINGS)); /** @@ -1372,7 +1370,8 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting (object_class, PROP_WEP_TX_KEYIDX, g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, "", "", 0, 3, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1458,7 +1457,8 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting (object_class, PROP_WEP_KEY0, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** @@ -1471,7 +1471,8 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting (object_class, PROP_WEP_KEY1, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** @@ -1484,7 +1485,8 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting (object_class, PROP_WEP_KEY2, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** @@ -1497,7 +1499,8 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting (object_class, PROP_WEP_KEY3, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** @@ -1530,7 +1533,8 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting (object_class, PROP_PSK, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_PSK, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** @@ -1558,7 +1562,8 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting (object_class, PROP_LEAP_PASSWORD, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, "", "", NULL, - G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | + G_PARAM_READWRITE | + NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS)); /** @@ -1592,6 +1597,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting NM_WEP_KEY_TYPE_UNKNOWN, NM_WEP_KEY_TYPE_LAST, NM_WEP_KEY_TYPE_UNKNOWN, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); } diff --git a/libnm-util/nm-setting-wireless-security.h b/libnm-util/nm-setting-wireless-security.h index df5d77aba5..97a456b048 100644 --- a/libnm-util/nm-setting-wireless-security.h +++ b/libnm-util/nm-setting-wireless-security.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2014 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_SETTING_WIRELESS_SECURITY_H diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c index 1769339d23..24fae397b3 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2014 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include <string.h> @@ -731,7 +728,7 @@ nm_setting_wireless_get_num_seen_bssids (NMSettingWireless *setting) **/ const char * nm_setting_wireless_get_seen_bssid (NMSettingWireless *setting, - guint32 i) + guint32 i) { g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), NULL); @@ -894,7 +891,7 @@ finalize (GObject *object) static void set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) + const GValue *value, GParamSpec *pspec) { NMSettingWirelessPrivate *priv = NM_SETTING_WIRELESS_GET_PRIVATE (object); @@ -962,7 +959,7 @@ set_property (GObject *object, guint prop_id, static void get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) + GValue *value, GParamSpec *pspec) { NMSettingWireless *setting = NM_SETTING_WIRELESS (object); @@ -1084,7 +1081,8 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) (object_class, PROP_CHANNEL, g_param_spec_uint (NM_SETTING_WIRELESS_CHANNEL, "", "", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); /** @@ -1114,7 +1112,9 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) (object_class, PROP_RATE, g_param_spec_uint (NM_SETTING_WIRELESS_RATE, "", "", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -1128,7 +1128,9 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) (object_class, PROP_TX_POWER, g_param_spec_uint (NM_SETTING_WIRELESS_TX_POWER, "", "", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -1169,7 +1171,8 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) (object_class, PROP_MAC_ADDRESS_BLACKLIST, _nm_param_spec_specialized (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, "", "", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -1186,7 +1189,8 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) (object_class, PROP_SEEN_BSSIDS, _nm_param_spec_specialized (NM_SETTING_WIRELESS_SEEN_BSSIDS, "", "", DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** @@ -1199,7 +1203,9 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) (object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_WIRELESS_MTU, "", "", 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS)); /** diff --git a/libnm-util/nm-setting-wireless.h b/libnm-util/nm-setting-wireless.h index 221a921a34..18f78cff66 100644 --- a/libnm-util/nm-setting-wireless.h +++ b/libnm-util/nm-setting-wireless.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2014 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_SETTING_WIRELESS_H @@ -155,11 +152,11 @@ guint32 nm_setting_wireless_get_mtu (NMSettingWireless gboolean nm_setting_wireless_get_hidden (NMSettingWireless *setting); gboolean nm_setting_wireless_add_seen_bssid (NMSettingWireless *setting, - const char *bssid); + const char *bssid); guint32 nm_setting_wireless_get_num_seen_bssids (NMSettingWireless *setting); const char *nm_setting_wireless_get_seen_bssid (NMSettingWireless *setting, - guint32 i); + guint32 i); gboolean nm_setting_wireless_ap_security_compatible (NMSettingWireless *s_wireless, NMSettingWirelessSecurity *s_wireless_sec, diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c index 57960925d3..94a0cac6e9 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2011 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #include <string.h> @@ -292,7 +289,7 @@ destroy_gvalue (gpointer data) * Converts the #NMSetting into a #GHashTable mapping each setting property * name to a GValue describing that property, suitable for marshalling over * D-Bus or serializing. The mapping is string to GValue. - * + * * Returns: (transfer full) (element-type utf8 GObject.Value): a new #GHashTable * describing the setting's properties **/ @@ -365,7 +362,7 @@ nm_setting_to_hash (NMSetting *setting, NMSettingHashFlags flags) * are strongly typed, thus the GValue type of the hash value must be correct. * See the documentation on each #NMSetting object subclass for the correct * property names and value types. - * + * * Returns: a new #NMSetting object populated with the properties from the * hash table, or %NULL on failure **/ @@ -407,7 +404,7 @@ nm_setting_new_from_hash (GType setting_type, GHashTable *hash) params[n_params++].name = prop_name; else { g_warning ("Ignoring property '%s' with invalid type (%s)", - prop_name, G_VALUE_TYPE_NAME (src_value)); + prop_name, G_VALUE_TYPE_NAME (src_value)); g_value_unset (dst_value); } } @@ -540,9 +537,9 @@ _nm_setting_verify (NMSetting *setting, GSList *all_settings, GError **error) static gboolean compare_property (NMSetting *setting, - NMSetting *other, - const GParamSpec *prop_spec, - NMSettingCompareFlags flags) + NMSetting *other, + const GParamSpec *prop_spec, + NMSettingCompareFlags flags) { GValue value1 = G_VALUE_INIT; GValue value2 = G_VALUE_INIT; @@ -622,7 +619,7 @@ nm_setting_compare (NMSetting *a, /* Fuzzy compare ignores secrets and properties defined with the FUZZY_IGNORE flag */ if ( (flags & NM_SETTING_COMPARE_FLAG_FUZZY) - && (prop_spec->flags & (NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_SECRET))) + && (prop_spec->flags & (NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_SECRET))) continue; if ((flags & NM_SETTING_COMPARE_FLAG_INFERRABLE) && !(prop_spec->flags & NM_SETTING_PARAM_INFERRABLE)) @@ -800,8 +797,8 @@ nm_setting_diff (NMSetting *a, **/ void nm_setting_enumerate_values (NMSetting *setting, - NMSettingValueIterFn func, - gpointer user_data) + NMSettingValueIterFn func, + gpointer user_data) { GParamSpec **property_specs; guint n_property_specs; @@ -874,9 +871,9 @@ _nm_setting_clear_secrets (NMSetting *setting) static gboolean clear_secrets_with_flags (NMSetting *setting, - GParamSpec *pspec, - NMSettingClearSecretsWithFlagsFn func, - gpointer user_data) + GParamSpec *pspec, + NMSettingClearSecretsWithFlagsFn func, + gpointer user_data) { NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE; gboolean changed = FALSE; @@ -1028,7 +1025,7 @@ update_one_secret (NMSetting *setting, const char *key, GValue *value, GError ** * * Update the setting's secrets, given a hash table of secrets intended for that * setting (deserialized from D-Bus for example). - * + * * Returns: %TRUE if the secrets were successfully updated, %FALSE on failure to * update one or more of the secrets. **/ @@ -1446,4 +1443,3 @@ nm_setting_class_init (NMSettingClass *setting_class) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h index f48c63dbe5..b58137a6e7 100644 --- a/libnm-util/nm-setting.h +++ b/libnm-util/nm-setting.h @@ -1,9 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,8 +16,8 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2011 Red Hat, Inc. - * (C) Copyright 2007 - 2008 Novell, Inc. + * Copyright 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2008 Novell, Inc. */ #ifndef NM_SETTING_H @@ -318,4 +315,3 @@ const char *nm_setting_get_virtual_iface_name (NMSetting *setting); G_END_DECLS #endif /* NM_SETTING_H */ - diff --git a/libnm-util/nm-utils-private.h b/libnm-util/nm-utils-private.h index 9d73a939fd..6e6d7b7247 100644 --- a/libnm-util/nm-utils-private.h +++ b/libnm-util/nm-utils-private.h @@ -1,10 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * Ray Strode <rstrode@redhat.com> - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * +/* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -20,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2005 - 2008 Red Hat, Inc. + * Copyright 2005 - 2008 Red Hat, Inc. */ #ifndef __NM_UTILS_PRIVATE_H__ diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 87286bda8e..753edd8473 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -1,11 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * Ray Strode <rstrode@redhat.com> - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * +/* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -21,7 +16,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2005 - 2013 Red Hat, Inc. + * Copyright 2005 - 2013 Red Hat, Inc. */ #include "config.h" @@ -144,7 +139,7 @@ init_lang_to_encodings_hash (void) langToEncodings5 = g_hash_table_new (g_str_hash, g_str_equal); while (enc->lang) { g_hash_table_insert (langToEncodings5, (gpointer) enc->lang, - (gpointer) &enc->encodings); + (gpointer) &enc->encodings); enc++; } } @@ -155,7 +150,7 @@ init_lang_to_encodings_hash (void) langToEncodings2 = g_hash_table_new (g_str_hash, g_str_equal); while (enc->lang) { g_hash_table_insert (langToEncodings2, (gpointer) enc->lang, - (gpointer) &enc->encodings); + (gpointer) &enc->encodings); enc++; } } @@ -184,8 +179,7 @@ get_encodings_for_lang (const char *lang, init_lang_to_encodings_hash (); tmp_lang = g_strdup (lang); - if ((encodings = g_hash_table_lookup (langToEncodings5, tmp_lang))) - { + if ((encodings = g_hash_table_lookup (langToEncodings5, tmp_lang))) { *encoding1 = (char *) encodings->encoding1; *encoding2 = (char *) encodings->encoding2; *encoding3 = (char *) encodings->encoding3; @@ -195,8 +189,7 @@ get_encodings_for_lang (const char *lang, /* Truncate tmp_lang to length of 2 */ if (strlen (tmp_lang) > 2) tmp_lang[2] = '\0'; - if (!success && (encodings = g_hash_table_lookup (langToEncodings2, tmp_lang))) - { + if (!success && (encodings = g_hash_table_lookup (langToEncodings2, tmp_lang))) { *encoding1 = (char *) encodings->encoding1; *encoding2 = (char *) encodings->encoding2; *encoding3 = (char *) encodings->encoding3; @@ -219,7 +212,7 @@ static gboolean initialized = FALSE; * uses libnm-util. Sets up an atexit() handler to ensure de-initialization * is performed, but calling nm_utils_deinit() to explicitly deinitialize * libnm-util can also be done. This function can be called more than once. - * + * * Returns: %TRUE if the initialization was successful, %FALSE on failure. **/ gboolean @@ -340,16 +333,16 @@ nm_utils_ssid_to_utf8 (const GByteArray *ssid) gboolean nm_utils_is_empty_ssid (const guint8 * ssid, int len) { - /* Single white space is for Linksys APs */ - if (len == 1 && ssid[0] == ' ') - return TRUE; + /* Single white space is for Linksys APs */ + if (len == 1 && ssid[0] == ' ') + return TRUE; - /* Otherwise, if the entire ssid is 0, we assume it is hidden */ - while (len--) { - if (ssid[len] != '\0') - return FALSE; - } - return TRUE; + /* Otherwise, if the entire ssid is 0, we assume it is hidden */ + while (len--) { + if (ssid[len] != '\0') + return FALSE; + } + return TRUE; } #define ESSID_MAX_SIZE 32 @@ -475,8 +468,8 @@ nm_utils_gvalue_hash_dup (GHashTable *hash) g_return_val_if_fail (hash != NULL, NULL); table = g_hash_table_new_full (g_str_hash, g_str_equal, - (GDestroyNotify) g_free, - value_destroy); + (GDestroyNotify) g_free, + value_destroy); g_hash_table_foreach (hash, value_dup, table); @@ -675,7 +668,7 @@ nm_utils_security_valid (NMUtilsSecurityType type, || ((type == NMU_SEC_LEAP) && !adhoc)) { if (wifi_caps & (NM_WIFI_DEVICE_CAP_CIPHER_WEP40 | NM_WIFI_DEVICE_CAP_CIPHER_WEP104)) return TRUE; - else + else return FALSE; } } @@ -894,7 +887,7 @@ nm_utils_wpa_psk_valid (const char *psk) * this serialization is not guaranteed to be stable and the #GArray may be * extended in the future. * - * Returns: (transfer full) (element-type NetworkManager.IP4Address): a newly allocated #GSList of #NMIP4Address objects + * Returns: (transfer full) (element-type NMIP4Address): a newly allocated #GSList of #NMIP4Address objects **/ GSList * nm_utils_ip4_addresses_from_gvalue (const GValue *value) @@ -912,7 +905,7 @@ nm_utils_ip4_addresses_from_gvalue (const GValue *value) g_warning ("Ignoring invalid IP4 address"); continue; } - + addr = nm_ip4_address_new (); nm_ip4_address_set_address (addr, g_array_index (array, guint32, 0)); nm_ip4_address_set_prefix (addr, g_array_index (array, guint32, 1)); @@ -976,7 +969,7 @@ nm_utils_ip4_addresses_to_gvalue (GSList *list, GValue *value) * format of this serialization is not guaranteed to be stable and may be * extended in the future. * - * Returns: (transfer full) (element-type NetworkManager.IP4Route): a newly allocated #GSList of #NMIP4Route objects + * Returns: (transfer full) (element-type NMIP4Route): a newly allocated #GSList of #NMIP4Route objects **/ GSList * nm_utils_ip4_routes_from_gvalue (const GValue *value) @@ -1133,7 +1126,7 @@ nm_utils_ip4_get_default_prefix (guint32 ip) * this serialization is not guaranteed to be stable and the #GValueArray may be * extended in the future. * - * Returns: (transfer full) (element-type NetworkManager.IP6Address): a newly allocated #GSList of #NMIP6Address objects + * Returns: (transfer full) (element-type NMIP6Address): a newly allocated #GSList of #NMIP6Address objects **/ GSList * nm_utils_ip6_addresses_from_gvalue (const GValue *value) @@ -1168,7 +1161,7 @@ nm_utils_ip6_addresses_from_gvalue (const GValue *value) ba_addr = g_value_get_boxed (tmp); if (ba_addr->len != 16) { g_warning ("%s: ignoring invalid IP6 address of length %d", - __func__, ba_addr->len); + __func__, ba_addr->len); continue; } @@ -1176,7 +1169,7 @@ nm_utils_ip6_addresses_from_gvalue (const GValue *value) prefix = g_value_get_uint (tmp); if (prefix > 128) { g_warning ("%s: ignoring invalid IP6 prefix %d", - __func__, prefix); + __func__, prefix); continue; } @@ -1185,7 +1178,7 @@ nm_utils_ip6_addresses_from_gvalue (const GValue *value) ba_gw = g_value_get_boxed (tmp); if (ba_gw->len != 16) { g_warning ("%s: ignoring invalid IP6 gateway address of length %d", - __func__, ba_gw->len); + __func__, ba_gw->len); continue; } } @@ -1270,7 +1263,7 @@ nm_utils_ip6_addresses_to_gvalue (GSList *list, GValue *value) * into a #GSList of #NMIP6Route objects. The specific format of this serialization * is not guaranteed to be stable and may be extended in the future. * - * Returns: (transfer full) (element-type NetworkManager.IP6Route): a newly allocated #GSList of #NMIP6Route objects + * Returns: (transfer full) (element-type NMIP6Route): a newly allocated #GSList of #NMIP6Route objects **/ GSList * nm_utils_ip6_routes_from_gvalue (const GValue *value) @@ -1298,7 +1291,7 @@ nm_utils_ip6_routes_from_gvalue (const GValue *value) dest = g_value_get_boxed (g_value_array_get_nth (route_values, 0)); if (dest->len != 16) { g_warning ("%s: ignoring invalid IP6 dest address of length %d", - __func__, dest->len); + __func__, dest->len); continue; } @@ -1307,7 +1300,7 @@ nm_utils_ip6_routes_from_gvalue (const GValue *value) next_hop = g_value_get_boxed (g_value_array_get_nth (route_values, 2)); if (next_hop->len != 16) { g_warning ("%s: ignoring invalid IP6 next_hop address of length %d", - __func__, next_hop->len); + __func__, next_hop->len); continue; } @@ -1334,7 +1327,7 @@ nm_utils_ip6_routes_from_gvalue (const GValue *value) * Utility function to convert a #GSList of #NMIP6Route objects into a #GPtrArray of * #GValueArrays of (#GArray of #guchars), #guint32, (#GArray of #guchars), and #guint32 * representing a list of NetworkManager IPv6 routes (which is a tuple of destination, - * prefix, next hop, and metric). The specific format of this serialization is not + * prefix, next hop, and metric). The specific format of this serialization is not * guaranteed to be stable and may be extended in the future. **/ void @@ -1899,7 +1892,7 @@ nm_utils_wifi_find_next_channel (guint32 channel, int direction, char *band) if (channel == pair->chan) return channel; if ((channel < (pair+1)->chan) && (channel > pair->chan)) { - if (direction > 0) + if (direction > 0) return (pair+1)->chan; else return pair->chan; @@ -2235,8 +2228,7 @@ nm_utils_bin2hexstr (const char *bytes, int len, int final_len) g_return_val_if_fail (final_len < buflen, NULL); result = g_malloc0 (buflen); - for (i = 0; i < len; i++) - { + for (i = 0; i < len; i++) { result[2*i] = hex_digits[(bytes[i] >> 4) & 0xf]; result[2*i+1] = hex_digits[bytes[i] & 0xf]; } diff --git a/libnm-util/nm-utils.h b/libnm-util/nm-utils.h index bb8786a144..23944ad1aa 100644 --- a/libnm-util/nm-utils.h +++ b/libnm-util/nm-utils.h @@ -1,10 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * Ray Strode <rstrode@redhat.com> - * Dan Williams <dcbw@redhat.com> - * Tambet Ingo <tambet@gmail.com> - * +/* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -20,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2005 - 2013 Red Hat, Inc. + * Copyright 2005 - 2013 Red Hat, Inc. */ #ifndef NM_UTILS_H diff --git a/libnm-util/nm-value-transforms.c b/libnm-util/nm-value-transforms.c index f92596dc60..57da2dfa87 100644 --- a/libnm-util/nm-value-transforms.c +++ b/libnm-util/nm-value-transforms.c @@ -1,7 +1,6 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * +/* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -544,7 +543,7 @@ _nm_value_transforms_register (void) g_value_register_transform_func (DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, _nm_utils_convert_op_to_string); - g_value_register_transform_func (G_TYPE_STRV, + g_value_register_transform_func (G_TYPE_STRV, DBUS_TYPE_G_LIST_OF_STRING, _nm_utils_convert_strv_to_slist); g_value_register_transform_func (DBUS_TYPE_G_LIST_OF_STRING, @@ -554,7 +553,7 @@ _nm_value_transforms_register (void) DBUS_TYPE_G_ARRAY_OF_STRING, _nm_utils_convert_strv_to_ptrarray); g_value_register_transform_func (DBUS_TYPE_G_LIST_OF_STRING, - G_TYPE_STRING, + G_TYPE_STRING, _nm_utils_convert_string_list_to_string); g_value_register_transform_func (DBUS_TYPE_G_ARRAY_OF_STRING, G_TYPE_STRING, @@ -563,28 +562,28 @@ _nm_value_transforms_register (void) G_TYPE_STRING, _nm_utils_convert_op_array_to_string); g_value_register_transform_func (DBUS_TYPE_G_UINT_ARRAY, - G_TYPE_STRING, + G_TYPE_STRING, _nm_utils_convert_uint_array_to_string); g_value_register_transform_func (DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT, - G_TYPE_STRING, + G_TYPE_STRING, _nm_utils_convert_ip4_addr_route_struct_array_to_string); g_value_register_transform_func (DBUS_TYPE_G_MAP_OF_VARIANT, - G_TYPE_STRING, + G_TYPE_STRING, _nm_utils_convert_gvalue_hash_to_string); g_value_register_transform_func (DBUS_TYPE_G_MAP_OF_STRING, - G_TYPE_STRING, + G_TYPE_STRING, _nm_utils_convert_string_hash_to_string); g_value_register_transform_func (DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_STRING, _nm_utils_convert_byte_array_to_string); g_value_register_transform_func (DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR, - G_TYPE_STRING, + G_TYPE_STRING, _nm_utils_convert_ip6_dns_array_to_string); g_value_register_transform_func (DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, - G_TYPE_STRING, + G_TYPE_STRING, _nm_utils_convert_ip6_addr_struct_array_to_string); g_value_register_transform_func (DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE, - G_TYPE_STRING, + G_TYPE_STRING, _nm_utils_convert_ip6_route_struct_array_to_string); g_value_register_transform_func (OLD_DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, diff --git a/include/nm-version.h.in b/libnm-util/nm-version.h.in index e702ae8bb2..4521ab73d1 100644 --- a/include/nm-version.h.in +++ b/libnm-util/nm-version.h.in @@ -15,7 +15,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2011 Red Hat, Inc. + * Copyright 2011 Red Hat, Inc. */ #ifndef NM_VERSION_H @@ -121,4 +121,3 @@ #endif #endif /* NM_VERSION_H */ - diff --git a/libnm-util/tests/test-crypto.c b/libnm-util/tests/test-crypto.c index c11b6392f0..4a8e77524f 100644 --- a/libnm-util/tests/test-crypto.c +++ b/libnm-util/tests/test-crypto.c @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2011 Red Hat, Inc. */ #include <glib.h> @@ -275,7 +275,7 @@ is_cipher_aes (const char *path) } g_free (contents); - return is_aes; + return is_aes; } static void diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c index df0a1ecbfb..0b3283ed51 100644 --- a/libnm-util/tests/test-general.c +++ b/libnm-util/tests/test-general.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) 2008 - 2011 Red Hat, Inc. + * Copyright 2008 - 2011 Red Hat, Inc. * */ diff --git a/libnm-util/tests/test-secrets.c b/libnm-util/tests/test-secrets.c index 73fc9224b0..b829d12eed 100644 --- a/libnm-util/tests/test-secrets.c +++ b/libnm-util/tests/test-secrets.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) 2008 - 2011 Red Hat, Inc. + * Copyright 2008 - 2011 Red Hat, Inc. * */ diff --git a/libnm-util/tests/test-setting-8021x.c b/libnm-util/tests/test-setting-8021x.c index 62889c61fc..c496e47bcf 100644 --- a/libnm-util/tests/test-setting-8021x.c +++ b/libnm-util/tests/test-setting-8021x.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) 2008 - 2011 Red Hat, Inc. + * Copyright 2008 - 2011 Red Hat, Inc. * */ diff --git a/libnm-util/tests/test-setting-dcb.c b/libnm-util/tests/test-setting-dcb.c index de07f2c2a6..4b114ada35 100644 --- a/libnm-util/tests/test-setting-dcb.c +++ b/libnm-util/tests/test-setting-dcb.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) 2013 Red Hat, Inc. + * Copyright 2013 Red Hat, Inc. * */ diff --git a/libnm-util/tests/test-settings-defaults.c b/libnm-util/tests/test-settings-defaults.c index 15412fed55..9104b4bc6c 100644 --- a/libnm-util/tests/test-settings-defaults.c +++ b/libnm-util/tests/test-settings-defaults.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) 2008 - 2011 Red Hat, Inc. + * Copyright 2008 - 2011 Red Hat, Inc. * */ diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index 46fc913880..06d8013955 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -3,6 +3,7 @@ if WITH_PPP AM_CPPFLAGS = \ -I${top_builddir}/include \ -I${top_srcdir}/include \ + -I${top_srcdir}/libnm-util \ -DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) \ |