Mercurial > pidgin.yaz
changeset 5133:9f40039a027f
[gaim-migrate @ 5496]
fix compile on solaris by not doing things the hard way
show date in timestamp for offline messages
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Mon, 14 Apr 2003 22:37:04 +0000 |
| parents | 494b6b6a6ffa |
| children | 2acc2ee66597 |
| files | src/gtkconv.c |
| diffstat | 1 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Mon Apr 14 19:42:29 2003 +0000 +++ b/src/gtkconv.c Mon Apr 14 22:37:04 2003 +0000 @@ -1180,12 +1180,8 @@ } else if (event->keyval == 'z') { g_signal_stop_emission_by_name(G_OBJECT(entry), "key_press_event"); - -#ifndef _WIN32 - XIconifyWindow(GDK_DISPLAY(), - GDK_WINDOW_XWINDOW(gtkwin->window->window), - ((_XPrivDisplay)GDK_DISPLAY())->default_screen); -#endif + + gtk_window_iconify(GTK_WINDOW(gtkwin->window)); } else if (event->keyval == '[') { gaim_window_switch_conversation(win, @@ -3923,7 +3919,10 @@ gtkconv = GAIM_GTK_CONVERSATION(conv); gc = gaim_conversation_get_gc(conv); - strftime(mdate, sizeof(mdate), "%H:%M:%S", localtime(&mtime)); + if(time(NULL) > mtime + 20*60) /* show date if older than 20 minutes */ + strftime(mdate, sizeof(mdate), "%Y-%m-%d %H:%M:%S", localtime(&mtime)); + else + strftime(mdate, sizeof(mdate), "%H:%M:%S", localtime(&mtime)); if(gc) sml_attrib = g_strdup_printf("sml=\"%s\"", gc->prpl->name);