diff --git a/ChangeLog b/ChangeLog index 1285c5dab3..a8e85e8e1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-12-21 Dan Williams + + * Make connection after key retrieval work again + 2005-12-21 Dan Williams * gnome/applet/nm-gconf-wso* diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c index da237b7202..03988c483e 100644 --- a/src/NetworkManagerDevice.c +++ b/src/NetworkManagerDevice.c @@ -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); diff --git a/src/NetworkManagerDevice.h b/src/NetworkManagerDevice.h index 3d55214c44..0675077f45 100644 --- a/src/NetworkManagerDevice.h +++ b/src/NetworkManagerDevice.h @@ -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); diff --git a/src/nm-dbus-nmi.c b/src/nm-dbus-nmi.c index 171da1f5fb..86ec371131 100644 --- a/src/nm-dbus-nmi.c +++ b/src/nm-dbus-nmi.c @@ -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);