Mercurial > pidgin.yaz

changeset 29235:5819bf02659e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove an unused variable, and don't free the dbus error until after we are done with it.
author Stu Tomlinson <stu@nosnilmot.com>
date Wed, 06 Jan 2010 01:00:13 +0000
parents 4478ce23487a
children 91ac03a72875
files libpurple/dbus-server.c
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;
 	}