diff options
| author | Stu Tomlinson <nosnilmot@pidgin.im> | 2007-06-03 00:48:00 +0000 |
|---|---|---|
| committer | Stu Tomlinson <nosnilmot@pidgin.im> | 2007-06-03 00:48:00 +0000 |
| commit | 2eca4f1229b4ddca92fb66c0f0b9dd6fbd7777c6 (patch) | |
| tree | 76e610de8167b982797fd3fd28c461f610881af3 /libpurple/conversation.c | |
| parent | f051feffce983d1e8ee80cc016a96e228b64cf81 (diff) | |
| parent | a67e38f4f8bb77b0ed2de8480b46b564298b70ee (diff) | |
| download | pidgin-2eca4f1229b4ddca92fb66c0f0b9dd6fbd7777c6.tar.gz | |
propagate from branch 'im.pidgin.pidgin' (head 5f2b75cc8b920b993390c220a83af73271fe61a7)
to branch 'im.pidgin.pidgin.2.1.0' (head 482747facd0858a6711b522d38d5c2914f1bb08f)
Diffstat (limited to 'libpurple/conversation.c')
| -rw-r--r-- | libpurple/conversation.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/libpurple/conversation.c b/libpurple/conversation.c index 68fc8c64d2..eedf607ce2 100644 --- a/libpurple/conversation.c +++ b/libpurple/conversation.c @@ -108,8 +108,12 @@ common_send(PurpleConversation *conv, const char *message, PurpleMessageFlags ms type = purple_conversation_get_type(conv); - /* Always linkfy the text for display */ - displayed = purple_markup_linkify(message); + /* Always linkfy the text for display, unless we're + * explicitly asked to do otheriwse*/ + if(msgflags & PURPLE_MESSAGE_NO_LINKIFY) + displayed = g_strdup(message); + else + displayed = purple_markup_linkify(message); if ((conv->features & PURPLE_CONNECTION_HTML) && !(msgflags & PURPLE_MESSAGE_RAW)) @@ -1010,7 +1014,7 @@ purple_conv_im_start_typing_timeout(PurpleConvIm *im, int timeout) conv = purple_conv_im_get_conversation(im); name = purple_conversation_get_name(conv); - im->typing_timeout = purple_timeout_add(timeout * 1000, reset_typing_cb, conv); + im->typing_timeout = purple_timeout_add_seconds(timeout, reset_typing_cb, conv); } void @@ -1576,7 +1580,9 @@ purple_conv_chat_add_users(PurpleConvChat *chat, GList *users, GList *extra_msgs } g_free(escaped); - 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); } @@ -1700,7 +1706,9 @@ purple_conv_chat_rename_user(PurpleConvChat *chat, const char *old_user, g_free(escaped2); } - 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)); } } @@ -1777,7 +1785,9 @@ purple_conv_chat_remove_users(PurpleConvChat *chat, GList *users, const char *re } g_free(escaped); - 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); } |