# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1190192152 0
# Node ID 301c89809b9acb51021ebcca6220341c5df475cb
# Parent  4a8407152e9a9fc841add0cb4f67785c6f15000f# Parent  d91df8046ec65e46031fc3bfcfce1ce16c97e9b3
merge of '0799159d49f773b16e3a2354b36ef4e5be854595'
     and 'f07a68d96d4f38abf44c83746c89d9f0e134c535'

diff -r 4a8407152e9a -r 301c89809b9a 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;
 }