Changes in protocols/msn/gw.c [4e4616a:088b070]

File:

• protocols/msn/gw.c (modified) (4 diffs)

protocols/msn/gw.c

@@ -22 +22 @@
         gw->ssl = (GATEWAY_PORT == 443);
         gw->poll_timeout = -1;
-        gw->write_timeout = -1;
         gw->ic = ic;
         gw->md = ic->proto_data;
@@ -35 +34 @@
                 b_event_remove(gw->poll_timeout);
         }
-
-        if (gw->write_timeout != -1) {
-                b_event_remove(gw->write_timeout);
-        }
-
         g_byte_array_free(gw->in, TRUE);
         g_byte_array_free(gw->out, TRUE);
@@ -195 +189 @@
 }
 
-static gboolean msn_gw_write_cb(gpointer data, gint source, b_input_condition cond)
+void msn_gw_write(struct msn_gw *gw, char *buf, size_t len)
 {
-        struct msn_gw *gw;
-        
-        if (!(gw = msn_gw_from_ic(data))) {
-                return FALSE;
-        }
-
+        g_byte_array_append(gw->out, (const guint8 *) buf, len);
         if (!gw->open) {
                 msn_gw_open(gw);
@@ -208 +197 @@
                 msn_gw_dorequest(gw, NULL);
         }
-
-        gw->write_timeout = -1;
-        return FALSE;
 }
-
-void msn_gw_write(struct msn_gw *gw, char *buf, size_t len)
-{
-        g_byte_array_append(gw->out, (const guint8 *) buf, len);
-
-        /* do a bit of buffering here to send several commands with a single request */
-        if (gw->write_timeout == -1) {
-                gw->write_timeout = b_timeout_add(1, msn_gw_write_cb, gw->ic);
-        }
-}