Changeset ebb95b6 for protocols


Ignore:
Timestamp:
2007-11-14T23:42:07Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
50e1776
Parents:
a6df0b5 (diff), 1bf1ae6 (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:

Merging from devel/Jelmer.

Location:
protocols
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/io.c

    ra6df0b5 rebb95b6  
    470470}
    471471
    472 static xt_status jabber_pkt_misc( struct xt_node *node, gpointer data )
    473 {
    474         printf( "Received unknown packet:\n" );
    475         xt_print( node );
    476        
    477         return XT_HANDLED;
    478 }
    479 
    480472static xt_status jabber_xmlconsole( struct xt_node *node, gpointer data )
    481473{
     
    509501        { "success",            "stream:stream",        sasl_pkt_result },
    510502        { "failure",            "stream:stream",        sasl_pkt_result },
    511         { NULL,                 "stream:stream",        jabber_pkt_misc },
    512503        { NULL,                 NULL,                   NULL }
    513504};
  • protocols/jabber/presence.c

    ra6df0b5 rebb95b6  
    170170                /* What else to do with it? */
    171171        }
    172         else
    173         {
    174                 printf( "Received PRES from %s:\n", from );
    175                 xt_print( node );
    176         }
    177172       
    178173        return XT_HANDLED;
  • protocols/jabber/xmltree.c

    ra6df0b5 rebb95b6  
    305305}
    306306
     307#ifdef DEBUG
    307308void xt_print( struct xt_node *node )
    308309{
     
    355356        printf( "</%s>\n", node->name );
    356357}
     358#endif
    357359
    358360struct xt_node *xt_dup( struct xt_node *node )
  • protocols/nogaim.c

    ra6df0b5 rebb95b6  
    3636#include <ctype.h>
    3737
    38 static int remove_chat_buddy_silent( struct groupchat *b, char *handle );
     38static int remove_chat_buddy_silent( struct groupchat *b, const char *handle );
    3939
    4040GSList *connections;
     
    578578                /* Remove him/her from the groupchats to prevent PART messages after he/she QUIT already */
    579579                for( c = ic->groupchats; c; c = c->next )
    580                         remove_chat_buddy_silent( c, (char*) handle );
     580                        remove_chat_buddy_silent( c, handle );
    581581        }
    582582       
     
    849849}
    850850
    851 static int remove_chat_buddy_silent( struct groupchat *b, char *handle )
     851static int remove_chat_buddy_silent( struct groupchat *b, const char *handle )
    852852{
    853853        GList *i;
  • protocols/oscar/oscar.c

    ra6df0b5 rebb95b6  
    10661066                        g_snprintf(tmp, BUF_LONG, "%s", args->msg);
    10671067                }
    1068         } else
     1068        } else if (args->mpmsg.numparts == 0) {
    10691069                g_snprintf(tmp, BUF_LONG, "%s", args->msg);
     1070        } else {
     1071                int i;
     1072               
     1073                *tmp = 0;
     1074                for (i = 0; i < args->mpmsg.numparts; i ++) {
     1075                        g_strlcat(tmp, (char*) args->mpmsg.parts[i].data, BUF_LONG);
     1076                        g_strlcat(tmp, "\n", BUF_LONG);
     1077                }
     1078        }
    10701079       
    10711080        strip_linefeed(tmp);
Note: See TracChangeset for help on using the changeset viewer.