pidgin: fc62941d: Convert simple prpl to use accessor func...
andrew.victor at mxit.com
andrew.victor at mxit.com
Mon Aug 29 18:51:04 EDT 2011
----------------------------------------------------------------------
Revision: fc62941dcd5aba26a119f4cd53479ea9f3e51ffb
Parent: e008717fab810d3ba4e37c6a6c864101af9b523b
Author: andrew.victor at mxit.com
Date: 08/29/11 18:33:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fc62941dcd5aba26a119f4cd53479ea9f3e51ffb
Changelog:
Convert simple prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Changes against parent e008717fab810d3ba4e37c6a6c864101af9b523b
patched libpurple/protocols/simple/simple.c
-------------- next part --------------
============================================================
--- libpurple/protocols/simple/simple.c 2f073d2b31def0b301a975251323f25bde18be00
+++ libpurple/protocols/simple/simple.c 5451935b1fd28ba8643e88d7422c713585670784
@@ -67,7 +67,7 @@ static void simple_keep_alive(PurpleConn
}
static void simple_keep_alive(PurpleConnection *gc) {
- struct simple_account_data *sip = gc->proto_data;
+ struct simple_account_data *sip = purple_connection_get_protocol_data(gc);
if(sip->udp) { /* in case of UDP send a packet only with a 0 byte to
remain in the NAT table */
gchar buf[2] = {0, 0};
@@ -100,14 +100,15 @@ static void simple_set_status(PurpleAcco
}
static void simple_set_status(PurpleAccount *account, PurpleStatus *status) {
+ PurpleConnection *gc = purple_account_get_connection(account);
PurpleStatusPrimitive primitive = purple_status_type_get_primitive(purple_status_get_type(status));
struct simple_account_data *sip = NULL;
if (!purple_status_is_active(status))
return;
- if (account->gc)
- sip = account->gc->proto_data;
+ if (gc)
+ sip = purple_connection_get_protocol_data(gc);
if (sip)
{
@@ -194,7 +195,7 @@ static void simple_add_buddy(PurpleConne
static void simple_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
{
- struct simple_account_data *sip = (struct simple_account_data *)gc->proto_data;
+ struct simple_account_data *sip = purple_connection_get_protocol_data(gc);
struct simple_buddy *b;
const char *name = purple_buddy_get_name(buddy);
if(strncmp(name, "sip:", 4)) {
@@ -231,7 +232,7 @@ static void simple_remove_buddy(PurpleCo
static void simple_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
{
const char *name = purple_buddy_get_name(buddy);
- struct simple_account_data *sip = (struct simple_account_data *)gc->proto_data;
+ struct simple_account_data *sip = purple_connection_get_protocol_data(gc);
struct simple_buddy *b = g_hash_table_lookup(sip->buddies, name);
g_hash_table_remove(sip->buddies, name);
g_free(b->name);
@@ -412,7 +413,7 @@ static void simple_canwrite_cb(gpointer
static void simple_canwrite_cb(gpointer data, gint source, PurpleInputCondition cond) {
PurpleConnection *gc = data;
- struct simple_account_data *sip = gc->proto_data;
+ struct simple_account_data *sip = purple_connection_get_protocol_data(gc);
gsize max_write;
gssize written;
@@ -457,7 +458,7 @@ static void send_later_cb(gpointer data,
return;
}
- sip = gc->proto_data;
+ sip = purple_connection_get_protocol_data(gc);
sip->fd = source;
sip->connecting = FALSE;
@@ -474,7 +475,7 @@ static void sendlater(PurpleConnection *
static void sendlater(PurpleConnection *gc, const char *buf) {
- struct simple_account_data *sip = gc->proto_data;
+ struct simple_account_data *sip = purple_connection_get_protocol_data(gc);
if(!sip->connecting) {
purple_debug_info("simple", "connecting to %s port %d\n", sip->realhostname ? sip->realhostname : "{NULL}", sip->realport);
@@ -491,7 +492,7 @@ static void sendout_pkt(PurpleConnection
}
static void sendout_pkt(PurpleConnection *gc, const char *buf) {
- struct simple_account_data *sip = gc->proto_data;
+ struct simple_account_data *sip = purple_connection_get_protocol_data(gc);
time_t currtime = time(NULL);
int writelen = strlen(buf);
@@ -629,7 +630,7 @@ static void send_sip_request(PurpleConne
static void send_sip_request(PurpleConnection *gc, const gchar *method,
const gchar *url, const gchar *to, const gchar *addheaders,
const gchar *body, struct sip_dialog *dialog, TransCallback tc) {
- struct simple_account_data *sip = gc->proto_data;
+ struct simple_account_data *sip = purple_connection_get_protocol_data(gc);
char *callid = dialog ? g_strdup(dialog->callid) : gencallid();
char *auth = NULL;
const char *addh = "";
@@ -1026,7 +1027,7 @@ static int simple_im_send(PurpleConnecti
}
static int simple_im_send(PurpleConnection *gc, const char *who, const char *what, PurpleMessageFlags flags) {
- struct simple_account_data *sip = gc->proto_data;
+ struct simple_account_data *sip = purple_connection_get_protocol_data(gc);
char *to = g_strdup(who);
char *text = purple_unescape_html(what);
simple_send_message(sip, to, text, NULL);
@@ -1285,7 +1286,7 @@ static unsigned int simple_typing(Purple
}
static unsigned int simple_typing(PurpleConnection *gc, const char *name, PurpleTypingState state) {
- struct simple_account_data *sip = gc->proto_data;
+ struct simple_account_data *sip = purple_connection_get_protocol_data(gc);
gchar *xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<isComposing xmlns=\"urn:ietf:params:xml:ns:im-iscomposing\"\n"
@@ -1661,7 +1662,7 @@ static void simple_udp_process(gpointer
static void simple_udp_process(gpointer data, gint source, PurpleInputCondition con) {
PurpleConnection *gc = data;
- struct simple_account_data *sip = gc->proto_data;
+ struct simple_account_data *sip = purple_connection_get_protocol_data(gc);
struct sipmsg *msg;
int len;
time_t currtime = time(NULL);
@@ -1681,7 +1682,7 @@ static void simple_input_cb(gpointer dat
static void simple_input_cb(gpointer data, gint source, PurpleInputCondition cond)
{
PurpleConnection *gc = data;
- struct simple_account_data *sip = gc->proto_data;
+ struct simple_account_data *sip = purple_connection_get_protocol_data(gc);
int len;
struct sip_connection *conn = connection_find(sip, source);
if(!conn) {
@@ -1714,7 +1715,7 @@ static void simple_newconn_cb(gpointer d
/* Callback for new connections on incoming TCP port */
static void simple_newconn_cb(gpointer data, gint source, PurpleInputCondition cond) {
PurpleConnection *gc = data;
- struct simple_account_data *sip = gc->proto_data;
+ struct simple_account_data *sip = purple_connection_get_protocol_data(gc);
struct sip_connection *conn;
int newfd, flags;
@@ -1745,7 +1746,7 @@ static void login_cb(gpointer data, gint
return;
}
- sip = gc->proto_data;
+ sip = purple_connection_get_protocol_data(gc);
sip->fd = source;
conn = connection_create(sip, source);
@@ -1930,7 +1931,8 @@ static void simple_login(PurpleAccount *
return;
}
- gc->proto_data = sip = g_new0(struct simple_account_data, 1);
+ sip = g_new0(struct simple_account_data, 1);
+ purple_connection_set_protocol_data(gc, sip);
sip->gc = gc;
sip->fd = -1;
sip->listenfd = -1;
@@ -1974,7 +1976,7 @@ static void simple_close(PurpleConnectio
static void simple_close(PurpleConnection *gc)
{
- struct simple_account_data *sip = gc->proto_data;
+ struct simple_account_data *sip = purple_connection_get_protocol_data(gc);
if (!sip)
return;
@@ -2039,7 +2041,7 @@ static void simple_close(PurpleConnectio
g_free(sip->realhostname);
g_free(sip);
- gc->proto_data = NULL;
+ purple_connection_set_protocol_data(gc, NULL);
}
static PurplePluginProtocolInfo prpl_info =
More information about the Commits
mailing list