# HG changeset patch
# User Sadrul Habib Chowdhury <sadrul@pidgin.im>
# Date 1190192152 0
# Node ID d3c359b1ed2acc1025e4fa46dbe2561d026f91c0
# Parent  0e5b2115c99d178c266fa71750a17af83d9ba006# Parent  7581a26309340df1e8af19b4be318356a4021603
merge of '0e5b2115c99d178c266fa71750a17af83d9ba006'
     and '7581a26309340df1e8af19b4be318356a4021603'

diff -r 0e5b2115c99d -r d3c359b1ed2a finch/finch.c
--- a/finch/finch.c	Wed Sep 19 07:56:56 2007 +0000
+++ b/finch/finch.c	Wed Sep 19 08:55:52 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;
 }