← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/nm-applet-use-indicator.patch/src/applet-device-wired.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/nm-applet-use-indicator.patch/src/applet-device-wired.c
262
262
 
263
263
                connection = applet_find_active_connection_for_device (device, applet, NULL);
264
264
                if (connection) {
265
 
                        s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
 
265
                        s_con = nm_connection_get_setting_connection (connection);
266
266
                        str = s_con ? nm_setting_connection_get_id (s_con) : NULL;
267
267
                }
268
268
 
287
287
 
288
288
        id = nm_device_get_iface (NM_DEVICE (device));
289
289
        if (connection) {
290
 
                s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
 
290
                s_con = nm_connection_get_setting_connection (connection);
291
291
                id = nm_setting_connection_get_id (s_con);
292
292
        }
293
293
 
372
372
        g_return_if_fail (NM_IS_CONNECTION (connection));
373
373
        g_return_if_fail (info != NULL);
374
374
 
375
 
        s_pppoe = (NMSettingPPPOE *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPPOE);
 
375
        s_pppoe = nm_connection_get_setting_pppoe (connection);
376
376
        g_return_if_fail (s_pppoe != NULL);
377
377
 
378
378
        s = nm_setting_pppoe_get_username (s_pppoe);
404
404
{
405
405
        SecretsRequest *req = user_data;
406
406
        NMPppoeInfo *info = (NMPppoeInfo *) req;
407
 
        NMSetting *setting;
 
407
        NMSettingPPPOE *setting;
408
408
        GHashTable *settings = NULL;
409
409
        GHashTable *secrets;
410
410
        GError *error = NULL;
418
418
                goto done;
419
419
        }
420
420
 
421
 
        setting = nm_connection_get_setting (req->connection, NM_TYPE_SETTING_PPPOE);
422
 
        pppoe_update_setting (NM_SETTING_PPPOE (setting), info);
 
421
        setting = nm_connection_get_setting_pppoe (req->connection);
 
422
        pppoe_update_setting (setting, info);
423
423
 
424
 
        secrets = nm_setting_to_hash (setting, NM_SETTING_HASH_FLAG_ONLY_SECRETS);
 
424
        secrets = nm_setting_to_hash (NM_SETTING (setting), NM_SETTING_HASH_FLAG_ONLY_SECRETS);
425
425
        if (!secrets) {
426
426
                g_set_error (&error,
427
427
                             NM_SECRET_AGENT_ERROR,
608
608
        NMSettingConnection *s_con;
609
609
        const char *ctype;
610
610
 
611
 
        s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (req->connection, NM_TYPE_SETTING_CONNECTION));
 
611
        s_con = nm_connection_get_setting_connection (req->connection);
612
612
        if (!s_con) {
613
613
                g_set_error (error,
614
614
                             NM_SECRET_AGENT_ERROR,