← Back to branch summary

~network-manager/network-manager/ubuntu.hardy.07

« back to all changes in this revision

Viewing changes to libnm-glib/nm-access-point.c

* merge 0.7~~svn20080905t025540+eni0 snapshot to hardy branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libnm-glib/nm-access-point.c
91
91
 
92
92
        priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
93
93
        if (!priv->flags) {
94
 
                priv->flags = nm_object_get_uint_property (NM_OBJECT (ap),
 
94
                priv->flags = _nm_object_get_uint_property (NM_OBJECT (ap),
95
95
                                                           NM_DBUS_INTERFACE_ACCESS_POINT,
96
96
                                                           DBUS_PROP_FLAGS);
97
97
        }
116
116
 
117
117
        priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
118
118
        if (!priv->wpa_flags) {
119
 
                priv->wpa_flags = nm_object_get_uint_property (NM_OBJECT (ap),
 
119
                priv->wpa_flags = _nm_object_get_uint_property (NM_OBJECT (ap),
120
120
                                                               NM_DBUS_INTERFACE_ACCESS_POINT,
121
121
                                                               DBUS_PROP_WPA_FLAGS);
122
122
        }
141
141
 
142
142
        priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
143
143
        if (!priv->rsn_flags) {
144
 
                priv->rsn_flags = nm_object_get_uint_property (NM_OBJECT (ap),
 
144
                priv->rsn_flags = _nm_object_get_uint_property (NM_OBJECT (ap),
145
145
                                                               NM_DBUS_INTERFACE_ACCESS_POINT,
146
146
                                                               DBUS_PROP_RSN_FLAGS);
147
147
        }
167
167
 
168
168
        priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
169
169
        if (!priv->ssid) {
170
 
                priv->ssid = nm_object_get_byte_array_property (NM_OBJECT (ap),
 
170
                priv->ssid = _nm_object_get_byte_array_property (NM_OBJECT (ap),
171
171
                                                                NM_DBUS_INTERFACE_ACCESS_POINT,
172
172
                                                                DBUS_PROP_SSID);
173
173
        }
192
192
 
193
193
        priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
194
194
        if (!priv->frequency) {
195
 
                priv->frequency = nm_object_get_uint_property (NM_OBJECT (ap),
 
195
                priv->frequency = _nm_object_get_uint_property (NM_OBJECT (ap),
196
196
                                                               NM_DBUS_INTERFACE_ACCESS_POINT,
197
197
                                                               DBUS_PROP_FREQUENCY);
198
198
        }
218
218
 
219
219
        priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
220
220
        if (!priv->hw_address) {
221
 
                priv->hw_address = nm_object_get_string_property (NM_OBJECT (ap),
 
221
                priv->hw_address = _nm_object_get_string_property (NM_OBJECT (ap),
222
222
                                                                  NM_DBUS_INTERFACE_ACCESS_POINT,
223
223
                                                                  DBUS_PROP_HW_ADDRESS);
224
224
        }
243
243
 
244
244
        priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
245
245
        if (!priv->mode) {
246
 
                priv->mode = nm_object_get_uint_property (NM_OBJECT (ap),
 
246
                priv->mode = _nm_object_get_uint_property (NM_OBJECT (ap),
247
247
                                                          NM_DBUS_INTERFACE_ACCESS_POINT,
248
248
                                                          DBUS_PROP_MODE);
249
249
        }
268
268
 
269
269
        priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
270
270
        if (!priv->max_bitrate) {
271
 
                priv->max_bitrate = nm_object_get_uint_property (NM_OBJECT (ap),
 
271
                priv->max_bitrate = _nm_object_get_uint_property (NM_OBJECT (ap),
272
272
                                                              NM_DBUS_INTERFACE_ACCESS_POINT,
273
273
                                                              DBUS_PROP_MAX_BITRATE);
274
274
        }
293
293
 
294
294
        priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
295
295
        if (!priv->strength) {
296
 
                priv->strength = nm_object_get_byte_property (NM_OBJECT (ap),
 
296
                priv->strength = _nm_object_get_byte_property (NM_OBJECT (ap),
297
297
                                                              NM_DBUS_INTERFACE_ACCESS_POINT,
298
298
                                                              DBUS_PROP_STRENGTH);
299
299
        }
384
384
static gboolean
385
385
demarshal_ssid (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field)
386
386
{
387
 
        if (!nm_ssid_demarshal (value, (GByteArray **) field))
 
387
        if (!_nm_ssid_demarshal (value, (GByteArray **) field))
388
388
                return FALSE;
389
389
 
390
 
        nm_object_queue_notify (object, NM_ACCESS_POINT_SSID);
 
390
        _nm_object_queue_notify (object, NM_ACCESS_POINT_SSID);
391
391
        return TRUE;
392
392
}
393
393
 
396
396
{
397
397
        NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
398
398
        const NMPropertiesChangedInfo property_changed_info[] = {
399
 
                { NM_ACCESS_POINT_FLAGS,       nm_object_demarshal_generic, &priv->flags },
400
 
                { NM_ACCESS_POINT_WPA_FLAGS,   nm_object_demarshal_generic, &priv->wpa_flags },
401
 
                { NM_ACCESS_POINT_RSN_FLAGS,   nm_object_demarshal_generic, &priv->rsn_flags },
 
399
                { NM_ACCESS_POINT_FLAGS,       _nm_object_demarshal_generic, &priv->flags },
 
400
                { NM_ACCESS_POINT_WPA_FLAGS,   _nm_object_demarshal_generic, &priv->wpa_flags },
 
401
                { NM_ACCESS_POINT_RSN_FLAGS,   _nm_object_demarshal_generic, &priv->rsn_flags },
402
402
                { NM_ACCESS_POINT_SSID,        demarshal_ssid,              &priv->ssid },
403
 
                { NM_ACCESS_POINT_FREQUENCY,   nm_object_demarshal_generic, &priv->frequency },
404
 
                { NM_ACCESS_POINT_HW_ADDRESS,  nm_object_demarshal_generic, &priv->hw_address },
405
 
                { NM_ACCESS_POINT_MODE,        nm_object_demarshal_generic, &priv->mode },
406
 
                { NM_ACCESS_POINT_MAX_BITRATE, nm_object_demarshal_generic, &priv->max_bitrate },
407
 
                { NM_ACCESS_POINT_STRENGTH,    nm_object_demarshal_generic, &priv->strength },
 
403
                { NM_ACCESS_POINT_FREQUENCY,   _nm_object_demarshal_generic, &priv->frequency },
 
404
                { NM_ACCESS_POINT_HW_ADDRESS,  _nm_object_demarshal_generic, &priv->hw_address },
 
405
                { NM_ACCESS_POINT_MODE,        _nm_object_demarshal_generic, &priv->mode },
 
406
                { NM_ACCESS_POINT_MAX_BITRATE, _nm_object_demarshal_generic, &priv->max_bitrate },
 
407
                { NM_ACCESS_POINT_STRENGTH,    _nm_object_demarshal_generic, &priv->strength },
408
408
                { NULL },
409
409
        };
410
410
 
411
 
        nm_object_handle_properties_changed (NM_OBJECT (ap),
 
411
        _nm_object_handle_properties_changed (NM_OBJECT (ap),
412
412
                                             priv->proxy,
413
413
                                             property_changed_info);
414
414
}