fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 08:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wimax: fix NSP property type confusion

Browse source 
Just make them all uints.
This commit is contained in:
Dan Williams 2011-01-04 16:45:00 -06:00
parent a361ccd31d
commit 8c2932fc2b
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libnm-glib/nm-wimax-nsp.c
View file

@ -36,7 +36,7 @@ typedef struct {
DBusGProxy *proxy; DBusGProxy *proxy;
char *name; char *name;
guint8 signal_quality; guint32 signal_quality;
NMWimaxNspNetworkType network_type; NMWimaxNspNetworkType network_type;
} NMWimaxNspPrivate; } NMWimaxNspPrivate;
@ -106,7 +106,7 @@ nm_wimax_nsp_get_name (NMWimaxNsp *nsp)
* *
* Returns: the signal quality * Returns: the signal quality
**/ **/
guint8 guint32
nm_wimax_nsp_get_signal_quality (NMWimaxNsp *nsp) nm_wimax_nsp_get_signal_quality (NMWimaxNsp *nsp)
{ {
NMWimaxNspPrivate *priv; NMWimaxNspPrivate *priv;
@ -140,7 +140,7 @@ nm_wimax_nsp_get_network_type (NMWimaxNsp *nsp)
priv = NM_WIMAX_NSP_GET_PRIVATE (nsp); priv = NM_WIMAX_NSP_GET_PRIVATE (nsp);
if (!priv->network_type) { if (!priv->network_type) {
priv->network_type = _nm_object_get_byte_property (NM_OBJECT (nsp), priv->network_type = _nm_object_get_uint_property (NM_OBJECT (nsp),
NM_DBUS_INTERFACE_WIMAX_NSP, NM_DBUS_INTERFACE_WIMAX_NSP,
DBUS_PROP_NETWORK_TYPE); DBUS_PROP_NETWORK_TYPE);
} }
@ -282,11 +282,11 @@ nm_wimax_nsp_class_init (NMWimaxNspClass *nsp_class)
**/ **/
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SIGNAL_QUALITY, (object_class, PROP_SIGNAL_QUALITY,
g_param_spec_uchar (NM_WIMAX_NSP_SIGNAL_QUALITY, g_param_spec_uint (NM_WIMAX_NSP_SIGNAL_QUALITY,
"Signal Quality", "Signal Quality",
"Signal Quality", "Signal Quality",
0, G_MAXUINT8, 0, 0, 100, 0,
G_PARAM_READABLE)); G_PARAM_READABLE));
/** /**
* NMWimaxNsp:network-type: * NMWimaxNsp:network-type:

3
libnm-glib/nm-wimax-nsp.h
View file

@ -17,6 +17,7 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* Copyright (C) 2011 Red Hat, Inc.
* Copyright (C) 2009 Novell, Inc. * Copyright (C) 2009 Novell, Inc.
*/ */
@ -69,7 +70,7 @@ GType nm_wimax_nsp_get_type (void);
GObject *nm_wimax_nsp_new (DBusGConnection *connection, const char *path); GObject *nm_wimax_nsp_new (DBusGConnection *connection, const char *path);
const char * nm_wimax_nsp_get_name (NMWimaxNsp *nsp); const char * nm_wimax_nsp_get_name (NMWimaxNsp *nsp);
guint8 nm_wimax_nsp_get_signal_quality (NMWimaxNsp *nsp); guint32 nm_wimax_nsp_get_signal_quality (NMWimaxNsp *nsp);
NMWimaxNspNetworkType nm_wimax_nsp_get_network_type (NMWimaxNsp *nsp); NMWimaxNspNetworkType nm_wimax_nsp_get_network_type (NMWimaxNsp *nsp);
G_END_DECLS G_END_DECLS

14
src/wimax/nm-wimax-nsp.c
View file

@ -231,13 +231,13 @@ nm_wimax_nsp_class_init (NMWimaxNspClass *klass)
g_object_class_install_property g_object_class_install_property
(object_class, PROP_NETWORK_TYPE, (object_class, PROP_NETWORK_TYPE,
g_param_spec_uchar (NM_WIMAX_NSP_NETWORK_TYPE, g_param_spec_uint (NM_WIMAX_NSP_NETWORK_TYPE,
"NetworkType", "NetworkType",
"NetworkType", "NetworkType",
NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN, NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN,
NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER, NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER,
NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN, NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
/* Signals */ /* Signals */
signals[PROPERTIES_CHANGED] = signals[PROPERTIES_CHANGED] =