Changeset 2288705 for protocols/nogaim.h

Timestamp:

2009-12-07T21:54:19Z (14 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:

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

protocols/nogaim.h

@@ -39 +39 @@
 #define _NOGAIM_H
 
+#include <stdint.h>
+
 #include "bitlbee.h"
 #include "account.h"
@@ -210 +212 @@
          * not implement this. */
         struct groupchat *
-             (* chat_join)      (struct im_connection *, char *room, char *nick, char *password);
+             (* chat_join)      (struct im_connection *, const char *room, const char *nick, const char *password);
         /* Change the topic, if supported. Note that BitlBee expects the IM
            server to confirm the topic change with a regular topic change
@@ -225 +227 @@
          * - 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);
 
         /* Incoming transfer request */
@@ -243 +249 @@
  * the account_t parameter. */
 G_MODULE_EXPORT struct im_connection *imcb_new( account_t *acc );
-G_MODULE_EXPORT void imcb_free( struct im_connection *ic );
+G_MODULE_EXPORT void imc_free( struct im_connection *ic );
 /* Once you're connected, you should call this function, so that the user will
  * see the success. */
@@ -256 +262 @@
 /* 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.
@@ -262 +269 @@
  */
 G_MODULE_EXPORT void imcb_ask( struct im_connection *ic, char *msg, void *data, query_callback doit, query_callback dont );
-G_MODULE_EXPORT void imcb_ask_add( struct im_connection *ic, char *handle, const char *realname );
+
+/* 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 );
 
 /* Buddy management */
@@ -294 +307 @@
  *   the user her/himself. At that point the group chat will be visible to the
  *   user, too. */
-G_MODULE_EXPORT struct groupchat *imcb_chat_new( struct im_connection *ic, char *handle );
+G_MODULE_EXPORT struct groupchat *imcb_chat_new( struct im_connection *ic, const char *handle );
 G_MODULE_EXPORT void imcb_chat_add_buddy( struct groupchat *b, char *handle );
 /* To remove a handle from a group chat. Reason can be NULL. */