# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1171860948 0
# Node ID fc981ec147a6af10639c16924dec0873e0177d77
# Parent  94a19bde141d27b2f06c93aa119f771ed1435827# Parent  80944a182710250e130a2f288358e37034f47658
merge of '2f881bb7bad3beb5ec8384245c1350050d4b73a1'
     and 'f8222d7e7629ab348f5b757d931ecfb874f9794d'

diff -r 94a19bde141d -r fc981ec147a6 libpurple/protocols/jabber/disco.c
--- a/libpurple/protocols/jabber/disco.c	Mon Feb 19 04:34:32 2007 +0000
+++ b/libpurple/protocols/jabber/disco.c	Mon Feb 19 04:55:48 2007 +0000
@@ -274,7 +274,7 @@
 		g_free(js->server_name);
 		js->server_name = g_strdup(name);
 		if (!strcmp(name, "Google Talk")) {
-		  printf("ADSFADFAFAFADF !!!!\n");
+		  gaim_debug_info("jabber", "Google Talk!");
 		  js->googletalk = TRUE;
 		}
 	}
diff -r 94a19bde141d -r fc981ec147a6 libpurple/util.c
--- a/libpurple/util.c	Mon Feb 19 04:34:32 2007 +0000
+++ b/libpurple/util.c	Mon Feb 19 04:55:48 2007 +0000
@@ -4124,9 +4124,15 @@
 	signal(SIGILL,  SIG_DFL);	/* 4:  illegal instruction (not reset when caught) */
 	signal(SIGTRAP, SIG_DFL);	/* 5:  trace trap (not reset when caught) */
 	signal(SIGABRT, SIG_DFL);	/* 6:  abort program */
+
+#ifdef SIGPOLL
+	signal(SIGPOLL,  SIG_DFL);	/* 7:  pollable event (POSIX) */	
+#endif /* SIGPOLL */
+
 #ifdef SIGEMT
-	signal(SIGEMT,  SIG_DFL);	/* 7:  EMT instruction */
-#endif
+	signal(SIGEMT,  SIG_DFL);	/* 7:  EMT instruction (Non-POSIX) */
+#endif /* SIGEMT */
+
 	signal(SIGFPE,  SIG_DFL);	/* 8:  floating point exception */
 	signal(SIGBUS,  SIG_DFL);	/* 10: bus error */
 	signal(SIGSEGV, SIG_DFL);	/* 11: segmentation violation */
@@ -4137,5 +4143,5 @@
 	signal(SIGCHLD, SIG_DFL);	/* 20: child status has changed */
 	signal(SIGXCPU, SIG_DFL);	/* 24: exceeded CPU time limit */
 	signal(SIGXFSZ, SIG_DFL);	/* 25: exceeded file size limit */	
-#endif
+#endif /* HAVE_SIGNAL_H */
 }