pidgin: 041581a9: Move msn_slplink_send_msgpart() that it ...
markdoliner at pidgin.im
markdoliner at pidgin.im
Thu Nov 13 01:45:27 EST 2008
-----------------------------------------------------------------
Revision: 041581a9d73edd6bc244585c91e3f387ca70832d
Ancestor: e4c84589ece25ae1d76b14db01343ed8396e99ef
Author: markdoliner at pidgin.im
Date: 2008-11-13T06:43:48
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/041581a9d73edd6bc244585c91e3f387ca70832d
Modified files:
libpurple/protocols/msn/slplink.c
ChangeLog:
Move msn_slplink_send_msgpart() that it doesn't need a forward declaration
and make it static
-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slplink.c 1079709e5e6d2e5dc35593442f984f05cf3cedc5
+++ libpurple/protocols/msn/slplink.c 3380f27c477be434913b0c1d6f411f9901c8dece
@@ -27,8 +27,6 @@
#include "switchboard.h"
#include "slp.h"
-void msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg);
-
#ifdef MSN_DEBUG_SLP_FILES
static int m_sc = 0;
static int m_rc = 0;
@@ -244,54 +242,7 @@ msn_slplink_send_msg(MsnSlpLink *slplink
}
}
-/* We have received the message ack */
static void
-msg_ack(MsnMessage *msg, void *data)
-{
- MsnSlpMessage *slpmsg;
- long long real_size;
-
- slpmsg = data;
-
- real_size = (slpmsg->flags == 0x2) ? 0 : slpmsg->size;
-
- slpmsg->offset += msg->msnslp_header.length;
-
- if (slpmsg->offset < real_size)
- {
- msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
- }
- else
- {
- /* The whole message has been sent */
- if (slpmsg->flags == 0x20 || slpmsg->flags == 0x1000030)
- {
- if (slpmsg->slpcall != NULL)
- {
- if (slpmsg->slpcall->cb)
- slpmsg->slpcall->cb(slpmsg->slpcall,
- NULL, 0);
- }
- }
- }
-
- slpmsg->msgs = g_list_remove(slpmsg->msgs, msg);
-}
-
-/* We have received the message nak. */
-static void
-msg_nak(MsnMessage *msg, void *data)
-{
- MsnSlpMessage *slpmsg;
-
- slpmsg = data;
-
- msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
-
- slpmsg->msgs = g_list_remove(slpmsg->msgs, msg);
-}
-
-void
msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
{
MsnMessage *msg;
@@ -353,6 +304,53 @@ msn_slplink_send_msgpart(MsnSlpLink *slp
/* slpmsg->offset += len; */
}
+/* We have received the message ack */
+static void
+msg_ack(MsnMessage *msg, void *data)
+{
+ MsnSlpMessage *slpmsg;
+ long long real_size;
+
+ slpmsg = data;
+
+ real_size = (slpmsg->flags == 0x2) ? 0 : slpmsg->size;
+
+ slpmsg->offset += msg->msnslp_header.length;
+
+ if (slpmsg->offset < real_size)
+ {
+ msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
+ }
+ else
+ {
+ /* The whole message has been sent */
+ if (slpmsg->flags == 0x20 || slpmsg->flags == 0x1000030)
+ {
+ if (slpmsg->slpcall != NULL)
+ {
+ if (slpmsg->slpcall->cb)
+ slpmsg->slpcall->cb(slpmsg->slpcall,
+ NULL, 0);
+ }
+ }
+ }
+
+ slpmsg->msgs = g_list_remove(slpmsg->msgs, msg);
+}
+
+/* We have received the message nak. */
+static void
+msg_nak(MsnMessage *msg, void *data)
+{
+ MsnSlpMessage *slpmsg;
+
+ slpmsg = data;
+
+ msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
+
+ slpmsg->msgs = g_list_remove(slpmsg->msgs, msg);
+}
+
void
msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
{
More information about the Commits
mailing list