← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/nm-active-connection.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:
src/nm-active-connection.c
41
41
                                         guint prop_state,
42
42
                                         guint prop_default,
43
43
                                         guint prop_default6,
44
 
                                         guint prop_vpn)
 
44
                                         guint prop_vpn,
 
45
                                         guint prop_master)
45
46
{
46
47
        g_object_class_install_property (object_class, prop_connection,
47
48
                g_param_spec_boxed (NM_ACTIVE_CONNECTION_CONNECTION,
100
101
                                      "Is a VPN connection",
101
102
                                      FALSE,
102
103
                                      G_PARAM_READABLE));
 
104
 
 
105
        g_object_class_install_property (object_class, prop_master,
 
106
                g_param_spec_string (NM_ACTIVE_CONNECTION_MASTER,
 
107
                                     "Master",
 
108
                                     "Path of master device",
 
109
                                     NULL,
 
110
                                     G_PARAM_READABLE));
103
111
}
104
112