Changeset d444c09 for protocols

Timestamp:

2007-10-12T00:06:50Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3933853, c78c032, eda54e4

Parents:

285b55d

Message:

Added word_wrap() function to misc.c and using it at the right places so
that long messages in groupchats also get wrapped properly (instead of
truncated).

File:

• protocols/nogaim.c (modified) (4 diffs)

protocols/nogaim.c

@@ -606 +606 @@
 {
         irc_t *irc = ic->irc;
+        char *wrapped;
         user_t *u;
         
@@ -648 +649 @@
                 strip_html( msg );
 
-        while( strlen( msg ) > 425 )
-        {
-                char tmp, *nl;
-                
-                tmp = msg[425];
-                msg[425] = 0;
-                
-                /* If there's a newline/space in this string, split up there,
-                   looks a bit prettier. */
-                if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strrchr( msg, ' ' ) ) )
-                {
-                        msg[425] = tmp;
-                        tmp = *nl;
-                        *nl = 0;
-                }
-                
-                irc_msgfrom( irc, u->nick, msg );
-                
-                /* Move on. */
-                if( nl )
-                {
-                        *nl = tmp;
-                        msg = nl + 1;
-                }
-                else
-                {
-                        msg[425] = tmp;
-                        msg += 425;
-                }
-        }
-        irc_msgfrom( irc, u->nick, msg );
+        wrapped = word_wrap( msg, 425 );
+        irc_msgfrom( irc, u->nick, wrapped );
+        g_free( wrapped );
 }
 
@@ -737 +710 @@
 {
         struct im_connection *ic = c->ic;
+        char *wrapped;
         user_t *u;
         
@@ -749 +723 @@
                 strip_html( msg );
         
+        wrapped = word_wrap( msg, 425 );
         if( c && u )
-                irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, "", msg );
+        {
+                irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, "", wrapped );
+        }
         else
-                imcb_log( ic, "Message from/to conversation %s@0x%x (unknown conv/user): %s", who, (int) c, msg );
+        {
+                imcb_log( ic, "Message from/to conversation %s@0x%x (unknown conv/user): %s", who, (int) c, wrapped );
+        }
+        g_free( wrapped );
 }