Mercurial > pidgin.yaz
changeset 12851:c1317074fce3
[gaim-migrate @ 15201]
Warning fix, plus it's proper to #include <time.h> if I'm going to use mktime.
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Thu, 12 Jan 2006 07:07:01 +0000 |
| parents | 49b2347863b2 |
| children | 9e9c8601e5f2 |
| files | plugins/timestamp_format.c |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/timestamp_format.c Thu Jan 12 06:59:39 2006 +0000 +++ b/plugins/timestamp_format.c Thu Jan 12 07:07:01 2006 +0000 @@ -8,6 +8,8 @@ #include "gtkconv.h" #include "gtkplugin.h" +#include <time.h> + static GaimPluginPrefFrame * get_plugin_pref_frame(GaimPlugin *plugin) { @@ -62,7 +64,7 @@ if (!strcmp(dates, "always") || (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT && !strcmp(dates, "chats")) || - (time(NULL) > (mktime(tm) + 20*60))) + (time(NULL) > (mktime((struct tm *)tm) + 20*60))) { if (force) strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", tm);