← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libnm-glib/nm-client.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-client.c
20
20
 
21
21
#include "nm-client-bindings.h"
22
22
 
23
 
void nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);
 
23
void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);
24
24
 
25
25
 
26
26
G_DEFINE_TYPE (NMClient, nm_client, NM_TYPE_OBJECT)
88
88
                NMDevice *device = g_ptr_array_index (priv->devices, i);
89
89
 
90
90
                if (NM_IS_DEVICE_WIFI (device))
91
 
                        nm_device_wifi_set_wireless_enabled (NM_DEVICE_WIFI (device), priv->wireless_enabled);
 
91
                        _nm_device_wifi_set_wireless_enabled (NM_DEVICE_WIFI (device), priv->wireless_enabled);
92
92
        }
93
93
}
94
94
 
99
99
        gboolean val;
100
100
        gboolean poke = FALSE;
101
101
 
102
 
        val = nm_object_get_boolean_property (NM_OBJECT (client),
 
102
        val = _nm_object_get_boolean_property (NM_OBJECT (client),
103
103
                                                                                  NM_DBUS_INTERFACE,
104
104
                                                                                  "WirelessHardwareEnabled");
105
105
        if (val != priv->wireless_hw_enabled) {
106
106
                priv->wireless_hw_enabled = val;
107
107
                poke = TRUE;
108
108
                if (notify)
109
 
                        nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_WIRELESS_HARDWARE_ENABLED);
 
109
                        _nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_WIRELESS_HARDWARE_ENABLED);
110
110
        }
111
111
 
112
112
        if (priv->wireless_hw_enabled == FALSE)
113
113
                val = FALSE;
114
114
        else
115
 
                val = nm_object_get_boolean_property (NM_OBJECT (client),
 
115
                val = _nm_object_get_boolean_property (NM_OBJECT (client),
116
116
                                                              NM_DBUS_INTERFACE,
117
117
                                                              "WirelessEnabled");
118
118
        if (val != priv->wireless_enabled) {
119
119
                priv->wireless_enabled = val;
120
120
                poke = TRUE;
121
121
                if (notify)
122
 
                        nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_WIRELESS_ENABLED);
 
122
                        _nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_WIRELESS_ENABLED);
123
123
        }
124
124
 
125
125
        if (poke)
181
181
        DBusGConnection *connection;
182
182
 
183
183
        connection = nm_object_get_connection (object);
184
 
        if (!nm_object_array_demarshal (value, (GPtrArray **) field, connection, new_active_connection))
 
184
        if (!_nm_object_array_demarshal (value, (GPtrArray **) field, connection, new_active_connection))
185
185
                return FALSE;
186
186
 
187
 
        nm_object_queue_notify (object, NM_CLIENT_ACTIVE_CONNECTIONS);
 
187
        _nm_object_queue_notify (object, NM_CLIENT_ACTIVE_CONNECTIONS);
188
188
        return TRUE;
189
189
}
190
190
 
