merge of '0e5b2115c99d178c266fa71750a17af83d9ba006'

Wed, 19 Sep 2007 08:55:52 +0000

author
Sadrul Habib Chowdhury <sadrul@pidgin.im>
date
Wed, 19 Sep 2007 08:55:52 +0000
changeset 20618
d3c359b1ed2a
parent 20614
0e5b2115c99d (current diff)
parent 20617
7581a2630934 (diff)
child 20619
546edf29125d

merge of '0e5b2115c99d178c266fa71750a17af83d9ba006'
and '7581a26309340df1e8af19b4be318356a4021603'

--- 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;
 }

mercurial