← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/nm-manager.c

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/nm-manager.c
285
285
                                                      "/",
286
286
                                                      NM_AUTOIP_DBUS_IFACE);
287
287
        if (priv->aipd_proxy) {
288
 
                dbus_g_object_register_marshaller (nm_marshal_VOID__STRING_STRING_STRING,
 
288
                dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_STRING_STRING,
289
289
                                                                                   G_TYPE_NONE,
290
290
                                                                                   G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
291
291
                                                                                   G_TYPE_INVALID);
630
630
                                          G_SIGNAL_RUN_FIRST,
631
631
                                          G_STRUCT_OFFSET (NMManagerClass, connection_added),
632
632
                                          NULL, NULL,
633
 
                                    nm_marshal_VOID__OBJECT_UINT,
 
633
                                    _nm_marshal_VOID__OBJECT_UINT,
634
634
                                          G_TYPE_NONE, 2,
635
635
                                    G_TYPE_OBJECT, G_TYPE_UINT);
636
636
 
640
640
                                          G_SIGNAL_RUN_FIRST,
641
641
                                          G_STRUCT_OFFSET (NMManagerClass, connection_updated),
642
642
                                          NULL, NULL,
643
 
                                      nm_marshal_VOID__OBJECT_UINT,
 
643
                                      _nm_marshal_VOID__OBJECT_UINT,
644
644
                                          G_TYPE_NONE, 2,
645
645
                                      G_TYPE_OBJECT, G_TYPE_UINT);
646
646
 
650
650
                                          G_SIGNAL_RUN_FIRST,
651
651
                                          G_STRUCT_OFFSET (NMManagerClass, connection_removed),
652
652
                                          NULL, NULL,
653
 
                                    nm_marshal_VOID__OBJECT_UINT,
 
653
                                    _nm_marshal_VOID__OBJECT_UINT,
654
654
                                          G_TYPE_NONE, 2,
655
655
                                    G_TYPE_OBJECT, G_TYPE_UINT);
656
656