193
193
{
194
194
        NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (client);
195
195
        const NMPropertiesChangedInfo property_changed_info[] = {
196
 
                { NM_CLIENT_STATE,                     nm_object_demarshal_generic,  &priv->state },
197
 
                { NM_CLIENT_WIRELESS_ENABLED,          nm_object_demarshal_generic,  &priv->wireless_enabled },
198
 
                { NM_CLIENT_WIRELESS_HARDWARE_ENABLED, nm_object_demarshal_generic,  &priv->wireless_hw_enabled },
 
196
                { NM_CLIENT_STATE,                     _nm_object_demarshal_generic,  &priv->state },
 
197
                { NM_CLIENT_WIRELESS_ENABLED,          _nm_object_demarshal_generic,  &priv->wireless_enabled },
 
198
                { NM_CLIENT_WIRELESS_HARDWARE_ENABLED, _nm_object_demarshal_generic,  &priv->wireless_hw_enabled },
199
199
                { NM_CLIENT_ACTIVE_CONNECTIONS,        demarshal_active_connections, &priv->active_connections },
200
200
                { NULL },
201
201
        };
202
202
 
203
 
        nm_object_handle_properties_changed (NM_OBJECT (client),
 
203
        _nm_object_handle_properties_changed (NM_OBJECT (client),
204
204
                                             priv->client_proxy,
205
205
                                             property_changed_info);
206
206
}
320
320
                b = g_value_get_boolean (value);
321
321
                if (priv->wireless_enabled != b) {
322
322
                        priv->wireless_enabled = b;
323
 
                        nm_object_queue_notify (NM_OBJECT (object), NM_CLIENT_WIRELESS_ENABLED);
 
323
                        _nm_object_queue_notify (NM_OBJECT (object), NM_CLIENT_WIRELESS_ENABLED);
324
324
                }
325
325
                break;
326
326
        case PROP_WIRELESS_HARDWARE_ENABLED:
327
327
                b = g_value_get_boolean (value);
328
328
                if (priv->wireless_hw_enabled != b) {
329
329
                        priv->wireless_hw_enabled = b;
330
 
                        nm_object_queue_notify (NM_OBJECT (object), NM_CLIENT_WIRELESS_HARDWARE_ENABLED);
 
330
                        _nm_object_queue_notify (NM_OBJECT (object), NM_CLIENT_WIRELESS_HARDWARE_ENABLED);
331
331
                }
332
332
                break;
333
333
        default:
537
537
        priv->manager_running = new_running;
538
538
        if (!priv->manager_running) {
539
539
                priv->state = NM_STATE_UNKNOWN;
540
 
                nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_MANAGER_RUNNING);
 
540
                _nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_MANAGER_RUNNING);
541
541
                poke_wireless_devices_with_rf_status (client);
542
542
                free_object_array (&priv->devices);
543
543
                free_object_array (&priv->active_connections);
544
544
                priv->wireless_enabled = FALSE;
545
545
                priv->wireless_hw_enabled = FALSE;
546
546
        } else {
547
 
                nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_MANAGER_RUNNING);
 
547
                _nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_MANAGER_RUNNING);
548
548
                update_wireless_status (client, TRUE);
549
549
        }
550
550
}
560
560
        if (!device) {
561
561
                DBusGConnection *connection = nm_object_get_connection (NM_OBJECT (client));
562
562
 
563
 
                device = G_OBJECT (nm_object_cache_get (path));
 
563
                device = G_OBJECT (_nm_object_cache_get (path));
564
564
                if (device) {
565
565
                        g_ptr_array_add (priv->devices, g_object_ref (device));
566
566
                } else {
622
622
        g_value_init (&value, DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH);
623
623
        g_value_take_boxed (&value, temp);
624
624
        connection = nm_object_get_connection (NM_OBJECT (client));
625
 
        nm_object_array_demarshal (&value, &priv->devices, connection, nm_device_new);
 
625
        _nm_object_array_demarshal (&value, &priv->devices, connection, nm_device_new);
626
626
        g_value_unset (&value);
627
627
 
628
628
        return handle_ptr_array_return (priv->devices);
782
782
        if (!priv->manager_running)
783
783
                return NULL;
784
784
 
785
 
        if (!nm_object_get_property (NM_OBJECT (client),
 
785
        if (!_nm_object_get_property (NM_OBJECT (client),
786
786
                                     "org.freedesktop.DBus.Properties",
787
787
                                     "ActiveConnections",
788
788
                                     &value)) {
828
828
        g_value_init (&value, G_TYPE_BOOLEAN);
829
829
        g_value_set_boolean (&value, enabled);
830
830
 
831
 
        nm_object_set_property (NM_OBJECT (client),
 
831
        _nm_object_set_property (NM_OBJECT (client),
832
832
                                            NM_DBUS_INTERFACE,
833
833
                                            "WirelessEnabled",
834
834
                                            &value);
871
871
                return NM_STATE_UNKNOWN;
872
872
 
873
873
        if (priv->state == NM_STATE_UNKNOWN)
874
 
                priv->state = nm_object_get_uint_property (NM_OBJECT (client), NM_DBUS_INTERFACE, "State");
 
874
                priv->state = _nm_object_get_uint_property (NM_OBJECT (client), NM_DBUS_INTERFACE, "State");
875
875
 
876
876
        return priv->state;
877
877
}