Changeset 2cdd8ce for protocols/nogaim.c

Timestamp:

2005-11-19T15:17:03Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

9c8ae50, b20b32f

Parents:

c998255 (diff), 94281ef (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 Wilmer

File:

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

protocols/nogaim.c

@@ -184 +184 @@
                         gc->prpl->set_away( gc, s, away );
                         if( set_getint( gc->irc, "debug" ) )
-                                irc_usermsg( gc->irc, "Setting away state for %s to %s", gc->prpl->name, s );
+                                serv_got_crap( gc, "Setting away state to %s", s );
                 }
                 else
@@ -277 +277 @@
 void set_login_progress( struct gaim_connection *gc, int step, char *msg )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Logging in: %s", gc->prpl->name, gc->username, msg );
+        serv_got_crap( gc, "Logging in: %s", msg );
 }
 
@@ -283 +283 @@
 void hide_login_progress( struct gaim_connection *gc, char *msg )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Login error: %s", gc->prpl->name, gc->username, msg );
+        serv_got_crap( gc, "Login error: %s", msg );
 }
 
@@ -289 +289 @@
 void hide_login_progress_error( struct gaim_connection *gc, char *msg )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Logged out: %s", gc->prpl->name, gc->username, msg );
+        serv_got_crap( gc, "Logged out: %s", msg );
 }
 
@@ -308 +308 @@
                 msg = text;
         
-        /* if( g_strcasecmp( set_getstr(gc->irc, "html" ), "strip" ) == 0 ) */
-        if( gc->flags & OPT_CONN_HTML )
+        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
                 strip_html( msg );
         
@@ -337 +337 @@
         u = user_find( gc->irc, gc->irc->nick );
         
-        irc_usermsg( gc->irc, "%s(%s) - Logged in", gc->prpl->name, gc->username );
+        serv_got_crap( gc, "Logged in" );
         
         gc->keepalive = g_timeout_add( 60000, send_keepalive, gc );
@@ -351 +351 @@
                 
                 if( u == NULL )
-                        irc_usermsg( gc->irc, "\x02""***\x02"" BitlBee now supports ICQ server-side contact lists. "
+                        serv_got_crap( gc, "\x02""***\x02"" BitlBee now supports ICQ server-side contact lists. "
                                               "See \x02""help import_buddies\x02"" for more information." );
         }
@@ -384 +384 @@
         account_t *a;
         
-        irc_usermsg( gc->irc, "%s(%s) - Signing off..", gc->prpl->name, gc->username );
+        serv_got_crap( gc, "Signing off.." );
 
         gaim_input_remove( gc->keepalive );
@@ -416 +416 @@
         {
                 int delay = set_getint( irc, "auto_reconnect_delay" );
-                irc_usermsg( gc->irc, "%s(%s) - Reconnecting in %d seconds..", gc->prpl->name, gc->username, delay);
+                serv_got_crap( gc, "Reconnecting in %d seconds..", delay );
                 
                 a->reconnect = 1;
@@ -430 +430 @@
 void do_error_dialog( struct gaim_connection *gc, char *msg, char *title )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Error: %s", gc->prpl->name, gc->username, msg );
+        serv_got_crap( gc, "Error: %s", msg );
 }
 
@@ -459 +459 @@
         
         if( set_getint( irc, "debug" ) && 0 ) /* This message is too useless */
-                irc_usermsg( irc, "Receiving user add from protocol: %s", handle );
+                serv_got_crap( gc, "Receiving user add from handle: %s", handle );
         
         if( user_findhandle( gc, handle ) )
         {
                 if( set_getint( irc, "debug" ) )
-                        irc_usermsg( irc, "User already exists, ignoring add request: %s", handle );
+                        serv_got_crap( gc, "User already exists, ignoring add request: %s", handle );
                 
                 return;
@@ -557 +557 @@
                 
                 if( ( gc->flags & OPT_LOGGED_IN ) && set_getint( gc->irc, "display_namechanges" ) )
-                        irc_usermsg( gc->irc, "User `%s' changed name to `%s'", u->nick, u->realname );
+                        serv_got_crap( gc, "User `%s' changed name to `%s'", u->nick, u->realname );
         }
 }
