Changeset b20b32f for protocols/nogaim.c

Timestamp:

2005-11-28T01:14:06Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

65e2ce1, cfcc587

Parents:

2cdd8ce (diff), dfde8e0 (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:

Merge from Wilmer

File:

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

protocols/nogaim.c

@@ -295 +295 @@
 {
         va_list params;
-        char text[1024], buf[1024];
+        char text[1024], buf[1024], acc_id[33];
         char *msg;
+        account_t *a;
         
         va_start( params, format );
@@ -312 +313 @@
                 strip_html( msg );
         
-        irc_usermsg( gc->irc, "%s(%s) - %s", gc->prpl->name, gc->username, msg );
+        /* Try to find a different connection on the same protocol. */
+        for( a = gc->irc->accounts; a; a = a->next )
+                if( a->prpl == gc->prpl && a->gc != gc )
+                        break;
+        
+        /* If we found one, add the screenname to the acc_id. */
+        if( a )
+                g_snprintf( acc_id, 32, "%s(%s)", gc->prpl->name, gc->username );
+        else
+                g_snprintf( acc_id, 32, "%s", gc->prpl->name );
+        
+        irc_usermsg( gc->irc, "%s - %s", acc_id, msg );
 }
 
@@ -706 +718 @@
                 msg = buf;
         
-        while( strlen( msg ) > 450 )
+        while( strlen( msg ) > 425 )
         {
                 char tmp, *nl;
                 
-                tmp = msg[450];
-                msg[450] = 0;
-                
-                /* If there's a newline in this string, split up there so we're not
-                   going to split up lines. If there isn't a newline, well, too bad. */
-                if( ( nl = strrchr( msg, '\n' ) ) )
+                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 = strchr( msg, ' ' ) ) )
+                {
+                        msg[425] = tmp;
+                        tmp = *nl;
                         *nl = 0;
+                }
                 
                 irc_msgfrom( irc, u->nick, msg );
-                
-                msg[450] = tmp;
                 
                 /* Move on. */
                 if( nl )
                 {
-                        *nl = '\n';
+                        *nl = tmp;
                         msg = nl + 1;
                 }
                 else
                 {
-                        msg += 450;
+                        msg[425] = tmp;
+                        msg += 425;
                 }
         }
@@ -744 +759 @@
         
         if( ( u = user_findhandle( gc, handle ) ) )
-                irc_noticefrom( gc->irc, u->nick, "* Typing a message *" );
+                irc_msgfrom( gc->irc, u->nick, "\1TYPING 1\1" );
 }