Mercurial > pidgin
changeset 15663:b5c5fbe365d2
merge of '2f881bb7bad3beb5ec8384245c1350050d4b73a1'
and 'f8222d7e7629ab348f5b757d931ecfb874f9794d'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Mon, 19 Feb 2007 15:31:32 +0000 |
| parents | 94a19bde141d (current diff) 80944a182710 (diff) |
| children | 95c4dee525f0 |
| files | libpurple/util.c |
| diffstat | 2 files changed, 10 insertions(+), 3 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 15:31:32 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 15:31:32 2007 +0000 @@ -4124,8 +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 */ + signal(SIGEMT, SIG_DFL); /* 7: EMT instruction (Non-POSIX) */ +#endif /* SIGEMT */ + #endif signal(SIGFPE, SIG_DFL); /* 8: floating point exception */ signal(SIGBUS, SIG_DFL); /* 10: bus error */ @@ -4137,5 +4144,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 */ }