Changeset ecf8fa8 for protocols/proxy.c

Timestamp:

2006-05-09T07:20:05Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

67b6766

Parents:

a0d04d6

Message:

Split off event handling related functions (depending on GLib) to events_glib.c.

File:

• protocols/proxy.c (modified) (5 diffs)

protocols/proxy.c

@@ -21 +21 @@
  */
 
-/* this is a little piece of code to handle proxy connection */
-/* it is intended to : 1st handle http proxy, using the CONNECT command
- , 2nd provide an easy way to add socks support */
-
 #define BITLBEE_CORE
 #include <stdio.h>
@@ -46 +42 @@
 #include "proxy.h"
 
-#define GAIM_READ_COND  (G_IO_IN | G_IO_HUP | G_IO_ERR)
-#define GAIM_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
-#define GAIM_ERR_COND   (G_IO_HUP | G_IO_ERR | G_IO_NVAL)
-
 char proxyhost[128] = "";
 int proxyport = 0;
@@ -64 +56 @@
         gint inpa;
 };
-
-typedef struct _GaimIOClosure {
-        GaimInputFunction function;
-        guint result;
-        gpointer data;
-} GaimIOClosure;
 
 
@@ -90 +76 @@
 
         return &sin;
-}
-
-static void gaim_io_destroy(gpointer data)
-{
-        g_free(data);
-}
-
-static gboolean gaim_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
-{
-        GaimIOClosure *closure = data;
-        GaimInputCondition gaim_cond = 0;
-
-        if (condition & GAIM_READ_COND)
-                gaim_cond |= GAIM_INPUT_READ;
-        if (condition & GAIM_WRITE_COND)
-                gaim_cond |= GAIM_INPUT_WRITE;
-
-        closure->function(closure->data, g_io_channel_unix_get_fd(source), gaim_cond);
-
-        return TRUE;
 }
 
@@ -542 +508 @@
 /* Export functions */
 
-gint gaim_input_add(gint source, GaimInputCondition condition, GaimInputFunction function, gpointer data)
-{
-        GaimIOClosure *closure = g_new0(GaimIOClosure, 1);
-        GIOChannel *channel;
-        GIOCondition cond = 0;
-        
-        closure->function = function;
-        closure->data = data;
-        
-        if (condition & GAIM_INPUT_READ)
-                cond |= GAIM_READ_COND;
-        if (condition & GAIM_INPUT_WRITE)
-                cond |= GAIM_WRITE_COND;
-        
-        channel = g_io_channel_unix_new(source);
-        closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
-                                              gaim_io_invoke, closure, gaim_io_destroy);
-        
-        g_io_channel_unref(channel);
-        return closure->result;
-}
-
-void gaim_input_remove(gint tag)
-{
-        if (tag > 0)
-                g_source_remove(tag);
-}
-
 int proxy_connect(const char *host, int port, GaimInputFunction func, gpointer data)
 {