← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libnm-util/nm-setting-connection.c

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
libnm-util/nm-setting-connection.c
67
67
enum {
68
68
        PROP_0,
69
69
        PROP_ID,
 
70
        PROP_UUID,
70
71
        PROP_TYPE,
71
72
        PROP_AUTOCONNECT,
72
73
        PROP_TIMESTAMP,
107
108
                return FALSE;
108
109
        }
109
110
 
 
111
        if (!self->uuid) {
 
112
                g_set_error (error,
 
113
                             NM_SETTING_CONNECTION_ERROR,
 
114
                             NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
 
115
                             NM_SETTING_CONNECTION_UUID);
 
116
                return FALSE;
 
117
        } else if (!strlen (self->uuid)) {
 
118
                g_set_error (error,
 
119
                             NM_SETTING_CONNECTION_ERROR,
 
120
                             NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
 
121
                             NM_SETTING_CONNECTION_UUID);
 
122
                return FALSE;
 
123
        }
 
124
 
110
125
        if (!self->type) {
111
126
                g_set_error (error,
112
127
                             NM_SETTING_CONNECTION_ERROR,
145
160
        NMSettingConnection *self = NM_SETTING_CONNECTION (object);
146
161
 
147
162
        g_free (self->id);
 
163
        g_free (self->uuid);
148
164
        g_free (self->type);
149
165
 
150
166
        G_OBJECT_CLASS (nm_setting_connection_parent_class)->finalize (object);
161
177
                g_free (setting->id);
162
178
                setting->id = g_value_dup_string (value);
163
179
                break;
 
180
        case PROP_UUID:
 
181
                g_free (setting->uuid);
 
182
                setting->uuid = g_value_dup_string (value);
 
183
                break;
164
184
        case PROP_TYPE:
165
185
                g_free (setting->type);
166
186
                setting->type = g_value_dup_string (value);
187
207
        case PROP_ID:
188
208
                g_value_set_string (value, setting->id);
189
209
                break;
 
210
        case PROP_UUID:
 
211
                g_value_set_string (value, setting->uuid);
 
212
                break;
190
213
        case PROP_TYPE:
191
214
                g_value_set_string (value, setting->type);
192
215
                break;
224
247
                                                  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE));
225
248
 
226
249
        g_object_class_install_property
 
250
                (object_class, PROP_UUID,
 
251
                 g_param_spec_string (NM_SETTING_CONNECTION_UUID,
 
252
                                                  "UUID",
 
253
                                                  "Universally unique connection identifier",
 
254
                                                  NULL,
 
255
                                                  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE));
 
256
 
 
257
        g_object_class_install_property
227
258
                (object_class, PROP_TYPE,
228
259
                 g_param_spec_string (NM_SETTING_CONNECTION_TYPE,
229
260
                                                  "Type",