# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1190993700 0
# Node ID de68625c4c042b78504eb524bd738a717db3cacd
# Parent  a842ee320d51911f1759dcd14a184af51be6c5d0
applied changes from 1cb036aecbbe359226e69874379d39ce74c8daf6
             through f07a68d96d4f38abf44c83746c89d9f0e134c535

diff -r a842ee320d51 -r de68625c4c04 finch/finch.c
--- a/finch/finch.c	Fri Sep 28 15:24:35 2007 +0000
+++ b/finch/finch.c	Fri Sep 28 15:35:00 2007 +0000
@@ -297,6 +297,7 @@
 	if (opt_version) {
 		/* Translators may want to transliterate the name.
 		 It is not to be translated. */
+		gnt_quit();
 		printf("%s %s\n", _("Finch"), VERSION);
 		return 0;
 	}
@@ -419,13 +420,13 @@
 
 	gnt_init();
 
-	gnt_start(&argc, &argv);
-
-	gnt_main();
+	if (gnt_start(&argc, &argv)) {
+		gnt_main();
 
 #ifdef STANDALONE
-	purple_core_quit();
+		purple_core_quit();
 #endif
+	}
 
 	return 0;
 }