Changeset 21c87a7 for irc_im.c

Timestamp:

2010-04-14T09:27:50Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d33679e

Parents:

81186cab (diff), 156bbd7 (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:

Merging loads of stuff from mainline.

File:

• irc_im.c (modified) (2 diffs)

irc_im.c

@@ -99 +99 @@
         irc_user_t *iu = (irc_user_t *) bu->ui_data;
         char *dst, *prefix = NULL;
-        char *wrapped;
+        char *wrapped, *ts = NULL;
+        
+        if( sent_at > 0 && set_getbool( &irc->b->set, "display_timestamps" ) )
+                ts = irc_format_timestamp( irc, sent_at );
         
         if( iu->flags & IRC_USER_PRIVATE )
         {
                 dst = irc->user->nick;
+                prefix = ts;
+                ts = NULL;
         }
         else
         {
                 dst = ic->name;
-                prefix = g_strdup_printf( "%s%s", irc->user->nick, set_getstr( &bee->set, "to_char" ) );
+                prefix = g_strdup_printf( "%s%s%s", irc->user->nick, set_getstr( &bee->set, "to_char" ), ts );
         }
         
@@ -116 +121 @@
         g_free( wrapped );
         g_free( prefix );
+        g_free( ts );
         
         return TRUE;