Mercurial > pidgin.yaz
comparison pidgin/gtkconv.c @ 32825:411e11db1002
Add support for %shortTime% in themed messages. This is probably not
localized correctly.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Fri, 18 Nov 2011 19:49:08 +0000 |
parents | e2c275816484 |
children | 3bcc868c6c8e |
comparison
equal
deleted
inserted
replaced
32824:910475e626be | 32825:411e11db1002 |
---|---|
6130 format = g_strndup(tmp, end - tmp); | 6130 format = g_strndup(tmp, end - tmp); |
6131 fin = end + 1; | 6131 fin = end + 1; |
6132 } | 6132 } |
6133 replace = purple_utf8_strftime(format ? format : "%X", NULL); | 6133 replace = purple_utf8_strftime(format ? format : "%X", NULL); |
6134 g_free(format); | 6134 g_free(format); |
6135 | |
6136 } else if (g_str_has_prefix(cur, "%shortTime%")) { | |
6137 replace = purple_utf8_strftime("%H:%M", NULL); | |
6135 | 6138 |
6136 } else if (g_str_has_prefix(cur, "%userIconPath%")) { | 6139 } else if (g_str_has_prefix(cur, "%userIconPath%")) { |
6137 if (flags & PURPLE_MESSAGE_SEND) { | 6140 if (flags & PURPLE_MESSAGE_SEND) { |
6138 if (purple_account_get_bool(purple_conversation_get_account(conv), "use-global-buddyicon", TRUE)) { | 6141 if (purple_account_get_bool(purple_conversation_get_account(conv), "use-global-buddyicon", TRUE)) { |
6139 replace = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon"); | 6142 replace = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon"); |