← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/wired-dialog.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack, Alexander Sack, Tony Espy
  • Date: 2009-09-14 11:32:57 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20090914113257-47x5o2kfwwm95w3l
Tags: 0.8~a~git.20090913t161448.cc2f6be-0ubuntu1
* upstream snapshot 2009-09-13 16:14:48 (GMT)
  + cc2f6bea12daec5f0caf535a3534f07ade5b5cf2

[ Alexander Sack <asac@ubuntu.com> ]
* build depend on libpolkit-gobject-1-dev instead of libpolkit-dbus-dev
  - update debian/control

[ Tony Espy <espy@ubuntu.com> ]
* adjust patches for upstream code base
  - update debian/patches/20_use_full_vpn_dialog_service_name_path.patch
  - update debian/patches/lp328572_dxteam_connect_text.patch
  - update debian/patches/lp337960_dxteam_notification_icon_names.diff
  - update debian/patches/lp341684_device_sensitive_disconnect_notify.patch
* adjust build and runtime depends due to ABI changes in latest NM
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/wired-dialog.c
116
116
GtkWidget *
117
117
nma_wired_dialog_new (const char *glade_file,
118
118
                                          NMClient *nm_client,
119
 
                                          NMConnection *connection,
 
119
                                          NMSettingsConnectionInterface *connection,
120
120
                                          NMDevice *device)
121
121
{
122
122
        GladeXML *xml;
136
136
                return NULL;
137
137
        }
138
138
 
139
 
        success = dialog_init (dialog, xml, nm_client, glade_file, connection);
 
139
        success = dialog_init (dialog, xml, nm_client, glade_file, NM_CONNECTION (connection));
140
140
        if (!success) {
141
141
                nm_warning ("Couldn't create wired security dialog.");
142
142
                gtk_widget_destroy (dialog);
150
150
        return dialog;
151
151
}
152
152
                                          
153
 
NMConnection *
 
153
NMSettingsConnectionInterface *
154
154
nma_wired_dialog_get_connection (GtkWidget *dialog)
155
155
{
156
 
        NMConnection *connection;
 
156
        NMSettingsConnectionInterface *connection;
157
157
        WirelessSecurity *security;
158
158
        NMConnection *tmp_connection;
159
159
        NMSetting *s_8021x;
169
169
        ws_802_1x_fill_connection (security, "wpa_eap_auth_combo", tmp_connection);
170
170
 
171
171
        s_8021x = nm_connection_get_setting (tmp_connection, NM_TYPE_SETTING_802_1X);
172
 
        nm_connection_add_setting (connection, NM_SETTING (g_object_ref (s_8021x)));
 
172
        nm_connection_add_setting (NM_CONNECTION (connection), NM_SETTING (g_object_ref (s_8021x)));
173
173
 
174
174
        g_object_unref (tmp_connection);
175
175