← Back to branch summary

~ubuntu-branches/ubuntu/precise/network-manager/precise

« back to all changes in this revision

Viewing changes to libnm-glib/nm-wimax-nsp.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-02-09 16:45:41 UTC
  • mfrom: (1.1.53)
  • Revision ID: package-import@ubuntu.com-20120209164541-4h90zknlsfdb7x35
Tags: 0.9.2.0+git201202091925.c721477-0ubuntu1
* upstream snapshot 2012-02-09 19:25:59 (GMT)
  + c721477d11d4fe144111d6d2eec8f93f2e9186c9
* debian/patches/avoid-periodic-disk-wakeups.patch: refreshed.
* debian/patches/nl3-default-ip6-route.patch: refreshed.
* debian/libnm-glib4.symbols: add symbols:
  + nm_active_connection_get_master@Base
  + nm_client_new_async@Base
  + nm_client_new_finish@Base
  + nm_remote_settings_new_async@Base
  + nm_remote_settings_new_finish@Base
  + nm_device_get_state_reason@Base
* debian/libnm-util2.symbols: add symbols:
  + nm_setting_802_1x_get_pac_file@Base
  + nm_setting_infiniband_get_transport_mode@Base

Show diffs side-by-side

added added

removed removed

Lines of Context:
libnm-glib/nm-wimax-nsp.c
90
90
const char *
91
91
nm_wimax_nsp_get_name (NMWimaxNsp *nsp)
92
92
{
93
 
        NMWimaxNspPrivate *priv;
94
 
 
95
93
        g_return_val_if_fail (NM_IS_WIMAX_NSP (nsp), NULL);
96
94
 
97
 
        priv = NM_WIMAX_NSP_GET_PRIVATE (nsp);
98
 
        if (!priv->name)
99
 
                priv->name = _nm_object_get_string_property (NM_OBJECT (nsp),
100
 
                                                             NM_DBUS_INTERFACE_WIMAX_NSP,
101
 
                                                             DBUS_PROP_NAME,
102
 
                                                             NULL);
103
 
 
104
 
        return priv->name;
 
95
        _nm_object_ensure_inited (NM_OBJECT (nsp));
 
96
        return NM_WIMAX_NSP_GET_PRIVATE (nsp)->name;
105
97
}
106
98
 
107
99
/**
115
107
guint32
116
108
nm_wimax_nsp_get_signal_quality (NMWimaxNsp *nsp)
117
109
{
118
 
        NMWimaxNspPrivate *priv;
119
 
 
120
110
        g_return_val_if_fail (NM_IS_WIMAX_NSP (nsp), 0);
121
111
 
122
 
        priv = NM_WIMAX_NSP_GET_PRIVATE (nsp);
123
 
        if (!priv->signal_quality) {
124
 
                priv->signal_quality = _nm_object_get_uint_property (NM_OBJECT (nsp),
125
 
                                                                     NM_DBUS_INTERFACE_WIMAX_NSP,
126
 
                                                                     DBUS_PROP_SIGNAL_QUALITY,
127
 
                                                                     NULL);
128
 
        }
129
 
 
130
 
        return priv->signal_quality;
 
112
        _nm_object_ensure_inited (NM_OBJECT (nsp));
 
113
        return NM_WIMAX_NSP_GET_PRIVATE (nsp)->signal_quality;
131
114
}
132
115
 
133
116
/**
141
124
NMWimaxNspNetworkType
142
125
nm_wimax_nsp_get_network_type (NMWimaxNsp *nsp)
143
126
{
144
 
        NMWimaxNspPrivate *priv;
145
 
 
146
127
        g_return_val_if_fail (NM_IS_WIMAX_NSP (nsp), NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN);
147
128
 
148
 
        priv = NM_WIMAX_NSP_GET_PRIVATE (nsp);
149
 
        if (!priv->network_type) {
150
 
                priv->network_type = _nm_object_get_uint_property (NM_OBJECT (nsp),
151
 
                                                                   NM_DBUS_INTERFACE_WIMAX_NSP,
152
 
                                                                   DBUS_PROP_NETWORK_TYPE,
153
 
                                                                   NULL);
154
 
        }
155
 
 
156
 
        return priv->network_type;
 
129
        _nm_object_ensure_inited (NM_OBJECT (nsp));
 
130
        return NM_WIMAX_NSP_GET_PRIVATE (nsp)->network_type;
157
131
}
158
132
 
159
133
/**
290
264
}
291
265
 
292
266
static void
293
 
register_for_property_changed (NMWimaxNsp *nsp)
 
267
register_properties (NMWimaxNsp *nsp)
294
268
{
295
269
        NMWimaxNspPrivate *priv = NM_WIMAX_NSP_GET_PRIVATE (nsp);
296
 
        const NMPropertiesChangedInfo property_changed_info[] = {
297
 
                { NM_WIMAX_NSP_SIGNAL_QUALITY, _nm_object_demarshal_generic, &priv->signal_quality },
 
270
        const NMPropertiesInfo property_info[] = {
 
271
                { NM_WIMAX_NSP_NAME,           &priv->name },
 
272
                { NM_WIMAX_NSP_SIGNAL_QUALITY, &priv->signal_quality },
 
273
                { NM_WIMAX_NSP_NETWORK_TYPE,   &priv->network_type },
298
274
                { NULL },
299
275
        };
300
276
 
301
 
        _nm_object_handle_properties_changed (NM_OBJECT (nsp),
302
 
                                                                                  priv->proxy,
303
 
                                                                                  property_changed_info);
 
277
        _nm_object_register_properties (NM_OBJECT (nsp),
 
278
                                        priv->proxy,
 
279
                                        property_info);
304
280
}
305
281
 
306
 
static GObject*
307
 
constructor (GType type,
308
 
                         guint n_construct_params,
309
 
                         GObjectConstructParam *construct_params)
 
282
static void
 
283
constructed (GObject *object)
310
284
{
311
 
        NMObject *object;
312
285
        NMWimaxNspPrivate *priv;
313
286
 
314
 
        object = (NMObject *) G_OBJECT_CLASS (nm_wimax_nsp_parent_class)->constructor (type,
315
 
                                                                                                                                                                   n_construct_params,
316
 
                                                                                                                                                                   construct_params);
317
 
        if (!object)
318
 
                return NULL;
 
287
        G_OBJECT_CLASS (nm_wimax_nsp_parent_class)->constructed (object);
319
288
 
320
289
        priv = NM_WIMAX_NSP_GET_PRIVATE (object);
321
290
 
322
 
        priv->proxy = dbus_g_proxy_new_for_name (nm_object_get_connection (object),
 
291
        priv->proxy = dbus_g_proxy_new_for_name (nm_object_get_connection (NM_OBJECT (object)),
323
292
                                                                                         NM_DBUS_SERVICE,
324
 
                                                                                         nm_object_get_path (object),
 
293
                                                                                         nm_object_get_path (NM_OBJECT (object)),
325
294
                                                                                         NM_DBUS_INTERFACE_WIMAX_NSP);
326
295
 
327
 
        register_for_property_changed (NM_WIMAX_NSP (object));
328
 
 
329
 
        return G_OBJECT (object);
 
296
        register_properties (NM_WIMAX_NSP (object));
330
297
}
331
298
 
332
299
 
338
305
        g_type_class_add_private (nsp_class, sizeof (NMWimaxNspPrivate));
339
306
 
340
307
        /* virtual methods */
341
 
        object_class->constructor = constructor;
 
308
        object_class->constructed = constructed;
342
309
        object_class->get_property = get_property;
343
310
        object_class->dispose = dispose;
344
311
        object_class->finalize = finalize;