# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1196198150 0
# Node ID 80a57819485e8c15e850727524aa9087233e71e0
# Parent  2325df611c0468aeeda31e471a730dc155845d02# Parent  55146766c91d965fb481a951ee8ae0cdb1359eba
merge of '72fffff81de35e7d400bf8b8fb18ba7ed84a6b8c'
     and 'e7f1ca64fe26b46544c0f64f082c81a0a9e96f5f'

diff -r 55146766c91d -r 80a57819485e doc/account-signals.dox
diff -r 55146766c91d -r 80a57819485e finch/finch.c
--- a/finch/finch.c	Tue Nov 27 19:30:18 2007 +0000
+++ b/finch/finch.c	Tue Nov 27 21:15:50 2007 +0000
@@ -297,7 +297,6 @@
 	if (opt_version) {
 		/* Translators may want to transliterate the name.
 		 It is not to be translated. */
-		gnt_quit();
 		printf("%s %s\n", _("Finch"), DISPLAY_VERSION);
 		return 0;
 	}
@@ -418,8 +417,6 @@
 	g_set_application_name(_("Finch"));
 #endif
 
-	gnt_init();
-
 	if (gnt_start(&argc, &argv)) {
 		gnt_main();
 
diff -r 55146766c91d -r 80a57819485e libpurple/protocols/myspace/myspace.h
diff -r 55146766c91d -r 80a57819485e libpurple/protocols/silc10/pk.c
diff -r 55146766c91d -r 80a57819485e libpurple/signals.c