NetworkManager r4121 - in trunk/vpn-daemons/openvpn: . src

[dcbw svn gnome org]

Author: dcbw
Date: Mon Sep 29 21:11:05 2008
New Revision: 4121
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4121&view=rev

Log:
2008-09-29  Dan Williams  <dcbw redhat com>

	Patch from Robert Buchholz <rbu gentoo org>

	* src/nm-openvpn-service.c
		- (openvpn_watch_cb): don't access socket_channel if it doesn't exist
			because openvpn exited before the management socket could be set up



Modified:
   trunk/vpn-daemons/openvpn/ChangeLog
   trunk/vpn-daemons/openvpn/src/nm-openvpn-service.c

Modified: trunk/vpn-daemons/openvpn/src/nm-openvpn-service.c
==============================================================================
--- trunk/vpn-daemons/openvpn/src/nm-openvpn-service.c	(original)
+++ trunk/vpn-daemons/openvpn/src/nm-openvpn-service.c	Mon Sep 29 21:11:05 2008
@@ -452,7 +452,7 @@
 	}
 
 	/* Try to get the last bits of data from openvpn */
-	if (priv->io_data) {
+	if (priv->io_data && priv->io_data->socket_channel) {
 		GIOChannel *channel = priv->io_data->socket_channel;
 		GIOCondition condition;