Noticed by Bill Moss <bmoss@clemson.edu>
* src/NetworkManagerDbus.c
- (nm_dbus_get_user_key_for_network_cb): deactivate the device
instead of just cancelling its activation
* src/NetworkManagerDevice.c
- (nm_device_deactivate): some small cleanups
- (nm_device_set_user_key_for_network): deactivate the device
instead of just cancelling its activation
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@898 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* gnome/applet/applet-dbus-info.c
- (nmi_dbus_create_error_message): new function
- (nmi_dbus_get_key_for_network): correctly use dbus error creation
functions. Also don't check for both device _and_ network before
asking for a user's key, because we may not have gotten all our
networks back from NM quite yet (due to the dbus pending calls
coming in later). Fixes a hang in NM/nm-applet.
* src/NetworkManagerDbus.c
- (nm_dbus_get_user_key_for_network_cb): handle error conditions in a
slightly more sane manner, even though we are still broken for
certain other error conditions.
- (nm_dbus_get_user_key_for_network): need to pass the network's essid
to the info-daemon too
* src/NetworkManagerDevice.c
- Fix some debug messages to be info messages instead
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@875 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* gnome/applet/applet-dbus-info.c
- (nmi_dbus_get_key_for_network): Grab new "new_key" parameter
from the dbus message, which tells us to unconditionally
ask the user for a new key. Otherwise, we pull the key from
the keyring and return it. If we fail to get the key from the
keyring, we ask the user for a new key.
- (nmi_dbus_get_network_key): new function to grab the key for
an essid from the keyring.
- (nmi_dbus_get_network_properties): don't access the keyring here.
Also, don't return any key in the dbus message.
* src/NetworkManagerDbus.[ch]
- (nm_dbus_get_user_key_for_network): Add "new_key" parameter to
indicate that we unconditionally want a new key. This function
is now also used to get keys from the info-daemon which are
pre-stored, not just for asking the user for a new key. The
"new_key" parameter indicates whether or not we wish to ask the
user for a new key.
- (nm_dbus_get_network_data_cb): we no longer get a key from the
info-daemon in the return message, so use NULL instead. The
key will be filled in at connect time by calling
nm_dbus_get_user_key_for_network()
* src/NetworkManagerDevice.c
- (nm_device_wireless_configure): update for "new_key" param to
nm_dbus_get_user_key_for_network(). We initially set new_key
to FALSE to see if we have a stored key in the info-daemon, but
if the connection is unsuccessful at this stage we request a
new one
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@862 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* src/NetworkManagerPolicy.c
- (nm_policy_device_change_check): clarify switching rules if
both new and old devices are valid; mainly, don't switch
away from user-requested wireless connection back to a wired
one
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@859 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Patch from Bill Moss <bmoss@clemson.edu>
* gnome/applet/applet-dbus-info.[ch]
- (nmi_save_network_info): save timestamp for network if it
was a change requested by the user
- (nmi_dbus_update_network_info): get user_requested from dbus
message and pass to nmi_save_network_info()
* gnome/applet/applet.c
- (nmwa_update_network_timestamp): remove
- (nmwa_menu_item_activate): don't set timestamp on networks
here, only after a successful connect in nmi_save_network_info()
* src/NetworkManagerDbus.[ch]
- (nm_dbus_update_network_info): pass user_requested into the
dbus message
* src/NetworkManagerPolicy.c
- (nm_policy_activation_finish): pass user_requested to
nm_dbus_update_network_info()
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@857 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* src/nm-dhcp-manager.c
- (nm_dhcp_manager_get_ip4_config): if for some reason we don't get
an gateway returned from DHCP, try to use the address of the DHCP
server as the gateway instead. Found by Ralf Ertzinger.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@834 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Patch from Bill Moss <bmoss@clemson.edu>
* Consolidate writes of access point information updates to the info daemon
so that we only do it when the connection to the access point was
successful. Also consolidates updates to GConf in the Gnome applet.
* src/nm-netlink-monitor.c
- Silence compile warning when calling g_object_new()
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@830 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Patch from Colin Slater:
* src/backends/NetworkManagerGentoo.c
- (nm_system_update_dns): Fix exit status check for restarting
nscd
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@827 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* gnome/applet/applet-dbus-info.c
gnome/applet/applet-dbus-info.h
- (nmi_dbus_update_network_auth_method->nmi_save_network_info): generalize
to store key, key type, and auth method rather than just auth method
- (nmi_dbus_update_network_info): new function
- (nmi_dbus_info_message_handler): updateNetworkAuthMethod -> updateNetworkInfo
* gnome/applet/passphrase-dialog.c
- (nmi_passphrase_dialog_ok_clicked): call nmi_save_network_info() instead
of saving the info ourselves
* gnome/libnm_glib/libnm_glib.c
- Remove the stupid version check for dbus
* src/NetworkManagerAP.c
src/NetworkManagerAP.h
- (nm_ap_get_enc_key_source): return 'const char *' rather than 'char *'
* src/NetworkManagerDbus.c
src/NetworkManagerDbus.h
- (nm_dbus_update_network_auth_method -> nm_dbus_update_network_info): Update
more than just the auth method
* src/NetworkManagerDevice.c
- Update network info at the appropriate times
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@817 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* src/nm-dbus-nm.c
src/nm-dbus-net.c
- Random cleanups of spacing
* gnome/applet/applet.h
gnome/applet/other-network-dialog.c
gnome/applet/passphrase-dialog.c
- Conslidate usage of NMWAEncryptionKeyTypes enum
Patch from Bill Moss:
- Make Other Wireless Networks work again with encryption keys
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@814 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* src/nm-netlink-monitor.c (nm_netlink_monitor_new):
remove unneeded NULL arg from g_object_new(). Any
warnings caused by not having the extra NULL are just a
result of a bug in glib 2.7.0 - 2.7.2.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@809 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* src/NetworkManager.c
src/NetworkManagerMain.h
- (nm_get_hal_ctx): new function, move Hal initialization code here
- (nm_hal_init): new function, init libhal context then add devices
- (nm_hal_deinit): new function, clean up libhal context
- (nm_data_free): Move Hal cleanup here
- (main): check whether Hal is running, and if so, get a list of
network devices from it
* src/NetworkManagerDbus.c
- (nm_dbus_signal_filter): trap NameOwnerChanged signals for Hal,
and when it appears, get a list of network devices from it. If
Hal goes away, clean up the libhal context
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@738 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* src/NetworkManagerDevice.c
- (nm_device_wireless_process_scan_results): scan every 20s when
disconnected and scanning is ALWAYS_SCAN or WHEN_UNASSOCIATED
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@722 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
