diff options
| author | Michael Biebl <biebl@debian.org> | 2015-01-22 00:29:39 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-01-22 00:29:39 +0100 |
| commit | 2c032d8f1c6292c1338a615e6ec40252889ba85c (patch) | |
| tree | 1f77182220b2b0264288ba4a476ab47e5bc48716 /libnm-glib/nm-device-bond.c | |
| parent | 33491bc4279481db8ae47213e34a6d695a0e8830 (diff) | |
Imported Upstream version 1.0.0 upstream/1.0.0
Diffstat (limited to 'libnm-glib/nm-device-bond.c')
| -rw-r--r-- | libnm-glib/nm-device-bond.c | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c index b2af2ec3..786d4f16 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,10 +15,11 @@ * 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> +#include "config.h" + #include <string.h> #include <netinet/ether.h> @@ -91,9 +90,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 +138,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. * @@ -291,12 +290,12 @@ get_property (GObject *object, } static void -nm_device_bond_class_init (NMDeviceBondClass *eth_class) +nm_device_bond_class_init (NMDeviceBondClass *bond_class) { - GObjectClass *object_class = G_OBJECT_CLASS (eth_class); - NMDeviceClass *device_class = NM_DEVICE_CLASS (eth_class); + GObjectClass *object_class = G_OBJECT_CLASS (bond_class); + NMDeviceClass *device_class = NM_DEVICE_CLASS (bond_class); - g_type_class_add_private (eth_class, sizeof (NMDeviceBondPrivate)); + g_type_class_add_private (bond_class, sizeof (NMDeviceBondPrivate)); /* virtual methods */ object_class->constructed = constructed; @@ -316,11 +315,10 @@ nm_device_bond_class_init (NMDeviceBondClass *eth_class) **/ g_object_class_install_property (object_class, PROP_HW_ADDRESS, - g_param_spec_string (NM_DEVICE_BOND_HW_ADDRESS, - "Active MAC Address", - "Currently set hardware MAC address", + g_param_spec_string (NM_DEVICE_BOND_HW_ADDRESS, "", "", NULL, - G_PARAM_READABLE)); + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); /** * NMDeviceBond:carrier: @@ -329,11 +327,10 @@ nm_device_bond_class_init (NMDeviceBondClass *eth_class) **/ g_object_class_install_property (object_class, PROP_CARRIER, - g_param_spec_boolean (NM_DEVICE_BOND_CARRIER, - "Carrier", - "Carrier", + g_param_spec_boolean (NM_DEVICE_BOND_CARRIER, "", "", FALSE, - G_PARAM_READABLE)); + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); /** * NMDeviceBond:slaves: @@ -344,9 +341,8 @@ nm_device_bond_class_init (NMDeviceBondClass *eth_class) **/ g_object_class_install_property (object_class, PROP_SLAVES, - g_param_spec_boxed (NM_DEVICE_BOND_SLAVES, - "Slaves", - "Slaves", + g_param_spec_boxed (NM_DEVICE_BOND_SLAVES, "", "", NM_TYPE_OBJECT_ARRAY, - G_PARAM_READABLE)); + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); } |