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

« back to all changes in this revision

Viewing changes to system-settings/src/nm-system-config-hal-manager.c

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
206
206
        dbus_g_proxy_add_signal (priv->proxy, "DeviceRemoved", G_TYPE_STRING, G_TYPE_INVALID);
207
207
        dbus_g_proxy_connect_signal (priv->proxy, "DeviceRemoved", G_CALLBACK (device_removed_cb), manager, NULL);
208
208
 
209
 
        dbus_g_object_register_marshaller (nm_marshal_VOID__STRING_STRING,
 
209
        dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_STRING,
210
210
                                                                           G_TYPE_NONE,
211
211
                                                                           G_TYPE_STRING, G_TYPE_STRING,
212
212
                                                                           G_TYPE_INVALID);
307
307
                                          G_SIGNAL_RUN_FIRST,
308
308
                                          G_STRUCT_OFFSET (NMSystemConfigHalManagerClass, device_added),
309
309
                                          NULL, NULL,
310
 
                                          nm_marshal_VOID__STRING_UINT,
 
310
                                          _nm_marshal_VOID__STRING_UINT,
311
311
                                          G_TYPE_NONE, 2,
312
312
                                          G_TYPE_STRING,
313
313
                                          G_TYPE_UINT);
318
318
                                          G_SIGNAL_RUN_FIRST,
319
319
                                          G_STRUCT_OFFSET (NMSystemConfigHalManagerClass, device_removed),
320
320
                                          NULL, NULL,
321
 
                                          nm_marshal_VOID__STRING_UINT,
 
321
                                          _nm_marshal_VOID__STRING_UINT,
322
322
                                          G_TYPE_NONE, 2,
323
323
                                          G_TYPE_STRING,
324
324
                                          G_TYPE_UINT);