pidgin: e008717f: Convert zephyr prpl to use accessor func...
andrew.victor at mxit.com
andrew.victor at mxit.com
Mon Aug 29 18:50:55 EDT 2011
----------------------------------------------------------------------
Revision: e008717fab810d3ba4e37c6a6c864101af9b523b
Parent: 3f65b0c73a882d71e5e3f20dd277ad896653c263
Author: andrew.victor at mxit.com
Date: 08/29/11 18:27:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e008717fab810d3ba4e37c6a6c864101af9b523b
Changelog:
Convert zephyr prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
Changes against parent 3f65b0c73a882d71e5e3f20dd277ad896653c263
patched libpurple/protocols/zephyr/zephyr.c
-------------- next part --------------
============================================================
--- libpurple/protocols/zephyr/zephyr.c c5a870d8b26f8fef962ffd6d41fa2cb4310e8116
+++ libpurple/protocols/zephyr/zephyr.c f54d4ab8f8a124019257706c5e09e6c93cbea6a5
@@ -347,7 +347,7 @@ static gchar *zephyr_recv_convert(Purple
{
gchar *utf8;
GError *err = NULL;
- zephyr_account *zephyr = gc->proto_data;
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
if (g_utf8_validate(string, -1, NULL)) {
return g_strdup(string);
} else {
@@ -762,7 +762,7 @@ static void handle_message(PurpleConnect
static void handle_message(PurpleConnection *gc,ZNotice_t notice)
{
- zephyr_account* zephyr = gc->proto_data;
+ zephyr_account* zephyr = purple_connection_get_protocol_data(gc);
if (!g_ascii_strcasecmp(notice.z_class, LOGIN_CLASS)) {
/* well, we'll be updating in 20 seconds anyway, might as well ignore this. */
@@ -872,7 +872,7 @@ static void handle_message(PurpleConnect
} else {
zephyr_triple *zt1, *zt2;
gchar *send_inst_utf8;
- zephyr_account *zephyr = gc->proto_data;
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
zt1 = new_triple(zephyr,notice.z_class, notice.z_class_inst, notice.z_recipient);
zt2 = find_sub_by_triple(zephyr,zt1);
if (!zt2) {
@@ -1109,7 +1109,7 @@ static gint check_notify_tzc(gpointer da
static gint check_notify_tzc(gpointer data)
{
PurpleConnection *gc = (PurpleConnection *)data;
- zephyr_account* zephyr = gc->proto_data;
+ zephyr_account* zephyr = purple_connection_get_protocol_data(gc);
parse_tree *newparsetree = read_from_tzc(zephyr);
if (newparsetree != NULL) {
gchar *spewtype;
@@ -1265,7 +1265,7 @@ static gint check_loc(gpointer data)
GSList *buddies;
ZLocations_t locations;
PurpleConnection *gc = data;
- zephyr_account *zephyr = gc->proto_data;
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
PurpleAccount *account = purple_connection_get_account(gc);
int numlocs;
int one = 1;
@@ -1296,7 +1296,7 @@ static gint check_loc(gpointer data)
GSList *buddies;
ZAsyncLocateData_t ald;
PurpleConnection *gc = (PurpleConnection *)data;
- zephyr_account *zephyr = gc->proto_data;
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
PurpleAccount *account = purple_connection_get_account(gc);
if (use_zeph02(zephyr)) {
@@ -1572,7 +1572,8 @@ static void zephyr_login(PurpleAccount *
username = purple_account_get_username(account);
#endif
gc->flags |= PURPLE_CONNECTION_AUTO_RESP | PURPLE_CONNECTION_HTML | PURPLE_CONNECTION_NO_BGCOLOR | PURPLE_CONNECTION_NO_URLDESC;
- gc->proto_data = zephyr=g_new0(zephyr_account,1);
+ zephyr = g_new0(zephyr_account, 1);
+ purple_connection_set_protocol_data(gc, zephyr);
zephyr->account = account;
@@ -1961,7 +1962,7 @@ static void zephyr_close(PurpleConnectio
{
GList *l;
GSList *s;
- zephyr_account *zephyr = gc->proto_data;
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
pid_t tzc_pid = zephyr->tzc_pid;
l = zephyr->pending_zloc_names;
@@ -2036,7 +2037,7 @@ static int zephyr_chat_send(PurpleConnec
PurpleConvChat *gcc;
char *inst;
char *recipient;
- zephyr_account *zephyr = gc->proto_data;
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
zt = find_sub_by_id(zephyr,id);
if (!zt)
@@ -2065,7 +2066,7 @@ static int zephyr_send_im(PurpleConnecti
static int zephyr_send_im(PurpleConnection * gc, const char *who, const char *im, PurpleMessageFlags flags)
{
const char *sig;
- zephyr_account *zephyr = gc->proto_data;
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
if (flags & PURPLE_MESSAGE_AUTO_RESP)
sig = "Automated reply:";
else {
@@ -2234,7 +2235,7 @@ static const char *zephyr_normalize(cons
if (gc == NULL)
return NULL;
- tmp = local_zephyr_normalize(gc->proto_data, who);
+ tmp = local_zephyr_normalize(purple_connection_get_protocol_data(gc), who);
if (strlen(tmp) >= sizeof(buf)) {
g_free(tmp);
@@ -2250,7 +2251,7 @@ static void zephyr_zloc(PurpleConnection
static void zephyr_zloc(PurpleConnection *gc, const char *who)
{
ZAsyncLocateData_t ald;
- zephyr_account *zephyr = gc->proto_data;
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
gchar* normalized_who = local_zephyr_normalize(zephyr,who);
if (use_zeph02(zephyr)) {
@@ -2277,7 +2278,8 @@ static void zephyr_set_status(PurpleAcco
static void zephyr_set_status(PurpleAccount *account, PurpleStatus *status) {
size_t len;
size_t result;
- zephyr_account *zephyr = purple_account_get_connection(account)->proto_data;
+ PurpleConnection *gc = purple_account_get_connection(account);
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
PurpleStatusPrimitive primitive = purple_status_type_get_primitive(purple_status_get_type(status));
if (zephyr->away) {
@@ -2411,7 +2413,7 @@ static void zephyr_join_chat(PurpleConne
const char *classname;
const char *instname;
const char *recip;
- zephyr_account *zephyr=gc->proto_data;
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
classname = g_hash_table_lookup(data, "class");
instname = g_hash_table_lookup(data, "instance");
recip = g_hash_table_lookup(data, "recipient");
@@ -2474,7 +2476,7 @@ static void zephyr_chat_leave(PurpleConn
static void zephyr_chat_leave(PurpleConnection * gc, int id)
{
zephyr_triple *zt;
- zephyr_account *zephyr = gc->proto_data;
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
zt = find_sub_by_id(zephyr,id);
if (zt) {
@@ -2524,7 +2526,7 @@ static unsigned int zephyr_send_typing(P
static unsigned int zephyr_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state) {
gchar *recipient;
- zephyr_account *zephyr = gc->proto_data;
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
if (use_tzc(zephyr))
return 0;
@@ -2566,7 +2568,7 @@ static void zephyr_chat_set_topic(Purple
PurpleConversation *gconv;
PurpleConvChat *gcc;
gchar *topic_utf8;
- zephyr_account* zephyr = gc->proto_data;
+ zephyr_account* zephyr = purple_connection_get_protocol_data(gc);
char *sender = (char *)zephyr->username;
zt = find_sub_by_id(zephyr,id);
@@ -2589,7 +2591,8 @@ static PurpleCmdRet zephyr_purple_cmd_ms
const char *cmd, char **args, char **error, void *data)
{
char *recipient;
- zephyr_account *zephyr = purple_conversation_get_gc(conv)->proto_data;
+ PurpleConnection *gc = purple_conversation_get_gc(conv);
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);;
if (!g_ascii_strcasecmp(args[0],"*"))
return PURPLE_CMD_RET_FAILED; /* "*" is not a valid argument */
else
@@ -2641,7 +2644,8 @@ static PurpleCmdRet zephyr_purple_cmd_zi
const char *cmd, char **args, char **error, void *data)
{
/* args = instance, message */
- zephyr_account *zephyr = purple_conversation_get_gc(conv)->proto_data;
+ PurpleConnection *gc = purple_conversation_get_gc(conv);
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
if ( zephyr_send_message(zephyr,"message",args[0],"",args[1],zephyr_get_signature(),""))
return PURPLE_CMD_RET_OK;
else
@@ -2652,7 +2656,8 @@ static PurpleCmdRet zephyr_purple_cmd_zc
const char *cmd, char **args, char **error, void *data)
{
/* args = class, instance, message */
- zephyr_account *zephyr = purple_conversation_get_gc(conv)->proto_data;
+ PurpleConnection *gc = purple_conversation_get_gc(conv);
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
if ( zephyr_send_message(zephyr,args[0],args[1],"",args[2],zephyr_get_signature(),""))
return PURPLE_CMD_RET_OK;
else
@@ -2663,7 +2668,8 @@ static PurpleCmdRet zephyr_purple_cmd_zc
const char *cmd, char **args, char **error, void *data)
{
/* args = class, instance, recipient, message */
- zephyr_account *zephyr = purple_conversation_get_gc(conv)->proto_data;
+ PurpleConnection *gc = purple_conversation_get_gc(conv);
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
if ( zephyr_send_message(zephyr,args[0],args[1],args[2],args[3],zephyr_get_signature(),""))
return PURPLE_CMD_RET_OK;
else
@@ -2674,7 +2680,8 @@ static PurpleCmdRet zephyr_purple_cmd_zi
const char *cmd, char **args, char **error, void *data)
{
/* args = instance, recipient, message */
- zephyr_account *zephyr = purple_conversation_get_gc(conv)->proto_data;
+ PurpleConnection *gc = purple_conversation_get_gc(conv);
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
if ( zephyr_send_message(zephyr,"message",args[0],args[1],args[2],zephyr_get_signature(),""))
return PURPLE_CMD_RET_OK;
else
@@ -2685,7 +2692,8 @@ static PurpleCmdRet zephyr_purple_cmd_zc
const char *cmd, char **args, char **error, void *data)
{
/* args = class, message */
- zephyr_account *zephyr = purple_conversation_get_gc(conv)->proto_data;
+ PurpleConnection *gc = purple_conversation_get_gc(conv);
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
if ( zephyr_send_message(zephyr,args[0],"PERSONAL","",args[1],zephyr_get_signature(),""))
return PURPLE_CMD_RET_OK;
else
@@ -2766,7 +2774,7 @@ static int zephyr_resubscribe(PurpleConn
{
/* Resubscribe to the in-memory list of subscriptions and also
unsubscriptions*/
- zephyr_account *zephyr = gc->proto_data;
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
GSList *s = zephyr->subscrips;
zephyr_triple *zt;
while (s) {
@@ -2791,7 +2799,7 @@ static void zephyr_action_get_subs_from_
static void zephyr_action_get_subs_from_server(PurplePluginAction *action)
{
PurpleConnection *gc = (PurpleConnection *) action->context;
- zephyr_account *zephyr = gc->proto_data;
+ zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
gchar *title;
int retval, nsubs, one,i;
ZSubscription_t subs;
More information about the Commits
mailing list