pidgin: 5b5373f2: Remove an unused variable, and don't fre...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 5b5373f2e1e46ecad79585d246b4875e254e8baa
Ancestor: 3976bac9dc1aafa42217dda56118316cb2fed956
Author: nosnilmot at pidgin.im
Date: 2010-01-06T01:00:13
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5b5373f2e1e46ecad79585d246b4875e254e8baa

Modified files:
        libpurple/dbus-server.c

ChangeLog: 

Remove an unused variable, and don't free the dbus error until after we are
done with it.

-------------- next part --------------
============================================================
--- libpurple/dbus-server.c	824d0307f451640a5c84040e76632d3c8713a194
+++ libpurple/dbus-server.c	780fddd1c413f86d05d1a6661e68b30ce09f23c5
@@ -601,7 +601,6 @@ purple_dbus_dispatch_init(void)
 {
 	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 @@ purple_dbus_dispatch_init(void)
 		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;
 	}