# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1179557753 0
# Node ID a217e9b9ebc2f839e317baa03074b40b91b4f4d2
# Parent  63a09098b0e8f0ae8276be62c326d789bb93bdf4# Parent  7b339edd9d74ea4a005bb5018c3a547c97bc660e
merge of 'bc75c50283ea211d6f97caefcb83db0e34e10bfe'
     and 'de314ef335216e20484a1ce9d840a1828f4cc9f9'

diff -r 63a09098b0e8 -r a217e9b9ebc2 COPYRIGHT
--- a/COPYRIGHT	Fri May 18 22:31:37 2007 +0000
+++ b/COPYRIGHT	Sat May 19 06:55:53 2007 +0000
@@ -303,7 +303,7 @@
 David Schmitt
 Mark Schneider
 Evan Schoenberg
-Gabriel Schulof
+Gabriel Schulhof
 Federico Schwindt
 Torrey Searle
 Peter Seebach
diff -r 63a09098b0e8 -r a217e9b9ebc2 libpurple/core.c
--- a/libpurple/core.c	Fri May 18 22:31:37 2007 +0000
+++ b/libpurple/core.c	Sat May 19 06:55:53 2007 +0000
@@ -320,7 +320,7 @@
 		return;
 
 	if ((msg = dbus_message_new_method_call(DBUS_SERVICE_PURPLE, DBUS_PATH_PURPLE, DBUS_INTERFACE_PURPLE, "PurpleBlistShow")) == NULL)
-		return ;
+		return;
 
 	dbus_error_init(&dbus_error);
 	if ((reply = dbus_connection_send_with_reply_and_block(dbus_connection, msg, 5000, &dbus_error)) != NULL) {
@@ -356,6 +356,7 @@
 		}
 	}
 #endif /* HAVE_DBUS */
+
 	return is_single_instance;
 }
 
diff -r 63a09098b0e8 -r a217e9b9ebc2 pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Fri May 18 22:31:37 2007 +0000
+++ b/pidgin/gtkmain.c	Sat May 19 06:55:53 2007 +0000
@@ -735,7 +735,7 @@
 #ifdef HAVE_SIGNAL_H
 		g_free(segfault_message);
 #endif
-		return 0 ;
+		return 0;
 	}