Changeset fb11647a

Timestamp:

2011-10-01T14:55:24Z (13 years ago)

Author:

unknown <pesco@…>

Branches:

master

Children:

3231485

Parents:

da44b08

Message:

factor making a message appear from a specific nick out of bee_irc_user_msg

Files:

• irc.h (modified) (1 diff)
• irc_im.c (modified) (3 diffs)

irc.h

@@ -350 +350 @@
 void bee_irc_channel_update( irc_t *irc, irc_channel_t *ic, irc_user_t *iu );
 void bee_irc_user_nick_reset( irc_user_t *iu );
+void bee_irc_msg_from_user( irc_user_t *iu, const char *msg, time_t sent_at );
 
 #endif

irc_im.c

@@ -193 +193 @@
 }
 
-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;
+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;
+        irc_channel_t *ic = NULL;
         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 );
@@ -226 +224 @@
                 ts = NULL;
         }
+        
+        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_user_t *iu = (irc_user_t *) bu->ui_data;
+        char *msg = g_strdup( msg_ );
+        GSList *l;
         
         for( l = irc_plugins; l; l = l->next )
@@ -256 +268 @@
         }
         
-        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;
 }