diff options
Diffstat (limited to 'libnm-glib')
| -rw-r--r-- | libnm-glib/nm-access-point.c | 2 | ||||
| -rw-r--r-- | libnm-glib/nm-device-802-11-wireless.c | 16 | ||||
| -rw-r--r-- | libnm-glib/nm-device-802-11-wireless.h | 2 | ||||
| -rw-r--r-- | libnm-glib/nm-device-802-3-ethernet.c | 4 | ||||
| -rw-r--r-- | libnm-glib/nm-device-802-3-ethernet.h | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c index 5eace292ab..380248950f 100644 --- a/libnm-glib/nm-access-point.c +++ b/libnm-glib/nm-access-point.c @@ -534,7 +534,7 @@ nm_access_point_class_init (NMAccessPointClass *ap_class) g_param_spec_uint (NM_ACCESS_POINT_RATE, "Rate", "Rate", - 0, G_MAXUINT16, 0, + 0, G_MAXUINT32, 0, G_PARAM_READWRITE)); g_object_class_install_property diff --git a/libnm-glib/nm-device-802-11-wireless.c b/libnm-glib/nm-device-802-11-wireless.c index 8bf79e6504..bd390b3d90 100644 --- a/libnm-glib/nm-device-802-11-wireless.c +++ b/libnm-glib/nm-device-802-11-wireless.c @@ -17,7 +17,7 @@ typedef struct { char * hw_address; int mode; - int rate; + guint32 rate; NMAccessPoint *current_ap; guint32 wireless_caps; @@ -117,7 +117,7 @@ nm_device_802_11_wireless_get_mode (NMDevice80211Wireless *device) } static void -nm_device_802_11_wireless_set_bitrate (NMDevice80211Wireless *self, int bitrate) +nm_device_802_11_wireless_set_bitrate (NMDevice80211Wireless *self, guint32 bitrate) { NMDevice80211WirelessPrivate *priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (self); @@ -127,7 +127,7 @@ nm_device_802_11_wireless_set_bitrate (NMDevice80211Wireless *self, int bitrate) } } -int +guint32 nm_device_802_11_wireless_get_bitrate (NMDevice80211Wireless *device) { NMDevice80211WirelessPrivate *priv; @@ -150,7 +150,7 @@ nm_device_802_11_wireless_get_bitrate (NMDevice80211Wireless *device) priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (device); if (!priv->rate) { - priv->rate = nm_object_get_int_property (NM_OBJECT (device), + priv->rate = nm_object_get_uint_property (NM_OBJECT (device), NM_DBUS_INTERFACE_DEVICE_WIRELESS, DBUS_PROP_BITRATE); } @@ -371,7 +371,7 @@ set_property (GObject *object, guint prop_id, nm_device_802_11_wireless_set_mode (device, g_value_get_int (value)); break; case PROP_BITRATE: - nm_device_802_11_wireless_set_bitrate (device, g_value_get_int (value)); + nm_device_802_11_wireless_set_bitrate (device, g_value_get_uint (value)); break; case PROP_ACTIVE_ACCESS_POINT: nm_device_802_11_wireless_set_active_ap (device, (char *) g_value_get_boxed (value)); @@ -401,7 +401,7 @@ get_property (GObject *object, g_value_set_int (value, priv->mode); break; case PROP_BITRATE: - g_value_set_int (value, priv->rate); + g_value_set_uint (value, priv->rate); break; case PROP_ACTIVE_ACCESS_POINT: g_value_set_boxed (value, priv->current_ap ? nm_object_get_path (NM_OBJECT (priv->current_ap)) : "/"); @@ -549,10 +549,10 @@ nm_device_802_11_wireless_class_init (NMDevice80211WirelessClass *device_class) g_object_class_install_property (object_class, PROP_BITRATE, - g_param_spec_int (NM_DEVICE_802_11_WIRELESS_BITRATE, + g_param_spec_uint (NM_DEVICE_802_11_WIRELESS_BITRATE, "Bit Rate", "Bit Rate", - 0, G_MAXINT32, 0, + 0, G_MAXUINT32, 0, G_PARAM_READWRITE)); g_object_class_install_property diff --git a/libnm-glib/nm-device-802-11-wireless.h b/libnm-glib/nm-device-802-11-wireless.h index 260081b7d4..2c912c3d41 100644 --- a/libnm-glib/nm-device-802-11-wireless.h +++ b/libnm-glib/nm-device-802-11-wireless.h @@ -38,7 +38,7 @@ NMDevice80211Wireless *nm_device_802_11_wireless_new (DBusGConnection *c char * nm_device_802_11_wireless_get_hw_address (NMDevice80211Wireless *device); int nm_device_802_11_wireless_get_mode (NMDevice80211Wireless *device); -int nm_device_802_11_wireless_get_bitrate (NMDevice80211Wireless *device); +guint32 nm_device_802_11_wireless_get_bitrate (NMDevice80211Wireless *device); guint32 nm_device_802_11_wireless_get_capabilities (NMDevice80211Wireless *device); NMAccessPoint * nm_device_802_11_wireless_get_active_access_point (NMDevice80211Wireless *device); diff --git a/libnm-glib/nm-device-802-3-ethernet.c b/libnm-glib/nm-device-802-3-ethernet.c index 702a0cc9cb..9db608209b 100644 --- a/libnm-glib/nm-device-802-3-ethernet.c +++ b/libnm-glib/nm-device-802-3-ethernet.c @@ -84,12 +84,12 @@ nm_device_802_3_ethernet_new (DBusGConnection *connection, const char *path) NULL); } -int +guint32 nm_device_802_3_ethernet_get_speed (NMDevice8023Ethernet *device) { g_return_val_if_fail (NM_IS_DEVICE_802_3_ETHERNET (device), 0); - return nm_object_get_int_property (NM_OBJECT (device), NM_DBUS_INTERFACE_DEVICE_WIRED, "Speed"); + return nm_object_get_uint_property (NM_OBJECT (device), NM_DBUS_INTERFACE_DEVICE_WIRED, "Speed"); } char * diff --git a/libnm-glib/nm-device-802-3-ethernet.h b/libnm-glib/nm-device-802-3-ethernet.h index 8b83605fc3..9b5a822726 100644 --- a/libnm-glib/nm-device-802-3-ethernet.h +++ b/libnm-glib/nm-device-802-3-ethernet.h @@ -24,7 +24,7 @@ GType nm_device_802_3_ethernet_get_type (void); NMDevice8023Ethernet *nm_device_802_3_ethernet_new (DBusGConnection *connection, const char *path); -int nm_device_802_3_ethernet_get_speed (NMDevice8023Ethernet *device); +guint32 nm_device_802_3_ethernet_get_speed (NMDevice8023Ethernet *device); char *nm_device_802_3_ethernet_get_hw_address (NMDevice8023Ethernet *device); G_END_DECLS |