changeset 20548:301c89809b9a

merge of '0799159d49f773b16e3a2354b36ef4e5be854595' and 'f07a68d96d4f38abf44c83746c89d9f0e134c535'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Wed, 19 Sep 2007 08:55:52 +0000
parents 4a8407152e9a (current diff) d91df8046ec6 (diff)
children ec75e26e72b3
files
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }