changeset 15662:fc981ec147a6

merge of '2f881bb7bad3beb5ec8384245c1350050d4b73a1' and 'f8222d7e7629ab348f5b757d931ecfb874f9794d'
author Evan Schoenberg <evan.s@dreskin.net>
date Mon, 19 Feb 2007 04:55:48 +0000
parents 94a19bde141d (current diff) 80944a182710 (diff)
children 868c9d2cb818 f344b5cc2fc9
files libpurple/util.c
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;
 		}
 	}
--- 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 */
 }