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

« back to all changes in this revision

Viewing changes to src/connection-editor/ce-page.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-02-15 09:53:22 UTC
  • mfrom: (1.2.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20110215095322-wg45a3nun5vqpv1q
Tags: 0.8.3+git.20110203t003354.9bf0b98-0ubuntu1
* upstream snapshot 2011-02-03 00:33:54 (GMT)
  + 9bf0b98073bee4905bb00b4658d8fd78c84a831f
* debian/control: Drop the mobile-broadband-provider-info dependency to a
  Recommends. (LP: #582404)
* debian/patches/nm-applet-use-indicator.patch: revert Flight Mode, it's
  confusing users and not accurate; plus doesn't allow re-enabling just wifi
  from flight mode (when flights allow wifi, for instance)
  (LP: #704295, #712122)
* debian/patches/nm-applet-use-indicator.patch: disconnect a VPN connection
  when it's activated and its GtkCheckMenuItem is clicked. (LP: #701004)
* debian/patches/applet-wifi-menu-before-vpn.patch: move Connect to Hidden,
  Create New wireless items below the VPN submenu.
* debian/control: bump Standards-Version to 3.9.1.
* debian/control: move Homepage to its own field.

Show diffs side-by-side

added added

removed removed

Lines of Context:
200
200
        g_assert (setting_name);
201
201
        g_assert (secrets);
202
202
 
203
 
        /* Update the connection with the new secrets */
204
203
        setting_hash = g_hash_table_lookup (secrets, setting_name);
205
204
        if (!setting_hash) {
206
205
                /* Success, no secrets */
208
207
                return;
209
208
        }
210
209
 
 
210
        /* Update the connection with the new secrets */
211
211
        if (nm_connection_update_secrets (self->connection,
212
212
                                          setting_name,
213
 
                                          setting_hash,
 
213
                                          secrets,
214
214
                                          &update_error)) {
215
215
                /* Success */
216
216
                emit_initialized (self, NULL);