← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/network-manager/oneiric

« back to all changes in this revision

Viewing changes to src/vpn-manager/nm-vpn-connection.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-05-06 12:59:53 UTC
  • mfrom: (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110506125953-r4ka8fnwirdjd2g8
Tags: 0.8.4-0ubuntu1
* Upstream release 0.8.4.
* debian/source/format: migrate to package format 3.0 (quilt)
* debian/patches/99_printf_formatting_fixes.patch: dropped, applied upstream.
* debian/patches/git_disconn_secrets_reqs_b613a17.patch,
  debian/patches/git_wwan_state_detection_d0a1b23.patch, 
  debian/patches/git_wired_ap_scan_value_a262dc4.patch: dropped,
  applied upstream.
* debian/patches/lp120363_smartcard_pkcs11.patch: refreshed, for reordering
  the new symbols in the symbols list file.
* debian/patches/02-dbus_access_network_manager.patch: dropped, no longer
  required (hal is deprecated).
* debian/control: merge Debian changes and migrate to DH instead of CDBS:
  - bump debhelper Build-Depends to >= 8.
  - add Build-Depends on dh-autoreconf.
  - sync Build-Depends with Debian's; this drops automake1.9, cdbs, quilt,
    gnome-common, libgnome-keyring-dev, libgnomeui-dev, libpanel-applet2-dev,
    libglade2-dev, libgconf2-dev, iproute.
  - add new package network-manager-dbg for debug symbols.
  - bump Standards-Version to 3.9.2.
* debian/control: merge binary packages dependencies with Debian, important
  changes:
  - network-manager: Depends adds udev and isc-dhcp-client (>= 4.1.1-P1-4)
  - network-manager: Recommends: adds policykit-1
  - network-manager: Suggests: adds avahi-autoipd
* debian/compat: bump to compat level 8.
* debian/rules:
  - migrate to use dh instead of CDBS.
  - add override for dh_strip to correctly strip NM to the new
    package network-manager-dbg. 
  - cleanup more extra files left behind by the build.
* debian/libnm-glib-dev.install,
  debian/libnm-glib-vpn-dev.install: clean up and sync with Debian.
* debian/libnm-glib-dev.links: drop links to legacy names for .pc files,
  introduced in Karmic for a transition: they're not required anymore.
* debian/libnm-util-dev.install: sync with Debian.
* debian/network-manager.install:
  - don't ship .a and .la files.
  - explicitly install /usr/bin/nm-online.
  - install dispatchers from upstream in /etc/NetworkManager/dispatcher.d.
  - install extra udev rules from upstream.
* debian/network-manager.dirs: sync with Debian.
* debian/network-manager.docs: define additional upstream files to ship as
  documentation.
  - drop ifblacklist_migrate.sh and /usr/share/NetworkManager/gdb-cmd
* debian/network-manager.postrm: drop old code migrating /etc/dbus-1/event.d.
* debian/network-manager.postinst: drop code migrating /etc/dbus-1/event.d.
* debian/copyright: sync with Debian.
* debian/README.Debian: add information about using System-level settings and
  connections.
* debian/watch: because I can.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/vpn-manager/nm-vpn-connection.c
61
61
 
62
62
        NMConnection *connection;
63
63
 
64
 
        NMActRequest *act_request;
65
 
 
66
64
        NMDevice *parent_dev;
67
65
        gulong device_monitor;
68
66
        gulong device_ip4;
199
197
}
200
198
 
201
199
NMVPNConnection *
202
 
nm_vpn_connection_new (NMConnection *connection,
203
 
                       NMActRequest *act_request,
204
 
                       NMDevice *parent_device)
 
200
nm_vpn_connection_new (NMConnection *connection, NMDevice *parent_device)
205
201
{
206
202
        NMVPNConnection *self;
207
203
        NMVPNConnectionPrivate *priv;
208
204
 
209
205
        g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
210
 
        g_return_val_if_fail (NM_IS_ACT_REQUEST (act_request), NULL);
211
206
        g_return_val_if_fail (NM_IS_DEVICE (parent_device), NULL);
212
207
 
213
208
        self = (NMVPNConnection *) g_object_new (NM_TYPE_VPN_CONNECTION, NULL);
218
213
 
219
214
        priv->connection = g_object_ref (connection);
220
215
        priv->parent_dev = g_object_ref (parent_device);
221
 
        priv->act_request = g_object_ref (act_request);
222
216
 
223
217
        priv->device_monitor = g_signal_connect (parent_device, "state-changed",
224
218
                                                                         G_CALLBACK (device_state_changed),
925
919
{
926
920
        NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection);
927
921
 
928
 
        nm_secrets_provider_interface_cancel_get_secrets (NM_SECRETS_PROVIDER_INTERFACE (priv->act_request));
 
922
        nm_secrets_provider_interface_cancel_get_secrets (NM_SECRETS_PROVIDER_INTERFACE (connection));
929
923
 
930
924
        switch (state) {
931
925
        case NM_VPN_CONNECTION_STATE_NEED_AUTH:
989
983
        if (priv->proxy)
990
984
                g_object_unref (priv->proxy);
991
985
 
992
 
        g_object_unref (priv->act_request);
993
986
        g_object_unref (priv->connection);
994
987
 
995
988
        G_OBJECT_CLASS (nm_vpn_connection_parent_class)->dispose (object);