Mercurial > pidgin

changeset 17716:c0dd45834fd9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of 'a1ba1e5be5adb02dcd76cbde3bc4d88287bff6a2' and 'c8d55903f073565484356511751eef0941282def'
author Richard Laager <rlaager@wiktel.com>
date Wed, 16 May 2007 20:03:47 +0000
parents 9d5121f2ab5d (diff) 34a7860e0084 (current diff)
children 7b339edd9d74
files libpurple/core.c
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Wed May 16 20:01:00 2007 +0000
+++ b/COPYRIGHT	Wed May 16 20:03:47 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	Wed May 16 20:01:00 2007 +0000
+++ b/libpurple/core.c	Wed May 16 20:03:47 2007 +0000
@@ -302,9 +302,7 @@
 	if (reply) {
 		dbus_error_init(&dbus_error);
 		dbus_message_get_args(reply, &dbus_error, DBUS_TYPE_STRING, &remote_user_dir, DBUS_TYPE_INVALID);
-		if (remote_user_dir) {
-			remote_user_dir = g_strdup(remote_user_dir);
-		}
+		remote_user_dir = g_strdup(remote_user_dir);
 		dbus_error_free(&dbus_error);
 		dbus_message_unref(reply);
 	}
@@ -322,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) {
@@ -334,7 +332,8 @@
 
 gboolean purple_core_ensure_single_instance()
 {
-gboolean is_single_instance = TRUE;
+	gboolean is_single_instance = TRUE;
+
 #ifdef HAVE_DBUS
 	/* in the future, other mechanisms might have already set this to FALSE */
 	if (is_single_instance) {
@@ -358,6 +357,7 @@
 		}
 	}
 #endif /* HAVE_DBUS */
+
 	return is_single_instance;
 }