Changeset 25d1be7

Timestamp:

2005-12-04T00:48:57Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e7f46c5, ed59700

Parents:

8f515c8

Message:

do_error_dialog shouldn't do NULL dereferences anymore, and TYPING notifications are always direct PRIVMSGs.

Files:

• irc.c (modified) (1 diff)
• protocols/nogaim.c (modified) (2 diffs)

irc.c

@@ -1510 +1510 @@
                         {
                                 irc_write( irc, ":%s!%s@%s %s %s :%s%s", u->nick, u->user, u->host,
-                                           type, to, prefix, line );
+                                           type, to, prefix ? prefix : "", line );
                         }
                         line = s + 1;

protocols/nogaim.c

@@ -381 +381 @@
 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" );
 }
 
@@ -698 +705 @@
         
         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" );
 }