diff options
| author | Dan Winship <danw@gnome.org> | 2014-05-09 14:45:59 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-07-15 09:44:55 -0400 |
| commit | 2570c5a17ceab3eb39695493b07144cba04eadbf (patch) | |
| tree | 0f62822501c4a1139e430fa473789be5abdd906b | |
| parent | cb7e1893e7016e2a6a7b6a820f5b9ab092d100b7 (diff) | |
libnm-util, libnm-glib: whitespace fixes
Fix indentation, kill trailing whitespace, split some long lines.
81 files changed, 696 insertions, 571 deletions
diff --git a/include/nm-dbus-glib-types.h b/include/nm-dbus-glib-types.h index 69a875ff1..78a0695ad 100644 --- a/include/nm-dbus-glib-types.h +++ b/include/nm-dbus-glib-types.h @@ -38,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-settings-flags.h b/include/nm-settings-flags.h index 5f1d7dee4..360f13922 100644 --- a/include/nm-settings-flags.h +++ b/include/nm-settings-flags.h @@ -35,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 df4030547..09ab1ad98 100644 --- a/include/nm-test-utils.h +++ b/include/nm-test-utils.h @@ -681,4 +681,3 @@ nmtst_ip6_config_clone (NMIP6Config *config) #endif /* __NM_TEST_UTILS_H__ */ - diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c index fbcfb2e95..b462a6b16 100644 --- a/libnm-glib/nm-access-point.c +++ b/libnm-glib/nm-access-point.c @@ -86,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); } /** diff --git a/libnm-glib/nm-active-connection.c b/libnm-glib/nm-active-connection.c index 0c30a640f..358264fd2 100644 --- a/libnm-glib/nm-active-connection.c +++ b/libnm-glib/nm-active-connection.c @@ -104,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 diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index baf9c6606..fefb18c32 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -114,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); /**********************************************************************/ @@ -785,7 +785,7 @@ nm_client_deactivate_connection (NMClient *client, NMActiveConnection *active) * 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; @@ -1339,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); @@ -1782,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); } } @@ -1966,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); @@ -1983,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); } } @@ -2041,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; @@ -2380,12 +2380,12 @@ nm_client_class_init (NMClientClass *client_class) **/ 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: diff --git a/libnm-glib/nm-dbus-helpers.c b/libnm-glib/nm-dbus-helpers.c index 7a5fd606e..8ba8dd848 100644 --- a/libnm-glib/nm-dbus-helpers.c +++ b/libnm-glib/nm-dbus-helpers.c @@ -102,4 +102,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-bond.c b/libnm-glib/nm-device-bond.c index deada00ab..662b2f4a3 100644 --- a/libnm-glib/nm-device-bond.c +++ b/libnm-glib/nm-device-bond.c @@ -89,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; } diff --git a/libnm-glib/nm-device-bt.c b/libnm-glib/nm-device-bt.c index 5500259a4..00616a95a 100644 --- a/libnm-glib/nm-device-bt.c +++ b/libnm-glib/nm-device-bt.c @@ -371,4 +371,3 @@ nm_device_bt_class_init (NMDeviceBtClass *bt_class) G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-glib/nm-device-ethernet.c b/libnm-glib/nm-device-ethernet.c index dd8b1c6cb..690041a51 100644 --- a/libnm-glib/nm-device-ethernet.c +++ b/libnm-glib/nm-device-ethernet.c @@ -91,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; } @@ -390,4 +390,3 @@ nm_device_ethernet_class_init (NMDeviceEthernetClass *eth_class) G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-glib/nm-device-generic.c b/libnm-glib/nm-device-generic.c index d38406a16..875ea8eb3 100644 --- a/libnm-glib/nm-device-generic.c +++ b/libnm-glib/nm-device-generic.c @@ -282,4 +282,3 @@ nm_device_generic_class_init (NMDeviceGenericClass *klass) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-glib/nm-device-infiniband.c b/libnm-glib/nm-device-infiniband.c index e54d27247..d740ed006 100644 --- a/libnm-glib/nm-device-infiniband.c +++ b/libnm-glib/nm-device-infiniband.c @@ -87,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; } @@ -309,4 +309,3 @@ nm_device_infiniband_class_init (NMDeviceInfinibandClass *eth_class) G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-glib/nm-device-modem.c b/libnm-glib/nm-device-modem.c index 3170411e3..7d286190f 100644 --- a/libnm-glib/nm-device-modem.c +++ b/libnm-glib/nm-device-modem.c @@ -34,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; @@ -291,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-olpc-mesh.c b/libnm-glib/nm-device-olpc-mesh.c index e8384ba94..666ddc263 100644 --- a/libnm-glib/nm-device-olpc-mesh.c +++ b/libnm-glib/nm-device-olpc-mesh.c @@ -87,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; @@ -324,4 +324,3 @@ nm_device_olpc_mesh_class_init (NMDeviceOlpcMeshClass *olpc_mesh_class) G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-glib/nm-device-team.c b/libnm-glib/nm-device-team.c index eb649b496..c9ac2d8b8 100644 --- a/libnm-glib/nm-device-team.c +++ b/libnm-glib/nm-device-team.c @@ -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; } diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c index c57a14a34..a4c108fb0 100644 --- a/libnm-glib/nm-device-wifi.c +++ b/libnm-glib/nm-device-wifi.c @@ -417,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)); @@ -811,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: @@ -828,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-wimax.c b/libnm-glib/nm-device-wimax.c index 6b96586f4..8fac2a5ac 100644 --- a/libnm-glib/nm-device-wimax.c +++ b/libnm-glib/nm-device-wimax.c @@ -112,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; } @@ -202,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; @@ -728,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: @@ -745,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 613a7dc99..1b889d95f 100644 --- a/libnm-glib/nm-device-wimax.h +++ b/libnm-glib/nm-device-wimax.h @@ -77,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 910368d22..1a63d28d2 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -344,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", @@ -354,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 @@ -845,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); } /** @@ -2161,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; } diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c index 04308b28c..4fccee903 100644 --- a/libnm-glib/nm-dhcp4-config.c +++ b/libnm-glib/nm-dhcp4-config.c @@ -173,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); } /** @@ -213,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-dhcp6-config.c b/libnm-glib/nm-dhcp6-config.c index 2f5d38609..32cc3b475 100644 --- a/libnm-glib/nm-dhcp6-config.c +++ b/libnm-glib/nm-dhcp6-config.c @@ -173,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); } /** @@ -213,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-ip4-config.c b/libnm-glib/nm-ip4-config.c index 4a16d6dd0..3ac75254c 100644 --- a/libnm-glib/nm-ip4-config.c +++ b/libnm-glib/nm-ip4-config.c @@ -396,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 * @@ -465,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-ip6-config.c b/libnm-glib/nm-ip6-config.c index 6d973e746..21156090b 100644 --- a/libnm-glib/nm-ip6-config.c +++ b/libnm-glib/nm-ip6-config.c @@ -68,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 @@ -491,4 +491,3 @@ nm_ip6_config_class_init (NMIP6ConfigClass *config_class) G_PARAM_STATIC_STRINGS)); } - diff --git a/libnm-glib/nm-object-cache.c b/libnm-glib/nm-object-cache.c index 91651eece..833ee2409 100644 --- a/libnm-glib/nm-object-cache.c +++ b/libnm-glib/nm-object-cache.c @@ -86,4 +86,3 @@ _nm_object_cache_clear (NMObject *except) } } } - diff --git a/libnm-glib/nm-object-private.h b/libnm-glib/nm-object-private.h index 0f13eef95..75e63b2e7 100644 --- a/libnm-glib/nm-object-private.h +++ b/libnm-glib/nm-object-private.h @@ -45,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 f366559eb..2e6167d7f 100644 --- a/libnm-glib/nm-object.c +++ b/libnm-glib/nm-object.c @@ -336,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); @@ -359,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); @@ -402,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)); /** @@ -414,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 */ @@ -1182,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); @@ -1439,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-remote-connection-private.h b/libnm-glib/nm-remote-connection-private.h index 21f91424e..e3f35428c 100644 --- a/libnm-glib/nm-remote-connection-private.h +++ b/libnm-glib/nm-remote-connection-private.h @@ -31,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 40abce821..53f257a34 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -123,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); } @@ -710,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); @@ -866,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 */ @@ -874,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)); /** @@ -906,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, @@ -922,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 9a253ce4c..8292c2354 100644 --- a/libnm-glib/nm-remote-connection.h +++ b/libnm-glib/nm-remote-connection.h @@ -147,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 d9725ec8f..e21751ce2 100644 --- a/libnm-glib/nm-remote-settings.c +++ b/libnm-glib/nm-remote-settings.c @@ -141,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; @@ -204,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); } @@ -557,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) @@ -565,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); @@ -937,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); @@ -1352,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); @@ -1486,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 @@ -1511,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-secret-agent.c b/libnm-glib/nm-secret-agent.c index 0546bede0..ea6197743 100644 --- a/libnm-glib/nm-secret-agent.c +++ b/libnm-glib/nm-secret-agent.c @@ -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 f202250ad..f593b3e64 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 diff --git a/libnm-glib/nm-types-private.h b/libnm-glib/nm-types-private.h index 78dadd966..c34d9a8f7 100644 --- a/libnm-glib/nm-types-private.h +++ b/libnm-glib/nm-types-private.h @@ -29,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 7d12f35ce..cb0ff8ba6 100644 --- a/libnm-glib/nm-types.c +++ b/libnm-glib/nm-types.c @@ -230,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; @@ -417,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-vpn-connection.c b/libnm-glib/nm-vpn-connection.c index ffe88c5b3..689f58fd8 100644 --- a/libnm-glib/nm-vpn-connection.c +++ b/libnm-glib/nm-vpn-connection.c @@ -68,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); @@ -174,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)); } @@ -259,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-plugin-ui-interface.c b/libnm-glib/nm-vpn-plugin-ui-interface.c index 90a28c9d5..791d47ad4 100644 --- a/libnm-glib/nm-vpn-plugin-ui-interface.c +++ b/libnm-glib/nm-vpn-plugin-ui-interface.c @@ -71,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); } @@ -161,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; } @@ -229,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.c b/libnm-glib/nm-vpn-plugin.c index 368c9bbc7..010412944 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -123,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"); @@ -727,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 * @@ -745,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; @@ -821,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); @@ -955,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-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c index c647b4749..1cbd3eefd 100644 --- a/libnm-glib/nm-wimax-nsp.c +++ b/libnm-glib/nm-wimax-nsp.c @@ -69,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); } /** diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h index 4697c17b6..bf9f4b3af 100644 --- a/libnm-util/NetworkManager.h +++ b/libnm-util/NetworkManager.h @@ -31,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" @@ -216,7 +216,7 @@ 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. **/ typedef enum { NM_802_11_AP_FLAGS_NONE = 0x00000000, @@ -239,7 +239,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 @@ -592,4 +592,3 @@ typedef enum { } NMActiveConnectionState; #endif /* NETWORK_MANAGER_H */ - diff --git a/libnm-util/NetworkManagerVPN.h b/libnm-util/NetworkManagerVPN.h index 3c727eb4e..170f2e89b 100644 --- a/libnm-util/NetworkManagerVPN.h +++ b/libnm-util/NetworkManagerVPN.h @@ -29,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" @@ -41,37 +41,36 @@ /* * 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" /* * VPN daemon states */ -typedef enum NMVPNServiceState -{ +typedef enum NMVPNServiceState { NM_VPN_SERVICE_STATE_UNKNOWN = 0, NM_VPN_SERVICE_STATE_INIT, NM_VPN_SERVICE_STATE_SHUTDOWN, @@ -85,8 +84,7 @@ typedef enum NMVPNServiceState /* * VPN connection states */ -typedef enum NMVPNConnectionState -{ +typedef enum NMVPNConnectionState { NM_VPN_CONNECTION_STATE_UNKNOWN = 0, NM_VPN_CONNECTION_STATE_PREPARE, NM_VPN_CONNECTION_STATE_NEED_AUTH, @@ -97,8 +95,7 @@ typedef enum NMVPNConnectionState NM_VPN_CONNECTION_STATE_DISCONNECTED } NMVPNConnectionState; -typedef enum NMVPNConnectionStateReason -{ +typedef enum NMVPNConnectionStateReason { NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0, NM_VPN_CONNECTION_STATE_REASON_NONE, NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED, diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c index 98c3cfa47..d5f7608d6 100644 --- a/libnm-util/crypto.c +++ b/libnm-util/crypto.c @@ -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_gnutls.c b/libnm-util/crypto_gnutls.c index 2aa8740d0..be16d135a 100644 --- a/libnm-util/crypto_gnutls.c +++ b/libnm-util/crypto_gnutls.c @@ -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 a197f9fcc..1e589ea70 100644 --- a/libnm-util/crypto_nss.c +++ b/libnm-util/crypto_nss.c @@ -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 59a4bfd2e..9125d9311 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -477,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 */ @@ -829,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); @@ -1022,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) @@ -1254,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 @@ -2074,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); @@ -2090,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); @@ -2129,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), @@ -2169,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), @@ -2186,4 +2187,3 @@ nm_connection_class_init (NMConnectionClass *klass) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); } - diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c index 71f025bee..2b4ca230a 100644 --- a/libnm-util/nm-param-spec-specialized.c +++ b/libnm-util/nm-param-spec-specialized.c @@ -243,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)); } @@ -283,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); } @@ -297,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; @@ -337,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; } @@ -525,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); @@ -589,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); } @@ -619,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 2b262c415..7803e919a 100644 --- a/libnm-util/nm-param-spec-specialized.h +++ b/libnm-util/nm-param-spec-specialized.h @@ -35,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 30c5733ee..4543642bd 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -405,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 **/ @@ -2816,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); @@ -3002,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); @@ -3464,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)); /** @@ -3493,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)); /** @@ -3561,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)); /** @@ -3625,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)); /** @@ -3652,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)); /** @@ -3683,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-adsl.c b/libnm-util/nm-setting-adsl.c index 5838124b5..0a8eba7c0 100644 --- a/libnm-util/nm-setting-adsl.c +++ b/libnm-util/nm-setting-adsl.c @@ -397,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-bluetooth.c b/libnm-util/nm-setting-bluetooth.c index ac5233300..506ecbdde 100644 --- a/libnm-util/nm-setting-bluetooth.c +++ b/libnm-util/nm-setting-bluetooth.c @@ -159,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, @@ -213,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); @@ -235,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); @@ -277,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)); /** @@ -290,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-bond.c b/libnm-util/nm-setting-bond.c index 9c8e62b5f..10766f564 100644 --- a/libnm-util/nm-setting-bond.c +++ b/libnm-util/nm-setting-bond.c @@ -311,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: @@ -751,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; @@ -783,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)); /** @@ -797,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-bridge-port.c b/libnm-util/nm-setting-bridge-port.c index b4b5a46fe..496de581a 100644 --- a/libnm-util/nm-setting-bridge-port.c +++ b/libnm-util/nm-setting-bridge-port.c @@ -264,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)); /** @@ -279,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)); /** @@ -294,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.c b/libnm-util/nm-setting-bridge.c index fd4be3ec1..789660036 100644 --- a/libnm-util/nm-setting-bridge.c +++ b/libnm-util/nm-setting-bridge.c @@ -455,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)); /** @@ -471,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)); /** @@ -485,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)); /** @@ -501,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)); /** @@ -515,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)); /** @@ -529,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)); /** @@ -543,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)); /** @@ -557,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-cdma.c b/libnm-util/nm-setting-cdma.c index ca98fd57b..976a59680 100644 --- a/libnm-util/nm-setting-cdma.c +++ b/libnm-util/nm-setting-cdma.c @@ -229,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); @@ -257,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); @@ -336,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-connection.c b/libnm-util/nm-setting-connection.c index 8f974e869..f206bbb03 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -456,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 @@ -1106,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)); /** @@ -1129,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)); /** @@ -1153,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)); /** @@ -1169,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)); /** @@ -1206,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)); /** @@ -1224,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)); /** @@ -1238,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)); /** @@ -1253,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)); /** @@ -1265,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)); /** @@ -1279,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)); /** @@ -1295,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)); /** @@ -1310,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 85d25e4d9..143fa11d5 100644 --- a/libnm-util/nm-setting-connection.h +++ b/libnm-util/nm-setting-connection.h @@ -133,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 efabfd6ea..4839f7fe7 100644 --- a/libnm-util/nm-setting-dcb.c +++ b/libnm-util/nm-setting-dcb.c @@ -985,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)); /** @@ -1000,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)); /** @@ -1032,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)); /** @@ -1064,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)); /** @@ -1201,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-gsm.c b/libnm-util/nm-setting-gsm.c index 714c4dee4..51ad39024 100644 --- a/libnm-util/nm-setting-gsm.c +++ b/libnm-util/nm-setting-gsm.c @@ -421,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; @@ -480,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); @@ -581,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)); /** @@ -654,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)); /** @@ -673,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)); /** @@ -687,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-infiniband.c b/libnm-util/nm-setting-infiniband.c index b244a9d4c..4e470e561 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 e0f05a5ae..bc2ef8731 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -1071,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); @@ -1149,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); @@ -1235,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)); /** @@ -1287,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)); /** @@ -1299,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)); /** @@ -1318,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)); /** @@ -1332,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)); /** @@ -1348,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)); /** @@ -1377,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)); /** @@ -1390,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)); /** @@ -1403,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)); /** @@ -1420,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)); } @@ -1883,4 +1893,3 @@ nm_ip4_route_set_metric (NMIP4Route *route, guint32 metric) route->metric = metric; } - diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 33f16c7dd..49c32dd66 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -171,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); @@ -902,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); @@ -954,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); @@ -1031,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)); /** @@ -1101,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)); /** @@ -1120,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)); /** @@ -1134,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)); /** @@ -1150,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)); /** @@ -1164,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)); /** @@ -1181,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)); /** @@ -1201,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 8db4fa558..4486a40e2 100644 --- a/libnm-util/nm-setting-ip6-config.h +++ b/libnm-util/nm-setting-ip6-config.h @@ -183,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 0040a20bd..408f6833f 100644 --- a/libnm-util/nm-setting-olpc-mesh.c +++ b/libnm-util/nm-setting-olpc-mesh.c @@ -170,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); @@ -196,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); @@ -240,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)); /** @@ -252,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-ppp.c b/libnm-util/nm-setting-ppp.c index 9ab38ef60..0e7c598b9 100644 --- a/libnm-util/nm-setting-ppp.c +++ b/libnm-util/nm-setting-ppp.c @@ -414,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); @@ -481,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); @@ -571,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)); /** @@ -583,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)); /** @@ -595,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)); /** @@ -607,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)); /** @@ -619,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)); /** @@ -631,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)); /** @@ -643,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)); /** @@ -655,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)); /** @@ -667,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)); /** @@ -682,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)); /** @@ -709,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)); /** @@ -723,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)); /** @@ -737,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)); /** @@ -751,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)); /** @@ -764,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)); /** @@ -779,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)); /** @@ -794,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-pppoe.c b/libnm-util/nm-setting-pppoe.c index f79965713..a3923336c 100644 --- a/libnm-util/nm-setting-pppoe.c +++ b/libnm-util/nm-setting-pppoe.c @@ -207,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); @@ -235,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); @@ -322,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-private.h b/libnm-util/nm-setting-private.h index c2c46e6ad..99590b9e1 100644 --- a/libnm-util/nm-setting-private.h +++ b/libnm-util/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 1b8a9bd13..4a7ee89e6 100644 --- a/libnm-util/nm-setting-serial.c +++ b/libnm-util/nm-setting-serial.c @@ -180,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); @@ -208,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); @@ -260,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)); /** @@ -272,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)); /** @@ -285,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)); /** @@ -298,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)); /** @@ -310,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-team-port.c b/libnm-util/nm-setting-team-port.c index 0f2c05c30..ad9d8327e 100644 --- a/libnm-util/nm-setting-team-port.c +++ b/libnm-util/nm-setting-team-port.c @@ -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.c b/libnm-util/nm-setting-team.c index 35ceb257d..046ce5112 100644 --- a/libnm-util/nm-setting-team.c +++ b/libnm-util/nm-setting-team.c @@ -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-vlan.c b/libnm-util/nm-setting-vlan.c index 27ae757fd..21adfdb25 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -754,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)); /** @@ -769,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)); /** @@ -782,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)); /** @@ -798,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)); /** @@ -812,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)); /** @@ -826,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-vpn.c b/libnm-util/nm-setting-vpn.c index 491ab896b..3afc4dd93 100644 --- a/libnm-util/nm-setting-vpn.c +++ b/libnm-util/nm-setting-vpn.c @@ -476,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; } } @@ -656,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; @@ -728,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; @@ -764,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); @@ -864,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-wimax.c b/libnm-util/nm-setting-wimax.c index d2aff3f61..1a4a6ec38 100644 --- a/libnm-util/nm-setting-wimax.c +++ b/libnm-util/nm-setting-wimax.c @@ -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-wired.c b/libnm-util/nm-setting-wired.c index 910584c5a..bc82bf347 100644 --- a/libnm-util/nm-setting-wired.c +++ b/libnm-util/nm-setting-wired.c @@ -889,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)); /** @@ -916,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)); /** @@ -930,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)); /** @@ -943,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)); /** @@ -958,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)); /** @@ -971,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)); /** @@ -989,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)); /** @@ -1002,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)); /** @@ -1017,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-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 865c06c6d..2c4676647 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -1065,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; } @@ -1180,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); @@ -1260,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); @@ -1354,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)); /** @@ -1369,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)); /** @@ -1455,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)); /** @@ -1468,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)); /** @@ -1481,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)); /** @@ -1494,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)); /** @@ -1527,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)); /** @@ -1555,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)); /** @@ -1589,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.c b/libnm-util/nm-setting-wireless.c index 41ff552cb..24fae397b 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -728,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); @@ -891,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); @@ -959,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); @@ -1081,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)); /** @@ -1111,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)); /** @@ -1125,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)); /** @@ -1166,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)); /** @@ -1183,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)); /** @@ -1196,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 7a355152a..18f78cff6 100644 --- a/libnm-util/nm-setting-wireless.h +++ b/libnm-util/nm-setting-wireless.h @@ -152,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 4886ecff2..94a0cac6e 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -289,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 **/ @@ -362,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 **/ @@ -404,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); } } @@ -537,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; @@ -619,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)) @@ -797,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; @@ -871,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; @@ -1025,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. **/ @@ -1443,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 534264dca..b58137a6e 100644 --- a/libnm-util/nm-setting.h +++ b/libnm-util/nm-setting.h @@ -315,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.c b/libnm-util/nm-utils.c index dfd286d3d..753edd847 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -139,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++; } } @@ -150,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++; } } @@ -179,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; @@ -190,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; @@ -214,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 @@ -335,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 @@ -470,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); @@ -670,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; } } @@ -907,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)); @@ -1163,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; } @@ -1171,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; } @@ -1180,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; } } @@ -1293,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; } @@ -1302,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; } @@ -1329,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 @@ -1894,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; @@ -2230,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-value-transforms.c b/libnm-util/nm-value-transforms.c index 8eddcd693..57da2dfa8 100644 --- a/libnm-util/nm-value-transforms.c +++ b/libnm-util/nm-value-transforms.c @@ -543,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, @@ -553,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, @@ -562,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/libnm-util/nm-version.h.in b/libnm-util/nm-version.h.in index 58655e953..4521ab73d 100644 --- a/libnm-util/nm-version.h.in +++ b/libnm-util/nm-version.h.in @@ -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 98915a4c2..4a8e77524 100644 --- a/libnm-util/tests/test-crypto.c +++ b/libnm-util/tests/test-crypto.c @@ -275,7 +275,7 @@ is_cipher_aes (const char *path) } g_free (contents); - return is_aes; + return is_aes; } static void |