system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-06 08:11:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

capabilities: fix data type to "u" / uint32

Browse source 
The property NM_MANAGER_CAPABILITIES was already "au".
The types must be used consistently.
This commit is contained in:
Thomas Haller 2016-09-23 13:16:20 +02:00
parent 2ca1ce5d88
commit 4a6c07d4e5
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
introspection/nm-manager.xml
View file

@ -387,7 +387,7 @@
linkend="NMCapability">NMCapability</link> for currently linkend="NMCapability">NMCapability</link> for currently
defined capability numbers. defined capability numbers.
--> -->
<property name="Capabilities" type="ai" access="read"/> <property name="Capabilities" type="au" access="read"/>
<!-- <!--
State: State:

8
src/nm-manager.c
View file

@ -5450,7 +5450,7 @@ nm_manager_check_capability (NMManager *self,
int i; int i;
for (i = 0; i < priv->capabilities->len; i++) { for (i = 0; i < priv->capabilities->len; i++) {
NMCapability test = g_array_index (priv->capabilities, gint, i); NMCapability test = g_array_index (priv->capabilities, guint32, i);
if (test == cap) if (test == cap)
return TRUE; return TRUE;
if (test > cap) if (test > cap)
@ -5527,7 +5527,7 @@ constructed (GObject *object)
G_OBJECT_CLASS (nm_manager_parent_class)->constructed (object); G_OBJECT_CLASS (nm_manager_parent_class)->constructed (object);
priv->capabilities = g_array_new (FALSE, FALSE, sizeof (gint)); priv->capabilities = g_array_new (FALSE, FALSE, sizeof (guint32));
_set_prop_filter (self, nm_bus_manager_get_connection (priv->dbus_mgr)); _set_prop_filter (self, nm_bus_manager_get_connection (priv->dbus_mgr));
@ -5688,10 +5688,10 @@ get_property (GObject *object, guint prop_id,
g_value_set_string (value, VERSION); g_value_set_string (value, VERSION);
break; break;
case PROP_CAPABILITIES: case PROP_CAPABILITIES:
g_value_set_variant (value, g_variant_new_fixed_array (G_VARIANT_TYPE ("i"), g_value_set_variant (value, g_variant_new_fixed_array (G_VARIANT_TYPE ("u"),
priv->capabilities->data, priv->capabilities->data,
priv->capabilities->len, priv->capabilities->len,
sizeof(gint))); sizeof (guint32)));
break; break;
case PROP_STATE: case PROP_STATE:
nm_manager_update_state (self); nm_manager_update_state (self);