From: Nathan W. <fac...@us...> - 2003-04-14 22:37:08
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1:/tmp/cvs-serv12126/src Modified Files: gtkconv.c Log Message: fix compile on solaris by not doing things the hard way show date in timestamp for offline messages Index: gtkconv.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- gtkconv.c 13 Apr 2003 14:45:47 -0000 1.102 +++ gtkconv.c 14 Apr 2003 22:37:04 -0000 1.103 @@ -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); |