Changeset fa29d093 for protocols/nogaim.h

Timestamp:

2007-03-28T05:53:11Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0da65d5

Parents:

723e611

Message:

Preparing for Jabber conference room support.

File:

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

protocols/nogaim.h

@@ -100 +100 @@
 
         /* stuff used just for chat */
-        GList *in_room;
-        GList *ignored;
-        int id;
-        
-        /* BitlBee */
-        struct conversation *next;
-        char *channel;
-        char *title;
-        char joined;
-        void *data;
+        GList *in_room;
+        GList *ignored;
+        
+        /* BitlBee */
+        struct conversation *next;
+        char *channel;
+        char *title;
+        char joined;
+        void *data;
 };
 
@@ -115 +114 @@
         char name[80];
         char show[BUDDY_ALIAS_MAXLEN];
-        int present;
+        int present;
         int evil;
         time_t signon;
         time_t idle;
-        int uc;
+        int uc;
         guint caps; /* woohoo! */
         void *proto_data; /* what a hack */
@@ -153 +152 @@
         
         /* Group chat stuff. */
-        void (* join_chat)      (struct gaim_connection *, GList *data);
-        void (* chat_invite)    (struct gaim_connection *, int id, char *who, char *message);
-        void (* chat_leave)     (struct gaim_connection *, int id);
-        int  (* chat_send)      (struct gaim_connection *, int id, char *message);
-        int  (* chat_open)      (struct gaim_connection *, char *who);
+        void (* chat_invite)    (struct conversation *, char *who, char *message);
+        void (* chat_leave)     (struct conversation *);
+        int  (* chat_send)      (struct conversation *, char *message);
+        struct conversation *
+             (* chat_open)      (struct gaim_connection *, char *who);
+        struct conversation *
+             (* chat_join)      (struct gaim_connection *, char *chat, char *nick, char *password);
         
         /* DIE! */
@@ -183 +184 @@
 int bim_set_away( struct gaim_connection *gc, char *away );
 int bim_buddy_msg( struct gaim_connection *gc, char *handle, char *msg, int flags );
-int bim_chat_msg( struct gaim_connection *gc, int id, char *msg );
+int bim_chat_msg( struct conversation *c, char *msg );
 
 void bim_add_allow( struct gaim_connection *gc, char *handle );
@@ -224 +225 @@
 G_MODULE_EXPORT void show_got_added( struct gaim_connection *gc, char *handle, const char *realname );
 
-/* server.c */                    
+/* server.c */
 G_MODULE_EXPORT void serv_got_update( struct gaim_connection *gc, char *handle, int loggedin, int evil, time_t signon, time_t idle, int type, guint caps );
 G_MODULE_EXPORT void serv_got_im( struct gaim_connection *gc, char *handle, char *msg, guint32 flags, time_t mtime, gint len );
 G_MODULE_EXPORT void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout, int type );
 G_MODULE_EXPORT void serv_got_chat_invite( struct gaim_connection *gc, char *handle, char *who, char *msg, GList *data );
-G_MODULE_EXPORT struct conversation *serv_got_joined_chat( struct gaim_connection *gc, int id, char *handle );
-G_MODULE_EXPORT void serv_got_chat_in( struct gaim_connection *gc, int id, char *who, int whisper, char *msg, time_t mtime );
-G_MODULE_EXPORT void serv_got_chat_left( struct gaim_connection *gc, int id );
-
-struct conversation *conv_findchannel( char *channel );
+G_MODULE_EXPORT struct conversation *serv_got_joined_chat( struct gaim_connection *gc, char *handle );
+G_MODULE_EXPORT void serv_got_chat_in( struct conversation *c, char *who, int whisper, char *msg, time_t mtime );
+G_MODULE_EXPORT void serv_got_chat_left( struct conversation *c );
+
+struct conversation *chat_by_channel( char *channel );
+struct conversation *chat_by_id( int id );
 
 #endif