# HG changeset patch
# User Gabriel Schulhof <nix@go-nix.ca>
# Date 1179348688 0
# Node ID b5935a854ccb1f0728bdb66322630ec0e46ec778
# Parent  34a7860e0084c4fa844de2ef0432be5d9ce4f1d4
Added purple_core_quit to cleanup.
Removed NULL check from around g_strdup.

diff -r 34a7860e0084 -r b5935a854ccb libpurple/core.c
--- a/libpurple/core.c	Wed May 16 20:01:00 2007 +0000
+++ b/libpurple/core.c	Wed May 16 20:51:28 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);
 	}
diff -r 34a7860e0084 -r b5935a854ccb pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Wed May 16 20:01:00 2007 +0000
+++ b/pidgin/gtkmain.c	Wed May 16 20:51:28 2007 +0000
@@ -731,6 +731,7 @@
 	}
 
 	if (!purple_core_ensure_single_instance()) {
+		purple_core_quit();
 #ifdef HAVE_SIGNAL_H
 		g_free(segfault_message);
 #endif