Mercurial > pidgin.yaz

changeset 17163:a217e9b9ebc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of 'bc75c50283ea211d6f97caefcb83db0e34e10bfe' and 'de314ef335216e20484a1ce9d840a1828f4cc9f9'
author Richard Laager <rlaager@wiktel.com>
date Sat, 19 May 2007 06:55:53 +0000
parents 63a09098b0e8 (current diff) 7b339edd9d74 (diff)
children 7484b56a82f0
files COPYRIGHT libpurple/core.c pidgin/gtkmain.c
diffstat 3 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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;
 }
 
--- 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;
 	}