← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/wireless-security/eap-method-simple.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/wireless-security/eap-method-simple.c
100
100
        const char *eap = NULL;
101
101
        NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE;
102
102
 
103
 
        s_8021x = NM_SETTING_802_1X (nm_connection_get_setting (connection, NM_TYPE_SETTING_802_1X));
 
103
        s_8021x = nm_connection_get_setting_802_1x (connection);
104
104
        g_assert (s_8021x);
105
105
 
106
106
        /* If this is the main EAP method, clear any existing methods because the
237
237
                          (GCallback) wireless_security_changed_cb,
238
238
                          ws_parent);
239
239
        if (connection) {
240
 
                s_8021x = NM_SETTING_802_1X (nm_connection_get_setting (connection, NM_TYPE_SETTING_802_1X));
 
240
                s_8021x = nm_connection_get_setting_802_1x (connection);
241
241
                if (s_8021x && nm_setting_802_1x_get_identity (s_8021x))
242
242
                        gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_identity (s_8021x));
243
243
        }