Mercurial > pidgin

changeset 17712:b5935a854ccb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added purple_core_quit to cleanup. Removed NULL check from around g_strdup.
author Gabriel Schulhof <nix@go-nix.ca>
date Wed, 16 May 2007 20:51:28 +0000
parents 34a7860e0084
children 150980c9d79d
files libpurple/core.c pidgin/gtkmain.c
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);
 	}
--- 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