← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/lp341684_device_sensitive_disconnect_notify.patch/src/applet-device-wifi.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:
.pc/lp341684_device_sensitive_disconnect_notify.patch/src/applet-device-wifi.c
602
602
                        NMSettingConnection *s_con;
603
603
                        GtkWidget *subitem;
604
604
 
605
 
                        s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
 
605
                        s_con = nm_connection_get_setting_connection (connection);
606
606
                        subitem = gtk_menu_item_new_with_label (nm_setting_connection_get_id (s_con));
607
607
 
608
608
                        info = g_slice_new0 (WirelessMenuItemInfo);
943
943
        if (!connection)
944
944
                return;
945
945
 
946
 
        s_wireless = NM_SETTING_WIRELESS (nm_connection_get_setting (NM_CONNECTION (connection), NM_TYPE_SETTING_WIRELESS));
 
946
        s_wireless = nm_connection_get_setting_wireless (NM_CONNECTION (connection));
947
947
        if (!s_wireless)
948
948
                return;
949
949
 
1055
1055
                        NMConnection *connection = NM_CONNECTION (iter->data);
1056
1056
                        NMSettingConnection *s_con;
1057
1057
 
1058
 
                        s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
 
1058
                        s_con = nm_connection_get_setting_connection (connection);
1059
1059
                        if (nm_setting_connection_get_autoconnect (s_con))  {
1060
1060
                                is_autoconnect = TRUE;
1061
1061
                                break;
1298
1298
 
1299
1299
        id = nm_device_get_iface (device);
1300
1300
        if (connection) {
1301
 
                s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
 
1301
                s_con = nm_connection_get_setting_connection (connection);
1302
1302
                id = nm_setting_connection_get_id (s_con);
1303
1303
        }
1304
1304
 
1468
1468
                /* Entirely new connection */
1469
1469
 
1470
1470
                /* Don't autoconnect adhoc networks by default for now */
1471
 
                s_wifi = (NMSettingWireless *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS);
 
1471
                s_wifi = nm_connection_get_setting_wireless (connection);
1472
1472
                if (s_wifi)
1473
1473
                        mode = nm_setting_wireless_get_mode (s_wifi);
1474
1474
                if (g_strcmp0 (mode, "adhoc") == 0) {
1595
1595
        }
1596
1596
 
1597
1597
        /* Second-guess which setting NM wants secrets for. */
1598
 
        s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS_SECURITY));
 
1598
        s_wireless_sec = nm_connection_get_setting_wireless_security (connection);
1599
1599
        if (!s_wireless_sec) {
1600
1600
                g_set_error (&error,
1601
1601
                             NM_SECRET_AGENT_ERROR,
1633
1633
                if (!auth_alg || strcmp (auth_alg, "leap")) {
1634
1634
                        NMSetting8021x *s_8021x;
1635
1635
 
1636
 
                        s_8021x = (NMSetting8021x *) nm_connection_get_setting (connection, NM_TYPE_SETTING_802_1X);
 
1636
                        s_8021x = nm_connection_get_setting_802_1x (connection);
1637
1637
                        if (!s_8021x) {
1638
1638
                                g_set_error (&error,
1639
1639
                                             NM_SECRET_AGENT_ERROR,