Changes in protocols/nogaim.h [cca0692:c6ca3ee]

File:

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

protocols/nogaim.h

@@ -39 +39 @@
 #define _NOGAIM_H
 
-#include <stdint.h>
-
 #include "bitlbee.h"
 #include "account.h"
@@ -49 +47 @@
 
 #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
@@ -209 +208 @@
          * not implement this. */
         struct groupchat *
-             (* chat_join)      (struct im_connection *, const char *room, const char *nick, const char *password);
+             (* chat_join)      (struct im_connection *, char *room, char *nick, char *password);
         /* Change the topic, if supported. Note that BitlBee expects the IM
            server to confirm the topic change with a regular topic change
@@ -217 +216 @@
         
         /* You can tell what away states your protocol supports, so that
-         * BitlBee will try to map the IRC away reasons to them. If your
-         * protocol doesn't have any, just return one generic "Away". */
+         * BitlBee will try to map the IRC away reasons to them, or use
+         * GAIM_AWAY_CUSTOM when calling skype_set_away(). */
         GList *(* away_states)(struct im_connection *ic);
         
@@ -224 +223 @@
          * - Most protocols will just want to set this to g_strcasecmp().*/
         int (* handle_cmp) (const char *who1, const char *who2);
-
-        /* Implement these callbacks if you want to use imcb_ask_auth() */
-        void (* auth_allow)     (struct im_connection *, const char *who);
-        void (* auth_deny)      (struct im_connection *, const char *who);
 };
 
@@ -243 +238 @@
  * the account_t parameter. */
 G_MODULE_EXPORT struct im_connection *imcb_new( account_t *acc );
-G_MODULE_EXPORT void imc_free( struct im_connection *ic );
+G_MODULE_EXPORT void imcb_free( struct im_connection *ic );
 /* Once you're connected, you should call this function, so that the user will
  * see the success. */
@@ -256 +251 @@
 /* To tell the user an error, ie. before logging out when an error occurs. */
 G_MODULE_EXPORT void imcb_error( struct im_connection *ic, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
-
 /* To ask a your about something.
  * - 'msg' is the question.
@@ -263 +257 @@
  */
 G_MODULE_EXPORT void imcb_ask( struct im_connection *ic, char *msg, void *data, query_callback doit, query_callback dont );
-
-/* Two common questions you may want to ask:
- * - X added you to his contact list, allow?
- * - X is not in your contact list, want to add?
- */
-G_MODULE_EXPORT void imcb_ask_auth( struct im_connection *ic, const char *handle, const char *realname );
-G_MODULE_EXPORT void imcb_ask_add( struct im_connection *ic, const char *handle, const char *realname );
+G_MODULE_EXPORT void imcb_ask_add( struct im_connection *ic, char *handle, const char *realname );
 
 /* Buddy management */
@@ -279 +267 @@
 G_MODULE_EXPORT struct buddy *imcb_find_buddy( struct im_connection *ic, char *handle );
 G_MODULE_EXPORT void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *realname );
-G_MODULE_EXPORT void imcb_buddy_nick_hint( struct im_connection *ic, const char *handle, const char *nick );
+G_MODULE_EXPORT void imcb_buddy_nick_hint( struct im_connection *ic, char *handle, char *nick );
 
 /* Buddy activity */
@@ -302 +290 @@
  *   user, too. */
 G_MODULE_EXPORT struct groupchat *imcb_chat_new( struct im_connection *ic, const char *handle );
-G_MODULE_EXPORT void imcb_chat_name_hint( struct groupchat *c, const char *name );
 G_MODULE_EXPORT void imcb_chat_add_buddy( struct groupchat *b, const char *handle );
 /* To remove a handle from a group chat. Reason can be NULL. */
@@ -315 +302 @@
 
 /* Actions, or whatever. */
-int imc_away_send_update( struct im_connection *ic );
+int imc_set_away( struct im_connection *ic, char *away );
 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 );
@@ -325 +312 @@
 
 /* Misc. stuff */
-char *set_eval_timezone( set_t *set, char *value );
 char *set_eval_away_devoice( set_t *set, char *value );
 gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond );