Mercurial > pidgin
changeset 32750:cc258d58ee56
merge of 'a6a5be7291d88240cd7a6b7034ac9942d5bfba4b'
and 'f1f5a7e9b4ed4a9ffe523909a8a68b49928f2731'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 31 Mar 2012 21:29:04 +0000 |
| parents | 5b79a5b72689 (diff) ccb0beca179c (current diff) |
| children | f01d6c9f3492 |
| files | |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Mon Mar 26 18:20:20 2012 +0000 +++ b/COPYRIGHT Sat Mar 31 21:29:04 2012 +0000 @@ -24,6 +24,7 @@ Manuel Amador Matt Amato Josef Andrysek +Flavius Anton Geoffrey Antos Daniel Atallah Paul Aurich
--- a/ChangeLog Mon Mar 26 18:20:20 2012 +0000 +++ b/ChangeLog Sat Mar 31 21:29:04 2012 +0000 @@ -42,7 +42,9 @@ Plugins: * The Voice/Video Settings plugin supports using the sndio GStreamer - backends. (Brad Smith) (#14414) + backends. (Brad Smith) (#14414) + * The Offline Message Emulation plugin now adds a note that the message + was an offline message. (Flavius Anton) (#2497) version 2.10.2 (02/22/2012): General:
--- a/libpurple/plugins/offlinemsg.c Mon Mar 26 18:20:20 2012 +0000 +++ b/libpurple/plugins/offlinemsg.c Sat Mar 31 21:29:04 2012 +0000 @@ -80,6 +80,7 @@ PurplePounceEvent event; PurplePounceOption option; PurpleConversation *conv; + char *temp; event = PURPLE_POUNCE_SIGNON; option = PURPLE_POUNCE_OPTION_NONE; @@ -88,7 +89,12 @@ event, option); purple_pounce_action_set_enabled(pounce, "send-message", TRUE); - purple_pounce_action_set_attribute(pounce, "send-message", "message", offline->message); + + temp = g_strdup_printf("(%s) %s", _("Offline message"), + offline->message); + purple_pounce_action_set_attribute(pounce, "send-message", "message", + temp); + g_free(temp); conv = offline->conv; if (!purple_conversation_get_data(conv, "plugin_pack:offlinemsg"))