Ignore:
Timestamp:
2009-12-07T21:54:19Z (12 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
1c3008a
Parents:
aac4017 (diff), 36cf9fd (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 head.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/jabber.h

    raac4017 r2288705  
    2727#include <glib.h>
    2828
     29#include "bitlbee.h"
     30#include "md5.h"
    2931#include "xmltree.h"
    30 #include "bitlbee.h"
    3132
    3233extern GSList *jabber_connections;
     
    302303
    303304/* conference.c */
    304 struct groupchat *jabber_chat_join( struct im_connection *ic, char *room, char *nick, char *password );
     305struct groupchat *jabber_chat_join( struct im_connection *ic, const char *room, const char *nick, const char *password );
    305306struct groupchat *jabber_chat_by_jid( struct im_connection *ic, const char *name );
    306307void jabber_chat_free( struct groupchat *c );
Note: See TracChangeset for help on using the changeset viewer.