SHA1 Hash:	798a48ee468a15085a89f636977ea49379dde8b7
Date:	2007-09-24 23:58:55
User:	jnc
Comment:	Merged mjanssen's timeline updates
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/timeline.c from [19a54bcbde] to [34894e4584].

@@ -443,11 +443,11 @@
 const char *timeline_query_for_tty(void){
   static const char zBaseSql[] =
     @ SELECT
     @   blob.rid,
     @   uuid,
-    @   datetime(event.mtime,'utc'),
+    @   datetime(event.mtime,'localtime'),
     @   coalesce(ecomment,comment) || ' (by ' || coalesce(euser,user) || ')',
     @   (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim),
     @   (SELECT count(*) FROM plink WHERE cid=blob.rid)
     @ FROM event, blob
     @ WHERE blob.rid=event.objid

Modified tools/fossil_chat.tcl from [25cf4e8b76] to [713a7ff910].

@@ -219,14 +219,16 @@
   } elseif {$cmd=="message"||$cmd=="private_message"} {
     set time [clock format [clock seconds] -format {%H:%M} -gmt 1]
     set from [lindex $line 1]
     .msg.t insert end "\[$time $from\] " meta [lindex $line 2]\n norm
     .msg.t see end
+    set current_focus [focus]
     bell
     wm deiconify .
     update
     raise .
+    focus $current_focus
   } elseif {$cmd=="noop"} {
     # do nothing
   } elseif {$cmd=="meta"} {
     set now [clock seconds]
     set time [clock format $now -format {%H:%M} -gmt 1]