Changeset 703f0f7 for protocols/nogaim.h

Timestamp:

2005-12-14T01:17:25Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

547f937

Parents:

22bf64e (diff), 568aaf7 (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:

Merge my pluginable branch

File:

• protocols/nogaim.h (modified) (6 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;
@@ -152 +151 @@
         char user_info[2048];
         int options;
-        int protocol;
+        struct prpl *prpl;
         /* prpls can use this to save information about the user,
          * like which server to connect to, etc */
@@ -162 +161 @@
 
 struct prpl {
-        int protocol;
         int options;
-        char *(* name)();
+        const char *name;
 
         /* for ICQ and Yahoo, who have off/on per-conversation options */
@@ -224 +222 @@
 };
 
-#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
 
@@ -249 +231 @@
 
 G_MODULE_EXPORT GSList *get_connections();
-extern struct prpl *proto_prpl[16];
+G_MODULE_EXPORT struct prpl *find_protocol(const char *name);
+G_MODULE_EXPORT void register_protocol(struct prpl *);
 
 /* nogaim.c */
@@ -319 +302 @@
 G_MODULE_EXPORT void info_string_append(GString *str, char *newline, char *name, char *value);
 
-#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 */
 G_MODULE_EXPORT void build_block_list();