Changeset fb020ac for protocols/nogaim.h

Timestamp:

2010-03-07T18:43:23Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

279607e

Parents:

e08e53c (diff), c32f492 (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 in mainline, including improved away/status stuff.

File:

• protocols/nogaim.h (modified) (3 diffs)

protocols/nogaim.h

@@ -49 +49 @@
 
 #define WEBSITE "http://www.bitlbee.org/"
-#define GAIM_AWAY_CUSTOM "Custom"
 
 /* Sharing flags between all kinds of things. I just hope I won't hit any
@@ -219 +218 @@
         
         /* You can tell what away states your protocol supports, so that
-         * BitlBee will try to map the IRC away reasons to them, or use
-         * GAIM_AWAY_CUSTOM when calling skype_set_away(). */
+         * BitlBee will try to map the IRC away reasons to them. If your
+         * protocol doesn't have any, just return one generic "Away". */
         GList *(* away_states)(struct im_connection *ic);
         
@@ -316 +315 @@
 
 /* Actions, or whatever. */
-int imc_set_away( struct im_connection *ic, char *away );
+int imc_away_send_update( struct im_connection *ic );
 int imc_buddy_msg( struct im_connection *ic, char *handle, char *msg, int flags );
 int imc_chat_msg( struct groupchat *c, char *msg, int flags );