fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 21:30:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2005-12-21 Dan Williams <dcbw@redhat.com>

Browse source 
* Make connection after key retrieval work again


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1221 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2005-12-21 22:16:22 +00:00
parent 25e0af63e8
commit 7ef4a5e36a
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2005-12-21 Dan Williams <dcbw@redhat.com>
* Make connection after key retrieval work again
2005-12-21 Dan Williams <dcbw@redhat.com>
* gnome/applet/nm-gconf-wso*

1
src/NetworkManagerDevice.c
View file

@ -63,7 +63,6 @@ static gboolean get_scan_results (NMDevice *dev, NMSock *sk, guint8 **out_res_bu
static gboolean process_scan_results (NMDevice *dev, const guint8 *res_buf, guint32 res_buf_len);
static void nm_device_activate_schedule_stage1_device_prepare (NMActRequest *req);
static void nm_device_activate_schedule_stage2_device_config (NMActRequest *req);
static void nm_device_activate_schedule_stage3_ip_config_start (NMActRequest *req);
static void nm_device_activate_schedule_stage5_ip_config_commit (NMActRequest *req);

1
src/NetworkManagerDevice.h
View file

@ -104,6 +104,7 @@ void nm_device_set_wep_enc_key (NMDevice *dev, const char *key, int auth_met
NMActRequest * nm_device_get_act_request (NMDevice *dev);
gboolean nm_device_activation_start (NMActRequest *req);
void nm_device_activate_schedule_stage1_device_prepare (NMActRequest *req);
void nm_device_activate_schedule_stage4_ip_config_get (NMActRequest *req);
void nm_device_activate_schedule_stage4_ip_config_timeout (NMActRequest *req);
void nm_device_activation_cancel (NMDevice *dev);

2
src/nm-dbus-nmi.c
View file

@ -96,7 +96,7 @@ static void nm_dbus_get_user_key_for_network_cb (DBusPendingCall *pcall, NMActRe
if ((security = nm_ap_security_new_deserialize (&iter)))
{
nm_ap_set_security (ap, security);
nm_device_activation_start (req);
nm_device_activate_schedule_stage1_device_prepare (req);
}
nm_act_request_set_user_key_pending_call (req, NULL);