← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/applet-vpn-request.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-03-14 16:03:22 UTC
  • mfrom: (1.2.27)
  • Revision ID: package-import@ubuntu.com-20120314160322-wdd419cyddzw00ib
Tags: 0.9.3.995+git.20120313t141231.c89224f-0ubuntu1
https://launchpad.net/bugs/953123
https://launchpad.net/bugs/894249
* upstream snapshot 2012-03-13 14:12:31 (GMT)
  + c89224f42f7cee4fca7369a890011a67350d8ff6
  - Freeze Exception: (LP: #953123)
  - Adding EAP-FAST support in UI.
  - mobile-wizard: fix sensitizing providers' list (LP: #894249)
* debian/patches/lp912150_lazy_notify_init.patch: dropped, applied upstream.
* debian/patches/lp330571_dxteam_wired_connect_text.patch: refreshed.
* debian/patches/lp330608_dxteam_gsm_connect_text.patch: refreshed.
* debian/patches/nm-applet-use-indicator.patch: refreshed.
* debian/patches/no_Werror.patch: dropped, applied upstream.
* debian/rules: pass --enable-more-warnings=no to retain the same behavior as
  with the no_Werror.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/applet-vpn-request.c
306
306
        NMSettingVPN *s_vpn;
307
307
        WriteItemInfo info = { .fd = fd, .secret = FALSE, .error = error };
308
308
 
309
 
        s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN);
 
309
        s_vpn = nm_connection_get_setting_vpn (connection);
310
310
        if (!s_vpn) {
311
311
                g_set_error_literal (error,
312
312
                                     NM_SECRET_AGENT_ERROR,
354
354
 
355
355
        applet_secrets_request_set_free_func (req, free_vpn_secrets_info);
356
356
 
357
 
        s_con = (NMSettingConnection *) nm_connection_get_setting (req->connection, NM_TYPE_SETTING_CONNECTION);
 
357
        s_con = nm_connection_get_setting_connection (req->connection);
358
358
        g_return_val_if_fail (s_con != NULL, FALSE);
359
359
 
360
360
        connection_type = nm_setting_connection_get_connection_type (s_con);
361
361
        g_return_val_if_fail (connection_type != NULL, FALSE);
362
362
        g_return_val_if_fail (strcmp (connection_type, NM_SETTING_VPN_SETTING_NAME) == 0, FALSE);
363
363
 
364
 
        s_vpn = NM_SETTING_VPN (nm_connection_get_setting (req->connection, NM_TYPE_SETTING_VPN));
 
364
        s_vpn = nm_connection_get_setting_vpn (req->connection);
365
365
        g_return_val_if_fail (s_vpn != NULL, FALSE);
366
366
 
367
367
        service_type = nm_setting_vpn_get_service_type (s_vpn);