← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/nm-activation-request.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-activation-request.c
91
91
        PROP_DEFAULT,
92
92
        PROP_DEFAULT6,
93
93
        PROP_VPN,
 
94
        PROP_MASTER,
94
95
 
95
96
        LAST_PROP
96
97
};
558
559
        case PROP_VPN:
559
560
                g_value_set_boolean (value, FALSE);
560
561
                break;
 
562
        case PROP_MASTER:
 
563
                g_value_set_string (value, nm_device_get_master_path (priv->device));
 
564
                break;
561
565
        default:
562
566
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
563
567
                break;
632
636
                                             PROP_STATE,
633
637
                                             PROP_DEFAULT,
634
638
                                             PROP_DEFAULT6,
635
 
                                             PROP_VPN);
 
639
                                             PROP_VPN,
 
640
                                             PROP_MASTER);
636
641
 
637
642
        /* Signals */
638
643
        signals[PROPERTIES_CHANGED] =