pidgin: 337b6cdd: Convert silc prpl to use accessor functi...
andrew.victor at mxit.com
andrew.victor at mxit.com
Tue Aug 30 18:26:03 EDT 2011
----------------------------------------------------------------------
Revision: 337b6cddc285ca1f22c4ddccba894c91eb71b94f
Parent: 1a0eddcf7811c7861cb174dfec535099de940b7d
Author: andrew.victor at mxit.com
Date: 08/30/11 16:21:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/337b6cddc285ca1f22c4ddccba894c91eb71b94f
Changelog:
Convert silc prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Changes against parent 1a0eddcf7811c7861cb174dfec535099de940b7d
patched libpurple/protocols/silc/buddy.c
patched libpurple/protocols/silc/chat.c
patched libpurple/protocols/silc/ft.c
patched libpurple/protocols/silc/ops.c
patched libpurple/protocols/silc/pk.c
patched libpurple/protocols/silc/silc.c
patched libpurple/protocols/silc/wb.c
-------------- next part --------------
============================================================
--- libpurple/protocols/silc/buddy.c f1de313190053bd43d1dad332cdb0df703822fa9
+++ libpurple/protocols/silc/buddy.c 3f7370a9a9a7617656682f0e21d76bad0e83f470
@@ -72,7 +72,7 @@ silcpurple_buddy_keyagr_cb(SilcClient cl
void *context)
{
PurpleConnection *gc = client->application;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
if (!sg->conn)
return;
@@ -146,7 +146,7 @@ silcpurple_buddy_keyagr_do(PurpleConnect
silcpurple_buddy_keyagr_do(PurpleConnection *gc, const char *name,
gboolean force_local)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcDList clients;
SilcClientEntry client_entry;
SilcClientConnectionParams params;
@@ -346,7 +346,7 @@ silcpurple_buddy_resetkey(PurpleBlistNod
b = (PurpleBuddy *) node;
gc = purple_account_get_connection(purple_buddy_get_account(b));
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
/* Find client entry */
clients = silc_client_get_clients_local(sg->client, sg->conn,
@@ -426,7 +426,7 @@ silcpurple_buddy_privkey(PurpleConnectio
static void
silcpurple_buddy_privkey(PurpleConnection *gc, const char *name)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcPurplePrivkey p;
SilcDList clients;
SilcClientEntry client_entry;
@@ -554,7 +554,7 @@ silcpurple_buddy_getkey(PurpleConnection
static void
silcpurple_buddy_getkey(PurpleConnection *gc, const char *name)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
SilcClientEntry client_entry;
@@ -618,7 +618,7 @@ silcpurple_buddy_showkey(PurpleBlistNode
b = (PurpleBuddy *) node;
gc = purple_account_get_connection(purple_buddy_get_account(b));
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
pkfile = purple_blist_node_get_string(node, "public-key");
if (!silc_pkcs_load_public_key(pkfile, &public_key)) {
@@ -669,7 +669,7 @@ void silcpurple_get_info(PurpleConnectio
void silcpurple_get_info(PurpleConnection *gc, const char *who)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
SilcClientEntry client_entry;
@@ -1338,7 +1338,7 @@ silcpurple_add_buddy_i(PurpleConnection
static void
silcpurple_add_buddy_i(PurpleConnection *gc, PurpleBuddy *b, gboolean init)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
SilcPurpleBuddyRes r;
@@ -1437,7 +1437,7 @@ void silcpurple_idle_set(PurpleConnectio
const char *server;
int port;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (sg == NULL)
return;
@@ -1467,7 +1467,7 @@ char *silcpurple_status_text(PurpleBuddy
{
PurpleAccount *account = purple_buddy_get_account(b);
PurpleConnection *gc = purple_account_get_connection(account);
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
SilcClientID *client_id = purple_buddy_get_protocol_data(b);
@@ -1533,7 +1533,7 @@ void silcpurple_tooltip_text(PurpleBuddy
{
PurpleAccount *account = purple_buddy_get_account(b);
PurpleConnection *gc = purple_account_get_connection(account);
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
SilcClientID *client_id = purple_buddy_get_protocol_data(b);
@@ -1629,7 +1629,7 @@ silcpurple_buddy_kill(PurpleBlistNode *n
b = (PurpleBuddy *) node;
gc = purple_account_get_connection(purple_buddy_get_account(b));
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
/* Call KILL */
silc_client_command_call(sg->client, sg->conn, NULL, "KILL",
@@ -1653,7 +1653,7 @@ GList *silcpurple_buddy_menu(PurpleBuddy
{
PurpleAccount *account = purple_buddy_get_account(buddy);
PurpleConnection *gc = purple_account_get_connection(account);
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClientConnection conn = sg->conn;
const char *pkfile = NULL;
SilcClientEntry client_entry = NULL;
@@ -1719,7 +1719,7 @@ void silcpurple_buddy_set_icon(PurpleCon
void silcpurple_buddy_set_icon(PurpleConnection *gc, PurpleStoredImage *img)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
SilcMime mime;
============================================================
--- libpurple/protocols/silc/chat.c 7a9bb661f1cd3c21884939c66c39458b27cdeff5
+++ libpurple/protocols/silc/chat.c c385b245c4e25af9e2613574f77b1f5f7684b66f
@@ -91,7 +91,7 @@ silcpurple_chat_getinfo(PurpleConnection
static void
silcpurple_chat_getinfo(PurpleConnection *gc, GHashTable *components)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
const char *chname;
char tmp[256], *tmp2;
GString *s;
@@ -500,7 +500,7 @@ silcpurple_chat_chauth(PurpleBlistNode *
chat = (PurpleChat *) node;
gc = purple_account_get_connection(purple_chat_get_account(chat));
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
silc_client_command_call(sg->client, sg->conn, NULL, "CMODE",
g_hash_table_lookup(purple_chat_get_components(chat), "channel"),
@@ -587,7 +587,7 @@ silcpurple_chat_prv(PurpleBlistNode *nod
chat = (PurpleChat *) node;
gc = purple_account_get_connection(purple_chat_get_account(chat));
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
p = silc_calloc(1, sizeof(*p));
if (!p)
@@ -637,7 +637,7 @@ silcpurple_chat_permanent_reset(PurpleBl
chat = (PurpleChat *) node;
gc = purple_account_get_connection(purple_chat_get_account(chat));
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
silc_client_command_call(sg->client, sg->conn, NULL, "CMODE",
g_hash_table_lookup(purple_chat_get_components(chat), "channel"),
@@ -656,7 +656,7 @@ silcpurple_chat_permanent(PurpleBlistNod
chat = (PurpleChat *) node;
gc = purple_account_get_connection(purple_chat_get_account(chat));
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (!sg->conn)
return;
@@ -733,7 +733,7 @@ silcpurple_chat_ulimit(PurpleBlistNode *
chat = (PurpleChat *) node;
gc = purple_account_get_connection(purple_chat_get_account(chat));
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (!sg->conn)
return;
@@ -768,7 +768,7 @@ silcpurple_chat_resettopic(PurpleBlistNo
chat = (PurpleChat *) node;
gc = purple_account_get_connection(purple_chat_get_account(chat));
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
silc_client_command_call(sg->client, sg->conn, NULL, "CMODE",
g_hash_table_lookup(purple_chat_get_components(chat), "channel"),
@@ -786,7 +786,7 @@ silcpurple_chat_settopic(PurpleBlistNode
chat = (PurpleChat *) node;
gc = purple_account_get_connection(purple_chat_get_account(chat));
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
silc_client_command_call(sg->client, sg->conn, NULL, "CMODE",
g_hash_table_lookup(purple_chat_get_components(chat), "channel"),
@@ -804,7 +804,7 @@ silcpurple_chat_resetprivate(PurpleBlist
chat = (PurpleChat *) node;
gc = purple_account_get_connection(purple_chat_get_account(chat));
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
silc_client_command_call(sg->client, sg->conn, NULL, "CMODE",
g_hash_table_lookup(purple_chat_get_components(chat), "channel"),
@@ -822,7 +822,7 @@ silcpurple_chat_setprivate(PurpleBlistNo
chat = (PurpleChat *) node;
gc = purple_account_get_connection(purple_chat_get_account(chat));
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
silc_client_command_call(sg->client, sg->conn, NULL, "CMODE",
g_hash_table_lookup(purple_chat_get_components(chat), "channel"),
@@ -840,7 +840,7 @@ silcpurple_chat_resetsecret(PurpleBlistN
chat = (PurpleChat *) node;
gc = purple_account_get_connection(purple_chat_get_account(chat));
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
silc_client_command_call(sg->client, sg->conn, NULL, "CMODE",
g_hash_table_lookup(purple_chat_get_components(chat), "channel"),
@@ -858,7 +858,7 @@ silcpurple_chat_setsecret(PurpleBlistNod
chat = (PurpleChat *) node;
gc = purple_account_get_connection(purple_chat_get_account(chat));
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
silc_client_command_call(sg->client, sg->conn, NULL, "CMODE",
g_hash_table_lookup(purple_chat_get_components(chat), "channel"),
@@ -882,7 +882,7 @@ GList *silcpurple_chat_menu(PurpleChat *
{
GHashTable *components = purple_chat_get_components(chat);
PurpleConnection *gc = purple_account_get_connection(purple_chat_get_account(chat));
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClientConnection conn = sg->conn;
const char *chname = NULL;
SilcChannelEntry channel = NULL;
@@ -1020,7 +1020,7 @@ void silcpurple_chat_join(PurpleConnecti
void silcpurple_chat_join(PurpleConnection *gc, GHashTable *data)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
const char *channel, *passphrase, *parentch;
@@ -1103,7 +1103,7 @@ void silcpurple_chat_invite(PurpleConnec
void silcpurple_chat_invite(PurpleConnection *gc, int id, const char *msg,
const char *name)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
SilcHashTableList htl;
@@ -1148,7 +1148,7 @@ void silcpurple_chat_leave(PurpleConnect
void silcpurple_chat_leave(PurpleConnection *gc, int id)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
SilcHashTableList htl;
@@ -1218,7 +1218,7 @@ int silcpurple_chat_send(PurpleConnectio
int silcpurple_chat_send(PurpleConnection *gc, int id, const char *msg,
PurpleMessageFlags msgflags)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
SilcHashTableList htl;
@@ -1340,7 +1340,7 @@ void silcpurple_chat_set_topic(PurpleCon
void silcpurple_chat_set_topic(PurpleConnection *gc, int id, const char *topic)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
SilcHashTableList htl;
@@ -1384,7 +1384,7 @@ PurpleRoomlist *silcpurple_roomlist_get_
PurpleRoomlist *silcpurple_roomlist_get_list(PurpleConnection *gc)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
GList *fields = NULL;
@@ -1425,7 +1425,7 @@ void silcpurple_roomlist_cancel(PurpleRo
if (!gc)
return;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
purple_roomlist_set_in_progress(list, FALSE);
if (sg->roomlist == list) {
============================================================
--- libpurple/protocols/silc/ft.c baa1ff73e14fbdb27a152b98dea15175c8401b41
+++ libpurple/protocols/silc/ft.c 54a6c55e35d7bae46b6ec3d2e87160524e8f7a7d
@@ -309,7 +309,7 @@ void silcpurple_ftp_request(SilcClient c
const char *hostname, SilcUInt16 port)
{
PurpleConnection *gc = client->application;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcPurpleXfer xfer;
xfer = silc_calloc(1, sizeof(*xfer));
@@ -434,7 +434,7 @@ PurpleXfer *silcpurple_ftp_new_xfer(Purp
PurpleXfer *silcpurple_ftp_new_xfer(PurpleConnection *gc, const char *name)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
SilcDList clients;
============================================================
--- libpurple/protocols/silc/ops.c ebfa3b56a12fe493cd9c109896cc607b49466f33
+++ libpurple/protocols/silc/ops.c 48eae1825429bc703058e30a8009307d63839092
@@ -88,7 +88,7 @@ silcpurple_mime_message(SilcClient clien
gboolean recursive)
{
PurpleConnection *gc = client->application;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
const char *type;
const unsigned char *data;
SilcUInt32 data_len;
@@ -264,7 +264,7 @@ silc_channel_message(SilcClient client,
SilcUInt32 message_len)
{
PurpleConnection *gc = client->application;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
PurpleConversation *convo = NULL;
char *msg, *tmp;
@@ -354,7 +354,7 @@ silc_private_message(SilcClient client,
SilcUInt32 message_len)
{
PurpleConnection *gc = client->application;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
PurpleConversation *convo = NULL;
char *msg, *tmp;
@@ -431,7 +431,7 @@ silc_notify(SilcClient client, SilcClien
{
va_list va;
PurpleConnection *gc = client->application;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
PurpleAccount *account = purple_connection_get_account(gc);
PurpleConversation *convo;
SilcClientEntry client_entry, client_entry2;
@@ -941,7 +941,7 @@ silc_command(SilcClient client, SilcClie
SilcUInt32 argc, unsigned char **argv)
{
PurpleConnection *gc = client->application;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
switch (command) {
@@ -1078,7 +1078,7 @@ silc_command_reply(SilcClient client, Si
SilcStatus error, va_list ap)
{
PurpleConnection *gc = client->application;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
PurpleConversation *convo;
switch (command) {
@@ -1724,7 +1724,7 @@ silc_get_auth_method(SilcClient client,
SilcGetAuthMeth completion, void *context)
{
PurpleConnection *gc = client->application;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcPurpleAskPassphrase internal;
const char *password;
@@ -1775,7 +1775,7 @@ silc_verify_public_key(SilcClient client
SilcVerifyPublicKey completion, void *context)
{
PurpleConnection *gc = client->application;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
if (!sg->conn && (conn_type == SILC_CONN_SERVER ||
conn_type == SILC_CONN_ROUTER)) {
============================================================
--- libpurple/protocols/silc/pk.c 124760e306d7f6f8021b7be37b9d41eeadefe022
+++ libpurple/protocols/silc/pk.c f14d90e29e609b83d577c5139eae71ee18830da9
@@ -79,7 +79,7 @@ static void silcpurple_verify_details(Pu
static void silcpurple_verify_details(PublicKeyVerify verify, gint id)
{
PurpleConnection *gc = verify->client->application;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
silcpurple_show_public_key(sg, verify->entity_name, verify->public_key,
G_CALLBACK(silcpurple_verify_details_cb),
============================================================
--- libpurple/protocols/silc/silc.c d521e3cf8c4cf75b4e8ffc1e6af24bb4c3ae4307
+++ libpurple/protocols/silc/silc.c 223ebb9cb5a6948122dfc744ed8405fac4a793b9
@@ -78,7 +78,7 @@ silcpurple_set_status(PurpleAccount *acc
const char *state;
if (gc != NULL)
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (status == NULL)
return;
@@ -125,7 +125,7 @@ silcpurple_keepalive(PurpleConnection *g
static void
silcpurple_keepalive(PurpleConnection *gc)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
silc_packet_send(sg->conn->stream, SILC_PACKET_HEARTBEAT, 0,
NULL, 0);
}
@@ -180,7 +180,7 @@ silcpurple_scheduler(SilcSchedule schedu
{
SilcClient client = (SilcClient)context;
PurpleConnection *gc = client->application;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcPurpleTask ptask = NULL;
if (added) {
@@ -252,7 +252,7 @@ silcpurple_connect_cb(SilcClient client,
struct utsname u;
#endif
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
switch (status) {
case SILC_CLIENT_CONN_SUCCESS:
@@ -367,7 +367,7 @@ silcpurple_stream_created(SilcSocketStre
SilcClientConnectionParams params;
const char *dfile;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (status != SILC_SOCKET_OK) {
purple_connection_error(gc,
@@ -376,7 +376,7 @@ silcpurple_stream_created(SilcSocketStre
silc_pkcs_public_key_free(sg->public_key);
silc_pkcs_private_key_free(sg->private_key);
silc_free(sg);
- gc->proto_data = NULL;
+ purple_connection_set_protocol_data(gc, NULL);
return;
}
@@ -415,7 +415,7 @@ silcpurple_login_connected(gpointer data
g_return_if_fail(gc != NULL);
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (source < 0) {
purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
@@ -423,7 +423,7 @@ silcpurple_login_connected(gpointer data
silc_pkcs_public_key_free(sg->public_key);
silc_pkcs_private_key_free(sg->private_key);
silc_free(sg);
- gc->proto_data = NULL;
+ purple_connection_set_protocol_data(gc, NULL);
return;
}
@@ -449,7 +449,7 @@ static void silcpurple_continue_running(
{
purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
_("Unable to connect"));
- gc->proto_data = NULL;
+ purple_connection_set_protocol_data(gc, NULL);
silc_free(sg);
return;
}
@@ -457,7 +457,7 @@ static void silcpurple_got_password_cb(P
static void silcpurple_got_password_cb(PurpleConnection *gc, PurpleRequestFields *fields)
{
- SilcPurple sg = (SilcPurple)gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
PurpleAccount *account = purple_connection_get_account(gc);
char pkd[256], prd[256];
const char *password;
@@ -473,7 +473,7 @@ static void silcpurple_got_password_cb(P
if (!password || !*password)
{
purple_notify_error(gc, NULL, _("Password is required to sign on."), NULL);
- gc->proto_data = NULL;
+ purple_connection_set_protocol_data(gc, NULL);
silc_free(sg);
return;
}
@@ -492,7 +492,7 @@ static void silcpurple_got_password_cb(P
&sg->public_key, &sg->private_key)) {
purple_connection_error(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
_("Unable to load SILC key pair"));
- gc->proto_data = NULL;
+ purple_connection_set_protocol_data(gc, NULL);
silc_free(sg);
return;
}
@@ -505,10 +505,10 @@ static void silcpurple_no_password_cb(Pu
/* The password prompt dialog doesn't get disposed if the account disconnects */
if (!PURPLE_CONNECTION_IS_VALID(gc))
return;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
purple_connection_error(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
_("Unable to load SILC key pair"));
- gc->proto_data = NULL;
+ purple_connection_set_protocol_data(gc, NULL);
silc_free(sg);
}
@@ -537,7 +537,7 @@ static void silcpurple_running(SilcClien
}
purple_connection_error(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
_("Unable to load SILC key pair"));
- gc->proto_data = NULL;
+ purple_connection_set_protocol_data(gc, NULL);
silc_free(sg);
return;
}
@@ -558,7 +558,7 @@ silcpurple_login(PurpleAccount *account)
gc = account->gc;
if (!gc)
return;
- gc->proto_data = NULL;
+ purple_connection_set_protocol_data(gc, NULL);
memset(¶ms, 0, sizeof(params));
strcat(params.nickname_format, "%n#a");
@@ -612,14 +612,14 @@ silcpurple_login(PurpleAccount *account)
sg->client = client;
sg->gc = gc;
sg->account = account;
- gc->proto_data = sg;
+ purple_connection_set_protocol_data(gc, sg);
/* Init SILC client */
if (!silc_client_init(client, username, hostname, realname,
silcpurple_running, sg)) {
purple_connection_error(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
_("Unable to initialize SILC protocol"));
- gc->proto_data = NULL;
+ purple_connection_set_protocol_data(gc, NULL);
silc_free(sg);
silc_free(hostname);
g_free(username);
@@ -632,7 +632,7 @@ silcpurple_login(PurpleAccount *account)
if (!silcpurple_check_silc_dir(gc)) {
purple_connection_error(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
_("Error loading SILC key pair"));
- gc->proto_data = NULL;
+ purple_connection_set_protocol_data(gc, NULL);
silc_free(sg);
return;
}
@@ -669,7 +669,7 @@ silcpurple_close(PurpleConnection *gc)
static void
silcpurple_close(PurpleConnection *gc)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
#if __SILC_TOOLKIT_VERSION >= SILC_VERSION(1,1,1)
SilcPurpleTask task;
#endif /* __SILC_TOOLKIT_VERSION */
@@ -733,7 +733,7 @@ silcpurple_attrs_cb(PurpleConnection *gc
static void
silcpurple_attrs_cb(PurpleConnection *gc, PurpleRequestFields *fields)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
PurpleRequestField *f;
@@ -744,7 +744,7 @@ silcpurple_attrs_cb(PurpleConnection *gc
SilcVCardStruct vcard;
const char *val;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (!sg)
return;
@@ -905,7 +905,7 @@ silcpurple_attrs(PurplePluginAction *act
silcpurple_attrs(PurplePluginAction *action)
{
PurpleConnection *gc = (PurpleConnection *) action->context;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
PurpleRequestFields *fields;
@@ -922,7 +922,7 @@ silcpurple_attrs(PurplePluginAction *act
gboolean device = TRUE;
char status[1024], tz[16];
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (!sg)
return;
@@ -1072,7 +1072,7 @@ silcpurple_detach(PurplePluginAction *ac
if (!gc)
return;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (!sg)
return;
@@ -1090,7 +1090,7 @@ silcpurple_view_motd(PurplePluginAction
if (!gc)
return;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (!sg)
return;
@@ -1125,7 +1125,7 @@ silcpurple_create_keypair_cb(PurpleConne
int keylen = SILCPURPLE_DEF_PKCS_LEN;
SilcPublicKey public_key;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (!sg)
return;
@@ -1208,7 +1208,7 @@ silcpurple_create_keypair(PurplePluginAc
silcpurple_create_keypair(PurplePluginAction *action)
{
PurpleConnection *gc = (PurpleConnection *) action->context;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
PurpleRequestFields *fields;
PurpleRequestFieldGroup *g;
PurpleRequestField *f;
@@ -1356,7 +1356,7 @@ silcpurple_send_im_resolved(SilcClient c
void *context)
{
PurpleConnection *gc = client->application;
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcPurpleIM im = context;
PurpleConversation *convo;
char tmp[256];
@@ -1433,7 +1433,7 @@ silcpurple_send_im(PurpleConnection *gc,
silcpurple_send_im(PurpleConnection *gc, const char *who, const char *message,
PurpleMessageFlags flags)
{
- SilcPurple sg = gc->proto_data;
+ SilcPurple sg = purple_connection_get_protocol_data(gc);
SilcClient client = sg->client;
SilcClientConnection conn = sg->conn;
SilcDList clients;
@@ -1718,7 +1718,7 @@ static PurpleCmdRet silcpurple_cmd_motd(
if (gc == NULL)
return PURPLE_CMD_RET_FAILED;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (sg == NULL)
return PURPLE_CMD_RET_FAILED;
@@ -1747,7 +1747,7 @@ static PurpleCmdRet silcpurple_cmd_detac
if (gc == NULL)
return PURPLE_CMD_RET_FAILED;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (sg == NULL)
return PURPLE_CMD_RET_FAILED;
@@ -1769,10 +1769,10 @@ static PurpleCmdRet silcpurple_cmd_cmode
gc = purple_conversation_get_gc(conv);
- if (gc == NULL || !args || gc->proto_data == NULL)
+ if (gc == NULL || !args || purple_connection_get_protocol_data(gc) == NULL)
return PURPLE_CMD_RET_FAILED;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (args[0])
chname = args[0];
@@ -1823,7 +1823,7 @@ static PurpleCmdRet silcpurple_cmd_gener
if (gc == NULL)
return PURPLE_CMD_RET_FAILED;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (sg == NULL)
return PURPLE_CMD_RET_FAILED;
@@ -1855,7 +1855,7 @@ static PurpleCmdRet silcpurple_cmd_quit(
if (gc == NULL)
return PURPLE_CMD_RET_FAILED;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (sg == NULL)
return PURPLE_CMD_RET_FAILED;
@@ -1892,7 +1892,7 @@ static PurpleCmdRet silcpurple_cmd_call(
if (gc == NULL)
return PURPLE_CMD_RET_FAILED;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
if (sg == NULL)
return PURPLE_CMD_RET_FAILED;
============================================================
--- libpurple/protocols/silc/wb.c 124f1418b551e542510b735c15167d0ed274b23b
+++ libpurple/protocols/silc/wb.c 0f8ec644f625f9a8c5b5422d669f4703e3b1e9a9
@@ -105,7 +105,7 @@ PurpleWhiteboard *silcpurple_wb_init(Sil
PurpleWhiteboard *silcpurple_wb_init(SilcPurple sg, SilcClientEntry client_entry)
{
- SilcClientConnection conn;
+ SilcClientConnection conn;
PurpleWhiteboard *wb;
SilcPurpleWb wbs;
@@ -238,8 +238,8 @@ silcpurple_wb_request_cb(SilcPurpleWbReq
{
PurpleWhiteboard *wb;
- if (id != 1)
- goto out;
+ if (id != 1)
+ goto out;
if (!req->channel)
wb = silcpurple_wb_init(req->sg, req->sender);
@@ -264,7 +264,7 @@ silcpurple_wb_request(SilcClient client,
SilcPurple sg;
gc = client->application;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
/* Open whiteboard automatically if requested */
if (purple_account_get_bool(sg->account, "open-wb", FALSE)) {
@@ -318,12 +318,12 @@ void silcpurple_wb_receive(SilcClient cl
SilcUInt32 message_len)
{
SilcPurple sg;
- PurpleConnection *gc;
+ PurpleConnection *gc;
PurpleWhiteboard *wb;
SilcPurpleWb wbs;
gc = client->application;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
wb = purple_whiteboard_get_session(sg->account, sender->nickname);
if (!wb) {
@@ -347,12 +347,12 @@ void silcpurple_wb_receive_ch(SilcClient
SilcUInt32 message_len)
{
SilcPurple sg;
- PurpleConnection *gc;
+ PurpleConnection *gc;
PurpleWhiteboard *wb;
SilcPurpleWb wbs;
gc = client->application;
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
wb = purple_whiteboard_get_session(sg->account, channel->channel_name);
if (!wb) {
@@ -374,13 +374,13 @@ void silcpurple_wb_send(PurpleWhiteboard
SilcBuffer packet;
GList *list;
int len;
- PurpleConnection *gc;
- SilcPurple sg;
+ PurpleConnection *gc;
+ SilcPurple sg;
g_return_if_fail(draw_list);
gc = purple_account_get_connection(wb->account);
g_return_if_fail(gc);
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
g_return_if_fail(sg);
len = SILCPURPLE_WB_HEADER;
@@ -480,12 +480,12 @@ void silcpurple_wb_clear(PurpleWhiteboar
SilcPurpleWb wbs = wb->proto_data;
SilcBuffer packet;
int len;
- PurpleConnection *gc;
- SilcPurple sg;
+ PurpleConnection *gc;
+ SilcPurple sg;
gc = purple_account_get_connection(wb->account);
g_return_if_fail(gc);
- sg = gc->proto_data;
+ sg = purple_connection_get_protocol_data(gc);
g_return_if_fail(sg);
len = SILCPURPLE_WB_HEADER;
More information about the Commits
mailing list