Changeset 6e9ae72 for irc_im.c

Timestamp:

2011-12-17T13:50:01Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (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:

Mainline merge.

File:

• irc_im.c (modified) (3 diffs)

irc_im.c

@@ -197 +197 @@
         irc_t *irc = bee->ui_data;
         irc_user_t *iu = (irc_user_t *) bu->ui_data;
-        char *dst, *prefix = NULL;
+        const char *dst;
+        char *prefix = NULL;
         char *wrapped, *ts = NULL;
-        irc_channel_t *ic = NULL;
         char *msg = g_strdup( msg_ );
         GSList *l;
@@ -206 +206 @@
                 ts = irc_format_timestamp( irc, sent_at );
         
-        /* Too similar to irc_usermsg()... */
-        if( iu->last_channel )
-        {
-                if( iu->last_channel->flags & IRC_CHANNEL_JOINED )
-                        ic = iu->last_channel;
-                else
-                        ic = irc_channel_with_user( irc, iu );
-        }
-        
-        if( ic )
-        {
-                dst = ic->name;
+        dst = irc_user_msgdest( iu );
+        if( dst != irc->user->nick )
+        {
+                /* if not messaging directly, call user by name */
                 prefix = g_strdup_printf( "%s%s%s", irc->user->nick, set_getstr( &bee->set, "to_char" ), ts ? : "" );
         }
         else
         {
-                dst = irc->user->nick;
                 prefix = ts;
-                ts = NULL;
+                ts = NULL;      /* don't double-free */
         }
         
@@ -995 +986 @@
         else if( !acc->prpl->chat_join )
         {
-                irc_usermsg( ic->irc, "Named chatrooms not supported on that account." );
+                irc_rootmsg( ic->irc, "Named chatrooms not supported on that account." );
                 return SET_INVALID;
         }