← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/connection-editor/page-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:
src/connection-editor/page-wired.c
74
74
        CEPageWiredPrivate *priv = CE_PAGE_WIRED_GET_PRIVATE (self);
75
75
        GtkBuilder *builder;
76
76
        GtkWidget *align;
 
77
        GtkLabel *label;
77
78
 
78
79
        builder = CE_PAGE (self)->builder;
79
80
 
91
92
        gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->device_mac));
92
93
        gtk_widget_show_all (GTK_WIDGET (priv->device_mac));
93
94
 
 
95
        /* Set mnemonic widget for device MAC label */
 
96
        label = GTK_LABEL (GTK_WIDGET (gtk_builder_get_object (builder, "wired_device_mac_label")));
 
97
        gtk_label_set_mnemonic_widget (label, GTK_WIDGET (priv->device_mac));
 
98
 
94
99
        priv->cloned_mac = GTK_ENTRY (GTK_WIDGET (gtk_builder_get_object (builder, "wired_cloned_mac")));
95
100
        priv->port = GTK_COMBO_BOX (GTK_WIDGET (gtk_builder_get_object (builder, "wired_port")));
96
101
        priv->speed = GTK_COMBO_BOX (GTK_WIDGET (gtk_builder_get_object (builder, "wired_speed")));
266
271
                                           "WiredPage",
267
272
                                           _("Wired")));
268
273
        if (!self) {
269
 
                g_set_error_literal (error, 0, 0, _("Could not load wired user interface."));
 
274
                g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Could not load wired user interface."));
270
275
                return NULL;
271
276
        }
272
277
 
273
278
        wired_private_init (self);
274
279
        priv = CE_PAGE_WIRED_GET_PRIVATE (self);
275
280
 
276
 
        priv->setting = (NMSettingWired *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRED);
 
281
        priv->setting = nm_connection_get_setting_wired (connection);
277
282
        if (!priv->setting) {
278
283
                priv->setting = NM_SETTING_WIRED (nm_setting_wired_new ());
279
284
                nm_connection_add_setting (connection, NM_SETTING (priv->setting));