← Back to branch summary

~ubuntu-branches/ubuntu/saucy/network-manager-applet/saucy-updates

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-08-10 15:44:44 UTC
  • mfrom: (1.2.30)
  • Revision ID: package-import@ubuntu.com-20120810154444-nmjepmyshkpbxt60
Tags: 0.9.6.2-0ubuntu1
* New upstream release.
  - Fix GNOME Bluetooth plugin DUN modem detection and setup
  - Various crash and stability fixes
  - Allow appending DNS servers and domains in automatic addressing mode
  - Fix defaults for PPP echo values
  - Show IPv6 addressing page for VPN plugins that support it
  - Port to GSettings and split out 0.8 -> 0.9 migration code
  - Recognize PKCS#12 certificates imported from Firefox
  - Pre-fill CDMA username/password in the mobile broadband wizard
  - Only handle VPN secrets for GNOME Shell 3.3 and lower
* debian/control: Bump Depends and Build-Depends to (>= 0.9.6) for
  network-manager and the libnm-{glib,util,glib-vpn}-dev packages.
* debian/patches/git_fix_some_leaks_80ef61b.patch: cherry-picked patch to
  fix a few leaks: g_object_get() and gtk_tree_model_get() copy/ref the
  values they return, so make sure to deal with that everywhere.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/connection-editor/page-wireless.c
285
285
{
286
286
        CEPageWirelessPrivate *priv = CE_PAGE_WIRELESS_GET_PRIVATE (self);
287
287
        NMSettingWireless *setting = priv->setting;
288
 
        const GByteArray *ssid = NULL;
289
 
        const char *mode = NULL;
290
 
        const char *band = NULL;
 
288
        GByteArray *ssid = NULL;
 
289
        char *mode = NULL;
 
290
        char *band = NULL;
291
291
        int band_idx = 0;
292
292
        int rate_def;
293
293
        int tx_power_def;
330
330
        gtk_entry_set_text (priv->ssid, utf8_ssid);
331
331
        g_signal_connect_swapped (priv->ssid, "changed", G_CALLBACK (ce_page_changed), self);
332
332
        g_free (utf8_ssid);
 
333
        g_byte_array_unref (ssid);
333
334
 
334
335
        /* Default to Infrastructure */
335
336
        gtk_combo_box_set_active (priv->mode, 0);
337
338
                gtk_combo_box_set_active (priv->mode, 1);
338
339
        mode_combo_changed_cb (priv->mode, self);
339
340
        g_signal_connect (priv->mode, "changed", G_CALLBACK (mode_combo_changed_cb), self);
 
341
        g_free (mode);
340
342
 
341
343
        g_signal_connect (priv->channel, "output",
342
344
                          G_CALLBACK (channel_spin_output_cb),
354
356
                        band_idx = 2;
355
357
                        gtk_widget_set_sensitive (GTK_WIDGET (priv->channel), TRUE);
356
358
                }
 
359
                g_free (band);
357
360
        }
358
361
 
359
362
        gtk_combo_box_set_active (priv->band, band_idx);