cpw.malu.xmpp.jingle_ft: a3aa51ea: Add #include <glib.h>
malu at pidgin.im
malu at pidgin.im
Tue Mar 24 06:50:39 EDT 2009
-----------------------------------------------------------------
Revision: a3aa51eab45b7598fc75f02534eed2ae0a0bb3cf
Ancestor: fa26b7b5b2b2218df24d577e9c8ae6101bbaa025
Author: malu at pidgin.im
Date: 2009-03-24T10:44:32
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/a3aa51eab45b7598fc75f02534eed2ae0a0bb3cf
Modified files:
libpurple/protocols/jabber/jingle/file-transfer.c
libpurple/protocols/jabber/xfer.h
ChangeLog:
Add #include <glib.h>
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/file-transfer.c 5fdd8140c1ebc624c07a554709ba770ec8d45c09
+++ libpurple/protocols/jabber/jingle/file-transfer.c 1e0b699540819463e44053ed58e8e8d011c36737
@@ -34,6 +34,8 @@ struct _JingleFTPrivate {
#define JINGLE_FT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), \
JINGLE_TYPE_FT, JingleFTPrivate))
+#define JINGLE_FT_IBB_THRESHOLD 65536
+
static void jingle_file_transfer_class_init (JingleFTClass *klass);
static void jingle_file_transfer_init (JingleFT *rtp);
static void jingle_file_transfer_finalize (GObject *object);
@@ -342,7 +344,7 @@ jingle_file_transfer_xfer_init(PurpleXfe
JingleContent *content = (JingleContent *) xfer->data;
JingleSession *session = jingle_content_get_session(content);
JingleTransport *transport = jingle_content_get_transport(content);
-
+
if (jingle_session_is_initiator(session)) {
jabber_iq_send(jingle_session_to_packet(session,
JINGLE_SESSION_INITIATE));
@@ -604,7 +606,7 @@ jingle_file_transfer_new_xfer(PurpleConn
if (xfer)
{
- JingleSession *session;
+ JingleSession *session;
JingleContent *content;
JingleTransport *transport;
gchar *jid = NULL, *me = NULL, *sid = NULL;
@@ -661,7 +663,7 @@ jingle_file_transfer_new_xfer(PurpleConn
if (JINGLE_IS_IBB(transport)) {
jingle_file_transfer_add_ibb_session_to_transport(js, transport,
content, jid);
- }
+ }
xfer->data = content;
purple_xfer_set_init_fnc(xfer, jingle_file_transfer_xfer_init);
============================================================
--- libpurple/protocols/jabber/xfer.h d05a57d7a45a2f87a745c16e30e4739639ccc00f
+++ libpurple/protocols/jabber/xfer.h 342d017f4fe2d8efa6963316f07fe71121751275
@@ -14,18 +14,20 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
*/
- #ifndef JABBER_XFER_H
- #define JABBER_XFER_H
+#ifndef JABBER_XFER_H
+#define JABBER_XFER_H
- #include "connection.h"
- #include "ft.h"
+#include <glib.h>
+
+#include "connection.h"
+#include "ft.h"
- PurpleXfer *jabber_xfer_new(PurpleConnection *gc, const char *who);
- void jabber_xfer_send(PurpleConnection *gc, const char *who, const char *file);
+PurpleXfer *jabber_xfer_new(PurpleConnection *gc, const char *who);
+void jabber_xfer_send(PurpleConnection *gc, const char *who, const char *file);
- xmlnode *jabber_xfer_create_file_element(const PurpleXfer *xfer);
- PurpleXfer *jabber_xfer_create_from_xml(const PurpleAccount *account,
+xmlnode *jabber_xfer_create_file_element(const PurpleXfer *xfer);
+PurpleXfer *jabber_xfer_create_from_xml(const PurpleAccount *account,
const xmlnode *file, const gchar *who, gpointer data);
- #endif /* JABBER_XFER_H */
-
\ No newline at end of file
+#endif /* JABBER_XFER_H */
+
More information about the Commits
mailing list