/soc/2013/ashmew2/filetransferX: a1e4f74fb618: Fixed compile err...
Ashish Gupta
ashmew2 at gmail.com
Tue Sep 10 05:42:07 EDT 2013
Changeset: a1e4f74fb61885dcbd3b0051ac8c73feedddb9fb
Author: Ashish Gupta <ashmew2 at gmail.com>
Date: 2013-09-10 15:11 +0530
Branch: filetransferX
URL: https://hg.pidgin.im/soc/2013/ashmew2/filetransferX/rev/a1e4f74fb618
Description:
Fixed compile error(s)
diffstat:
libpurple/protocols/jabber/google/google_session.c | 90 +++++++++++-----------
1 files changed, 45 insertions(+), 45 deletions(-)
diffs (108 lines):
diff --git a/libpurple/protocols/jabber/google/google_session.c b/libpurple/protocols/jabber/google/google_session.c
--- a/libpurple/protocols/jabber/google/google_session.c
+++ b/libpurple/protocols/jabber/google/google_session.c
@@ -2050,59 +2050,59 @@ void cb_nice_component_state_changed(Nic
share_session->agent_state = state;
- purple_debug_info("google_session", "State of NiceAgent Changed : [%d]%s.Stream ID: %d\n", state, nice_component_state_to_str(state), stream_id);
+ purple_debug_info("google_session", "State of NiceAgent Changed : [%d]%s.Stream ID: %d\n",
+ state, nice_component_state_to_str(state), stream_id);
+
if(state != NICE_COMPONENT_STATE_READY) {
purple_debug_info("google_session", "Not READY_, returning from state_changed..\n");
return;
}
-
- if(purple_xfer_get_type(share_session->xfer) == PURPLE_XFER_SEND) {
- GSList *remote_candids = nice_agent_get_remote_candidates(agent, stream_id, component_id);
- GSList *local_candids = nice_agent_get_local_candidates(agent, stream_id, component_id);
- NiceCandidate *rcand, *lcand;
- gchar *temp = g_malloc(NICE_ADDRESS_STRING_LEN + 1);
-
- nice_agent_get_selected_pair(share_session->share_agent, share_session->stream_id, 1,
- &lcand, &rcand);
-
- purple_debug_info("google_session", "Selected Candidates : \n**********\n");
- nice_address_to_string(&lcand->addr, temp);
- purple_debug_info("google_session", "LOCAL CAND : IP: %s, Port:%u\n",temp,nice_address_get_port(&lcand->addr));
- nice_address_to_string(&rcand->addr, temp);
- purple_debug_info("google_session", "REMOTE CAN : IP: %s, Port:%u\n",temp,nice_address_get_port(&rcand->addr));
+
+ GSList *remote_candids = nice_agent_get_remote_candidates(agent, stream_id, component_id);
+ GSList *local_candids = nice_agent_get_local_candidates(agent, stream_id, component_id);
+ NiceCandidate *rcand, *lcand;
+ gchar *temp = g_malloc(NICE_ADDRESS_STRING_LEN + 1);
+
+ nice_agent_get_selected_pair(share_session->share_agent, share_session->stream_id, 1,
+ &lcand, &rcand);
+
+ purple_debug_info("google_session", "Selected Candidates : \n**********\n");
+ nice_address_to_string(&lcand->addr, temp);
+ purple_debug_info("google_session", "LOCAL CAND : IP: %s, Port:%u\n",temp, nice_address_get_port(&lcand->addr));
+ nice_address_to_string(&rcand->addr, temp);
+ purple_debug_info("google_session", "REMOTE CAN : IP: %s, Port:%u\n",temp ,nice_address_get_port(&rcand->addr));
- g_free(temp);
+ g_free(temp);
- purple_debug_info("google_session", "List of remote candidates : \n********\n");
+ purple_debug_info("google_session", "List of remote candidates : \n********\n");
- while(remote_candids) {
- gchar *ip = g_malloc(NICE_ADDRESS_STRING_LEN + 1);
- NiceCandidate *c = (NiceCandidate *)remote_candids->data;
- nice_address_to_string(&c->addr, ip);
-
- purple_debug_info("google_session", "IP: %s, Port:%u\n",ip,nice_address_get_port(&c->addr));
- remote_candids = remote_candids->next;
- }
- purple_debug_info("google_session", "***********\n");
-
- purple_debug_info("google_session", "List of local candidates : \n********\n");
- while(local_candids) {
- gchar *ip = g_malloc(NICE_ADDRESS_STRING_LEN + 1);
- NiceCandidate *c = (NiceCandidate *)local_candids->data;
- nice_address_to_string(&c->addr, ip);
-
- purple_debug_info("google_session", "IP: %s, Port:%u\n",ip,nice_address_get_port(&c->addr));
- local_candids = local_candids->next;
- }
- purple_debug_info("google_session", "***********\n");
+ while(remote_candids) {
+ gchar *ip = g_malloc(NICE_ADDRESS_STRING_LEN + 1);
+ NiceCandidate *c = (NiceCandidate *)remote_candids->data;
+ nice_address_to_string(&c->addr, ip);
+
+ purple_debug_info("google_session", "IP: %s, Port:%u\n",ip,nice_address_get_port(&c->addr));
+ remote_candids = remote_candids->next;
+ }
+ purple_debug_info("google_session", "***********\n");
+
+ purple_debug_info("google_session", "List of local candidates : \n********\n");
+ while(local_candids) {
+ gchar *ip = g_malloc(NICE_ADDRESS_STRING_LEN + 1);
+ NiceCandidate *c = (NiceCandidate *)local_candids->data;
+ nice_address_to_string(&c->addr, ip);
+
+ purple_debug_info("google_session", "IP: %s, Port:%u\n",ip,nice_address_get_port(&c->addr));
+ local_candids = local_candids->next;
+ }
+ purple_debug_info("google_session", "***********\n");
-
-
- if(share_session->channel_state == GTALK_XFER_CHANNEL_HTTP_OK_SENT) {
- share_session->channel_state = GTALK_XFER_CHANNEL_HTTP_SENDING;
- cb_nice_component_writable(share_session->share_agent, share_session->stream_id,
- 1, share_session);
- }
+
+ if(purple_xfer_get_type(share_session->xfer) == PURPLE_XFER_SEND &&
+ share_session->channel_state == GTALK_XFER_CHANNEL_HTTP_OK_SENT) {
+ share_session->channel_state = GTALK_XFER_CHANNEL_HTTP_SENDING;
+ cb_nice_component_writable(share_session->share_agent, share_session->stream_id,
+ 1, share_session);
}
if(state == NICE_COMPONENT_STATE_READY &&
More information about the Commits
mailing list