Mercurial > pidgin
diff libpurple/server.c @ 20453:69febfa6d307
propagate from branch 'im.pidgin.pidgin' (head d3e5a5add3f39caa08b46c83177328e51c2d961a)
to branch 'im.pidgin.cpw.khc.msnp14' (head a8f6c999b039b4097aa70cd8d2597f3127615435)
| author | Carlos Silva <typ0@pidgin.im> |
|---|---|
| date | Sat, 16 Jun 2007 04:00:32 +0000 |
| parents | 2754427b85ca |
| children | 7684084830c6 |
line wrap: on
line diff
--- a/libpurple/server.c Sun Jun 03 01:06:44 2007 +0000 +++ b/libpurple/server.c Sat Jun 16 04:00:32 2007 +0000 @@ -92,7 +92,7 @@ /* because we're modifying or creating a lar, schedule the * function to expire them as the pref dictates */ - purple_timeout_add((SECS_BEFORE_RESENDING_AUTORESPONSE + 1) * 1000, expire_last_auto_responses, NULL); + purple_timeout_add_seconds((SECS_BEFORE_RESENDING_AUTORESPONSE + 1), expire_last_auto_responses, NULL); tmp = last_auto_responses; @@ -233,8 +233,9 @@ char *tmp = g_strdup_printf(_("%s is now known as %s.\n"), who, alias); - purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, - time(NULL)); + purple_conversation_write(conv, NULL, tmp, + PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LINKIFY, + time(NULL)); g_free(tmp); }