# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1262739613 0
# Node ID 5819bf02659e14a298b90c79c96f8f01340d14c1
# Parent  4478ce23487a884d27fe0c94e257b935fad0ad03
Remove an unused variable, and don't free the dbus error until after we are
done with it.

diff -r 4478ce23487a -r 5819bf02659e libpurple/dbus-server.c
--- a/libpurple/dbus-server.c	Wed Jan 06 00:55:08 2010 +0000
+++ b/libpurple/dbus-server.c	Wed Jan 06 01:00:13 2010 +0000
@@ -601,7 +601,6 @@
 {
 	static DBusObjectPathVTable vtable = {NULL, &purple_dbus_dispatch, NULL, NULL, NULL, NULL};
 	DBusError error;
-	int result;
 
 	dbus_error_init(&error);
 	purple_dbus_connection = dbus_bus_get(DBUS_BUS_STARTER, &error);
@@ -625,16 +624,15 @@
 		return;
 	}
 
-	dbus_request_name_reply =
-	result = dbus_bus_request_name(purple_dbus_connection,
+	dbus_request_name_reply = dbus_bus_request_name(purple_dbus_connection,
 			DBUS_SERVICE_PURPLE, 0, &error);
 
 	if (dbus_error_is_set(&error))
 	{
 		dbus_connection_unref(purple_dbus_connection);
-		dbus_error_free(&error);
 		purple_dbus_connection = NULL;
 		init_error = g_strdup_printf(N_("Failed to get serv name: %s"), error.name);
+		dbus_error_free(&error);
 		return;
 	}