Changeset 019c031 for protocols/nogaim.c

Timestamp:

2005-12-04T21:55:15Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

568aaf7

Parents:

500a1b6 (diff), d636233 (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) (3 diffs)

protocols/nogaim.c

@@ -452 +452 @@
 void do_error_dialog( struct gaim_connection *gc, char *msg, char *title )
 {
-        serv_got_crap( gc, "Error: %s", msg );
+        if( msg && title )
+                serv_got_crap( gc, "Error: %s: %s", title, msg );
+        else if( msg )
+                serv_got_crap( gc, "Error: %s", msg );
+        else if( title )
+                serv_got_crap( gc, "Error: %s", title );
+        else
+                serv_got_crap( gc, "Error" );
 }
 
@@ -737 +744 @@
                 /* If there's a newline/space in this string, split up there,
                    looks a bit prettier. */
-                if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strchr( msg, ' ' ) ) )
+                if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strrchr( msg, ' ' ) ) )
                 {
                         msg[425] = tmp;
@@ -769 +776 @@
         
         if( ( u = user_findhandle( gc, handle ) ) )
-                irc_msgfrom( gc->irc, u->nick, "\1TYPING 1\1" );
+                irc_privmsg( gc->irc, u, "PRIVMSG", gc->irc->nick, NULL, "\1TYPING 1\1" );
 }