diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2006-06-21 18:34:33 +0200 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2006-06-21 18:34:33 +0200 |
commit | b72caac09b5944ee9954eb18262fe45228665570 (patch) | |
tree | b44353f8ab3d23702f49e129d53b787952fe6546 /protocols/proxy.h | |
parent | 3af70b06b2f0fb0fb41a041f6d86e3711b9eea3f (diff) | |
parent | df417ca6657bc824e1dbd4a6026284656a42ce40 (diff) |
Merging libevent branch: Events can now be handles by both glib and libevent.
Diffstat (limited to 'protocols/proxy.h')
-rw-r--r-- | protocols/proxy.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/protocols/proxy.h b/protocols/proxy.h index 47c966d2..680790a5 100644 --- a/protocols/proxy.h +++ b/protocols/proxy.h @@ -1,5 +1,5 @@ /* - * gaim + * nogaim * * Copyright (C) 1998-1999, Mark Spencer <markster@marko.net> * @@ -35,6 +35,8 @@ #include <glib.h> #include <gmodule.h> +#include "events.h" + #define PROXY_NONE 0 #define PROXY_HTTP 1 #define PROXY_SOCKS4 2 @@ -46,15 +48,6 @@ extern int proxytype; extern char proxyuser[128]; extern char proxypass[128]; -typedef enum { - GAIM_INPUT_READ = 1 << 0, - GAIM_INPUT_WRITE = 1 << 1 -} GaimInputCondition; -typedef void (*GaimInputFunction)(gpointer, gint, GaimInputCondition); - -G_MODULE_EXPORT gint gaim_input_add(int, GaimInputCondition, GaimInputFunction, gpointer); -G_MODULE_EXPORT void gaim_input_remove(gint); - -G_MODULE_EXPORT int proxy_connect(const char *host, int port, GaimInputFunction func, gpointer data); +G_MODULE_EXPORT int proxy_connect(const char *host, int port, b_event_handler func, gpointer data); #endif /* _PROXY_H_ */ |