Changes in protocols/nogaim.h [7b23afd:9cb9868]

File:

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

protocols/nogaim.h

@@ -72 +72 @@
         /* we need to do either oscar or TOC */
         /* we make this as an int in case if we want to add more protocols later */
+        int protocol;
         struct prpl *prpl;
         guint32 flags;
@@ -151 +152 @@
         char user_info[2048];
         int options;
-        struct prpl *prpl;
+        int protocol;
         /* prpls can use this to save information about the user,
          * like which server to connect to, etc */
@@ -160 +161 @@
 };
 
-struct ft 
-{
-        const char *filename;
-        
-        /* Total number of bytes in file */
-        size_t total_bytes;
-        
-        /* Current number of bytes received */
-        size_t cur_bytes;
-};
-
-struct ft_request 
-{
-        const char *filename;
-        struct gaim_connection *gc;
-};
-
-typedef void (*ft_recv_handler) (struct ft *, void *data, size_t len);
-
 struct prpl {
+        int protocol;
         int options;
-        const char *name;
+        char *(* name)();
 
         /* for ICQ and Yahoo, who have off/on per-conversation options */
@@ -234 +217 @@
         void (* group_buddy)    (struct gaim_connection *, char *who, char *old_group, char *new_group);
 
-        /* file transfers */
-        struct ft_send_req *(* req_send_file) (struct gaim_connection *, const char *file);
-        void (* send_file_part) (struct gaim_connection *, struct ft*, void *data, size_t length);
-        void (* accept_recv_file) (struct gaim_connection *, struct ft*, ft_recv_handler);
-
         void (* buddy_free)     (struct buddy *);
 
         char *(* get_status_string) (struct gaim_connection *gc, int stat);
-};
+
+        int (* cmp_buddynames) (const char *who1, const char *who2);
+};
+
+#define PROTO_TOC       0
+#define PROTO_OSCAR     1
+#define PROTO_YAHOO     2
+#define PROTO_ICQ       3
+#define PROTO_MSN       4
+#define PROTO_IRC       5
+#define PROTO_FTP       6
+#define PROTO_VGATE     7
+#define PROTO_JABBER    8
+#define PROTO_NAPSTER   9
+#define PROTO_ZEPHYR    10
+#define PROTO_GADUGADU  11
+#define PROTO_MAX       16
+
+extern char proto_name[PROTO_MAX][8];
 
 #define UC_UNAVAILABLE  1
@@ -253 +249 @@
 
 G_MODULE_EXPORT GSList *get_connections();
-G_MODULE_EXPORT struct prpl *find_protocol(const char *name);
-G_MODULE_EXPORT void register_protocol(struct prpl *);
+extern struct prpl *proto_prpl[16];
 
 /* nogaim.c */
@@ -266 +261 @@
 int proto_away( struct gaim_connection *gc, char *away );
 char *set_eval_away_devoice( irc_t *irc, set_t *set, char *value );
-int handle_cmp( char *a, char *b, struct prpl *protocol );
 
 gboolean auto_reconnect( gpointer data );
@@ -325 +319 @@
 G_MODULE_EXPORT void info_string_append(GString *str, char *newline, char *name, char *value);
 
-/* file transfers */
-G_MODULE_EXPORT void ft_progress( struct ft *, int);
-G_MODULE_EXPORT void ft_incoming( struct ft_request * );
-G_MODULE_EXPORT void ft_accepted( struct ft_request *, struct ft *);
-G_MODULE_EXPORT void ft_denied( struct ft_request *, const char *reason);
+#ifdef WITH_MSN
+/* msn.c */
+G_MODULE_EXPORT void msn_init( struct prpl *ret );
+#endif
+
+#ifdef WITH_OSCAR
+/* oscar.c */
+G_MODULE_EXPORT void oscar_init( struct prpl *ret );
+#endif
+
+#ifdef WITH_JABBER
+/* jabber.c */
+G_MODULE_EXPORT void jabber_init( struct prpl *ret );
+#endif
+
+#ifdef WITH_YAHOO
+/* yahoo.c */
+G_MODULE_EXPORT void byahoo_init( struct prpl *ret );
+#endif
 
 /* prefs.c */