Changes in irc_im.c [911d97a:e67e513]

File:

• irc_im.c (modified) (5 diffs)

irc_im.c

@@ -193 +193 @@
 }
 
+static void bee_irc_msg_from_user( irc_user_t *iu, const char *msg, time_t sent_at )
+{
+        irc_t *irc = iu->irc;
+        bee_t *bee = irc->b;
+        const char *dst;
+        char *prefix = NULL;
+        char *wrapped, *ts = NULL;
+
+        if( sent_at > 0 && set_getbool( &irc->b->set, "display_timestamps" ) )
+                ts = irc_format_timestamp( irc, sent_at );
+        
+        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 {
+                prefix = ts;
+                ts = NULL;      /* don't doulbe-free */
+        }
+
+        wrapped = word_wrap( msg, 425 );
+        irc_send_msg( iu, "PRIVMSG", dst, wrapped, prefix );
+        
+        g_free( wrapped );
+        g_free( prefix );
+        g_free( ts );
+}
+
 static gboolean bee_irc_user_msg( bee_t *bee, bee_user_t *bu, const char *msg_, time_t sent_at )
 {
-        irc_t *irc = bee->ui_data;
         irc_user_t *iu = (irc_user_t *) bu->ui_data;
-        char *dst, *prefix = NULL;
-        char *wrapped, *ts = NULL;
-        irc_channel_t *ic = NULL;
         char *msg = g_strdup( msg_ );
         GSList *l;
-        
-        if( sent_at > 0 && set_getbool( &irc->b->set, "display_timestamps" ) )
-                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;
-                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;
-        }
         
         for( l = irc_plugins; l; l = l->next )
@@ -256 +256 @@
         }
         
-        wrapped = word_wrap( msg, 425 );
-        irc_send_msg( iu, "PRIVMSG", dst, wrapped, prefix );
-        
-        g_free( wrapped );
-        g_free( prefix );
+    bee_irc_msg_from_user( iu, msg, sent_at );
+
         g_free( msg );
-        g_free( ts );
-        
         return TRUE;
 }
@@ -451 +446 @@
 {
         irc_user_t *iu = data;
-        char *msg;
+        char *msg = g_string_free( iu->pastebuf, FALSE );
         GSList *l;
-        
-        msg = g_string_free( iu->pastebuf, FALSE );
-        iu->pastebuf = NULL;
-        iu->pastebuf_timer = 0;
         
         for( l = irc_plugins; l; l = l->next )
@@ -483 +474 @@
         
         g_free( msg );
+        iu->pastebuf = NULL;
+        iu->pastebuf_timer = 0;
         
         return FALSE;
@@ -995 +988 @@
         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;
         }