Mercurial > pidgin.yaz

diff libpurple/dbus-server.c @ 29780:72b059116c82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of 'b88c4f72aa3d87a41d0ae232164801f4e1aeca1a' and 'bbcf4976b4db49082dcd52239fe155eb95c4ee1a'
author andrew.victor@mxit.com
date Mon, 18 Jan 2010 20:41:11 +0000
parents 5819bf02659e
children 9f6b8e5998ec
line wrap: on
line diff
--- a/libpurple/dbus-server.c	Mon Jan 18 20:40:41 2010 +0000
+++ b/libpurple/dbus-server.c	Mon Jan 18 20:41:11 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;
 	}