* Fix up VPN state handling between the applet and NetworkManager,
so that the applet doesn't show a VPN as connected when one
really is not
- The applet no longer has a pointer to the active VPN's
name, but tracks each VPNs state individually
- NM no longer has a "getActiveVPNConnection" method
- NM no longer broadcasts the "VPNConnectionChange" signal
- NM now broadcasts a "VPNConnectionStateChange" signal
whenever the state of a VPN changes
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@902 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* gnome/applet/applet-dbus-devices.c
gnome/applet/applet-dbus-vpn.c
- Remove calls to dbus_pending_call_ref() because we already
"own" the pending call
- Remove calls to dbus_pending_call_get_completed() because
when we are in the callback, the pending call is completed
by definition
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@901 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
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/other-network-dialog.c:
The "Create New Network" and "Connect to Other Network"
dialogs share alot of code, but shouldn't share a window
title. Give them different ones.
* gnome/applet/wireless-applet.glade:
* vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:
Some more minor UI tweaks.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@892 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* gnome/applet/other-network-dialog.c:
* gnome/applet/wireless-applet.glade:
Also need mnemonic widgets, and underline enabled.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@890 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* vpn-daemons/vpnc/nm-vpnc-service.c
- (vpnc_watch_cb): remove no-longer-relevant comment
- (write_config_option): new function, helper to write
config options to vpnc's stdin
- (nm_vpnc_config_write): use the new helper, make the
code shorter
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@886 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* gnome/applet/passphrase-dialog.c:
* gnome/applet/wireless-applet.glade:
Make the passphrase dialog response based, and treat
responses other than OK (such as Esc, [X]) as a cancel.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@884 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* initscript/Gentoo/NetworkManager:
* initscript/RedHat/NetworkManager:
* initscript/RedHat/NetworkManagerDispatcher:
* initscript/SUSE/networkmanager:
CVS remove these in place of .in replacements
* configure.in:
* initscript/Gentoo/NetworkManager.in:
* initscript/RedHat/NetworkManager.in:
* initscript/RedHat/NetworkManagerDispatcher.in:
* initscript/SUSE/networkmanager.in:
These scripts now are generated so they work still when
NM is built using a bindir other than /usr/bin
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@881 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* initscript/Gentoo/NetworkManager:
* initscript/RedHat/NetworkManager:
* initscript/RedHat/NetworkManagerDispatcher:
* initscript/SUSE/networkmanager:
CVS remove these in place of .in replacements
* configure.in:
* initscript/Gentoo/NetworkManager.in:
* initscript/RedHat/NetworkManager.in:
* initscript/RedHat/NetworkManagerDispatcher.in:
* initscript/SUSE/networkmanager.in:
These scripts now are generated so they work still when
NM is built using a bindir other than /usr/bin
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@880 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
* gnome/applet/Makefile.am
- Relocate the applet to /usr/bin since it is no longer
executed by anything, but directly by the user
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@858 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
