2004-10-29 Dan Williams <dcbw@redhat.com>
* panel-applet/NMWirelessAppletOtherNetworksDialog.[ch] - New files, implement the "Other wireless network" dialog * panel-applet/NMWirelessApplet.c - Move "other wireless network" dialog to separate file * panel-applet/NMWirelessAppletDbus.[ch] - Take key and key_type paramaters for the set_device function * panel-applet/essid.glade - Add UI bits for encryption settings * src/NetworkManagerDbus.c - Retrieve key and key_type params for "setActiveDevice" method call and pass them on - unref AP returned from nm_device_get_best_ap() when needed * src/NetworkManagerDevice.c - (nm_device_get_best_ap): ref the ap before returning it - unref AP returned from nm_device_get_best_ap() when needed - (nm_device_activate_wireless): add "ap" parameter so we don't need to call nm_device_get_best_ap() here, it was pretty much redundant anyway - (AP_NEED_KEY): break second link check condition out into separate function, and fix segfault when ap->enc_key_source was NULL - (nm_device_find_and_use_essid): take key and key_type parameters and pass them along to nm_device_wireless_network_exists(). If the network does exist, set the passed-in key+key_type on the AP * src/NetworkManagerPolicy.c - unref AP returned from nm_device_get_best_ap() when needed git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@277 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -123,6 +123,8 @@ static NMDevice * nm_policy_auto_get_best_device (NMData *data)
|
||||
best_wireless_dev = dev;
|
||||
best_wireless_prio = prio;
|
||||
}
|
||||
if (best_ap)
|
||||
nm_ap_unref (best_ap);
|
||||
}
|
||||
|
||||
element = g_slist_next (element);
|
||||
@@ -353,9 +355,9 @@ gboolean nm_state_modification_monitor (gpointer user_data)
|
||||
if (nm_device_is_wireless (data->active_device))
|
||||
{
|
||||
ap = nm_device_get_best_ap (data->active_device);
|
||||
nm_ap_ref (ap);
|
||||
/* Add the AP to the invalid list and force a best ap update */
|
||||
nm_ap_list_append_ap (data->invalid_ap_list, ap);
|
||||
nm_ap_unref (ap);
|
||||
nm_device_update_best_ap (data->active_device);
|
||||
}
|
||||
if (ap && nm_ap_get_essid (ap))
|
||||
|
Reference in New Issue
Block a user