NetworkManager r3228 - in branches/NETWORKMANAGER_0_6_0_RELEASE: . src

[dcbw svn gnome org]

Author: dcbw
Date: Thu Jan 10 17:33:47 2008
New Revision: 3228
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3228&view=rev

Log:
2008-01-10  Dan Williams  <dcbw redhat com>

	* src/NetworkManager.c
		- (nm_killswitch_getpower_reply_cb): ensure DBusErrors are initialized
			before using them



Modified:
   branches/NETWORKMANAGER_0_6_0_RELEASE/ChangeLog
   branches/NETWORKMANAGER_0_6_0_RELEASE/src/NetworkManager.c

Modified: branches/NETWORKMANAGER_0_6_0_RELEASE/src/NetworkManager.c
==============================================================================
--- branches/NETWORKMANAGER_0_6_0_RELEASE/src/NetworkManager.c	(original)
+++ branches/NETWORKMANAGER_0_6_0_RELEASE/src/NetworkManager.c	Thu Jan 10 17:33:47 2008
@@ -368,9 +368,11 @@
 	/* Handle both HAL <= 0.5.9 which uses UINT and HAL >= 0.5.10 which
 	 * uses INT.
 	 */
+	dbus_error_init (&err);
 	if (!dbus_message_get_args (reply, &err, DBUS_TYPE_UINT32, &uint_status, DBUS_TYPE_INVALID)) {
 		dbus_error_free (&err);
 
+		dbus_error_init (&err);
 		if (!dbus_message_get_args (reply, &err, DBUS_TYPE_INT32, &int_status, DBUS_TYPE_INVALID)) {
 			if (!ks_err_message || strcmp (ks_err_message, err.message)) {
 				nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message);