Changeset 85bb19b for message.c

Timestamp:

Jul 23, 2011, 8:09:57 PM (13 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

a7fac14 (diff), 11e78d5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 11e78d5550a8ce2849db8c922b6515bc8d8c2616 into a7fac140d17626bc37808cae6b389f3240135903

File:

• message.c (modified) (2 diffs)

message.c

@@ -46 +46 @@
   
   /* save the time */
-  m->time=time(NULL);
-  m->timestr=g_strdup(ctime(&(m->time)));
-  m->timestr[strlen(m->timestr)-1]='\0';
+  m->time = time(NULL);
+  m->timestr = owl_util_time_to_timestr(localtime(&m->time));
 
   m->fmtext = NULL;
@@ -796 +795 @@
   /* save the time, we need to nuke the string saved by message_init */
   if (m->timestr) g_free(m->timestr);
-  m->time=n->z_time.tv_sec;
-  m->timestr=g_strdup(ctime(&(m->time)));
-  m->timestr[strlen(m->timestr)-1]='\0';
+  m->time = n->z_time.tv_sec;
+  m->timestr = owl_util_time_to_timestr(localtime(&m->time));
 
   /* set other info */