@@ -590 +590 @@
                         if( set_getint( gc->irc, "debug" ) || g_strcasecmp( set_getstr( gc->irc, "handle_unknown" ), "ignore" ) != 0 )
                         {
-                                irc_usermsg( gc->irc, "serv_got_update() for handle %s on connection %s(%s):", handle, gc->prpl->name, gc->username );
-                                irc_usermsg( gc->irc, "loggedin = %d, type = %d", loggedin, type );
+                                serv_got_crap( gc, "serv_got_update() for handle %s:", handle );
+                                serv_got_crap( gc, "loggedin = %d, type = %d", loggedin, type );
                         }
                         
@@ -671 +671 @@
                 {
                         if( set_getint( irc, "debug" ) )
-                                irc_usermsg( irc, "Ignoring message from unknown handle %s on connection %s(%s)", handle, gc->prpl->name, gc->username );
+                                serv_got_crap( gc, "Ignoring message from unknown handle %s", handle );
                         
                         return;
@@ -693 +693 @@
                 else
                 {
-                        irc_usermsg( irc, "Message from unknown handle %s on connection %s(%s):", handle, gc->prpl->name, gc->username );
+                        serv_got_crap( gc, "Message from unknown handle %s:", handle );
                         u = user_find( irc, irc->mynick );
                 }
         }
         
-        /* if( g_strcasecmp( set_getstr( irc, "html" ), "strip" ) == 0 ) */
-        if( gc->flags & OPT_CONN_HTML )
+        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
                 strip_html( msg );
 
@@ -753 +753 @@
         
         if( set_getint( gc->irc, "debug" ) )
-                irc_usermsg( gc->irc, "You were removed from conversation %d", (int) id );
+                serv_got_crap( gc, "You were removed from conversation %d", (int) id );
         
         for( c = gc->conversations; c && c->id != id; c = (l=c)->next );
@@ -798 +798 @@
         for( c = gc->conversations; c && c->id != id; c = c->next );
         
-        /* if( g_strcasecmp( set_getstr( gc->irc, "html" ), "strip" ) == 0 ) */
-        if( gc->flags & OPT_CONN_HTML )
+        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
                 strip_html( msg );
         
@@ -809 +809 @@
                 irc_privmsg( gc->irc, u, "PRIVMSG", c->channel, "", msg );
         else
-                irc_usermsg( gc->irc, "Message from/to conversation %s@%d (unknown conv/user): %s", who, id, msg );
+                serv_got_crap( gc, "Message from/to conversation %s@%d (unknown conv/user): %s", who, id, msg );
 }
 
@@ -832 +832 @@
         
         s = g_new( char, 16 );
-        sprintf( s, "#chat_%03d", gc->irc->c_id++ );
+        sprintf( s, "&chat_%03d", gc->irc->c_id++ );
         c->channel = g_strdup( s );
         g_free( s );
         
         if( set_getint( gc->irc, "debug" ) )
-                irc_usermsg( gc->irc, "Creating new conversation: (id=%d,handle=%s)", id, handle );
+                serv_got_crap( gc, "Creating new conversation: (id=%d,handle=%s)", id, handle );
         
         return( c );
@@ -856 +856 @@
         
         if( set_getint( b->gc->irc, "debug" ) )
-                irc_usermsg( b->gc->irc, "User %s added to conversation %d", handle, b->id );
+                serv_got_crap( b->gc, "User %s added to conversation %d", handle, b->id );
         
         /* It might be yourself! */
@@ -890 +890 @@
         
         if( set_getint( b->gc->irc, "debug" ) )
-                irc_usermsg( b->gc->irc, "User %s removed from conversation %d (%s)", handle, b->id, reason ? reason : "" );
+                serv_got_crap( b->gc, "User %s removed from conversation %d (%s)", handle, b->id, reason ? reason : "" );
         
         /* It might be yourself! */
@@ -1031 +1031 @@
                 msg = buf;
 
-        if( u->gc->flags & OPT_CONN_HTML) {
-                char * html = escape_html(msg);
-                strncpy(buf, html, 8192);
-                g_free(html);
+        if( ( u->gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
+        {
+                char *html;
+                
+                html = escape_html( msg );
+                strncpy( buf, html, 8192 );
+                g_free( html );
+                
+                msg = buf;
         }