pidgin: fab36115: Strip trailing whitespace and comment #e...
markdoliner at pidgin.im
markdoliner at pidgin.im
Thu Jun 18 15:10:34 EDT 2009
-----------------------------------------------------------------
Revision: fab36115790893ef93e44cb1afb36147965f6fe5
Ancestor: 03bc71337ba702a5e373ff9c8b8443949d3706e5
Author: markdoliner at pidgin.im
Date: 2009-06-18T19:08:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fab36115790893ef93e44cb1afb36147965f6fe5
Modified files:
libpurple/protocols/yahoo/util.c
libpurple/protocols/yahoo/yahoo.c
libpurple/protocols/yahoo/yahoo.h
libpurple/protocols/yahoo/yahoo_aliases.h
libpurple/protocols/yahoo/yahoo_filexfer.c
libpurple/protocols/yahoo/yahoo_packet.c
libpurple/protocols/yahoo/yahoo_picture.c
libpurple/protocols/yahoo/yahoo_profile.c
libpurple/protocols/yahoo/yahoochat.c
libpurple/protocols/yahoo/ycht.c
ChangeLog:
Strip trailing whitespace and comment #endif marcos that close #ifdef macros
-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/util.c af7423f29af07d5f3029ee42d43ff07eb325450a
+++ libpurple/protocols/yahoo/util.c 6c64eb439631d2315d139962e87ebd432c0fe023
@@ -22,7 +22,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
#include "debug.h"
#include "internal.h"
@@ -42,7 +42,7 @@ yahoo_account_use_http_proxy(PurpleConne
/*
* Returns cookies formatted as a null terminated string for the given connection.
* Must g_free return value.
- *
+ *
* TODO:will work, but must test for strict correctness
*/
gchar* yahoo_get_cookies(PurpleConnection *gc)
@@ -191,7 +191,7 @@ char *yahoo_convert_to_numeric(const cha
/*
* I found these on some website but i don't know that they actually
* work (or are supposed to work). I didn't implement them yet.
- *
+ *
* [0;30m ---black
* [1;37m ---white
* [0;37m ---tan
============================================================
--- libpurple/protocols/yahoo/yahoo.c e95c53b066da4867a741b22515e305ab1da6ae29
+++ libpurple/protocols/yahoo/yahoo.c abbebdc65b815a40e44f2c5b941e3f57092e7dfe
@@ -64,7 +64,7 @@ static void yahoo_login_page_cb(PurpleUt
static void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *, PurpleGroup *);
#ifdef TRY_WEBMESSENGER_LOGIN
static void yahoo_login_page_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, const gchar *url_text, size_t len, const gchar *error_message);
-#endif
+#endif /* TRY_WEBMESSENGER_LOGIN */
static void yahoo_set_status(PurpleAccount *account, PurpleStatus *status);
static void yahoo_update_status(PurpleConnection *gc, const char *name, YahooFriend *f)
@@ -523,7 +523,7 @@ static void yahoo_process_list_15(Purple
purple_debug_info("yahoo", "%s adding %s to the deny list because of the ignore list / no group was found\n",account->username, norm_bud);
purple_privacy_deny_add(account, norm_bud, 1);
}
-
+
protocol = 0;
stealth = 0;
norm_bud = NULL;
@@ -554,7 +554,7 @@ static void yahoo_process_list_15(Purple
}
g_hash_table_foreach(ht, yahoo_do_group_cleanup, NULL);
-
+
/* Now that we have processed the buddy list, we can say yahoo has connected */
purple_connection_set_display_name(gc, purple_normalize(account, purple_account_get_username(account)));
purple_connection_set_state(gc, PURPLE_CONNECTED);
@@ -824,8 +824,8 @@ static void yahoo_process_sms_message(Pu
struct yahoo_data *yd;
char *server_msg = NULL;
char *m;
-
- yd = gc->proto_data;
+
+ yd = gc->proto_data;
account = purple_connection_get_account(gc);
while (l != NULL) {
@@ -858,7 +858,7 @@ static void yahoo_process_sms_message(Pu
}
else
purple_notify_error(gc, NULL, _("Your SMS was not delivered"), NULL);
-
+
g_free(sms->from);
g_free(sms);
return ;
@@ -871,7 +871,7 @@ static void yahoo_process_sms_message(Pu
m = yahoo_string_decode(gc, sms->msg, sms->utf8);
serv_got_im(gc, sms->from, m, 0, sms->time);
-
+
g_free(m);
g_free(sms->from);
g_free(sms);
@@ -1024,7 +1024,7 @@ static void yahoo_process_message(Purple
username = g_markup_escape_text(msn_from, -1);
else
username = g_markup_escape_text(im->from, -1);
-
+
purple_prpl_got_attention(gc, username, YAHOO_BUZZ);
g_free(username);
g_free(m);
@@ -1043,7 +1043,7 @@ static void yahoo_process_message(Purple
g_free(m2);
- /* laters : implement buddy icon for msn friends */
+ /* laters : implement buddy icon for msn friends */
if(!msn) {
if ((f = yahoo_friend_find(gc, im->from)) && im->buddy_icon == 2) {
if (yahoo_friend_get_buddy_icon_need_request(f)) {
@@ -1625,7 +1625,7 @@ static void yahoo_auth16_stage2(PurpleUt
purple_debug_error("yahoo", "Login Failed, unable to retrieve stage 2 url: %s\n", error_message);
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_message);
g_free(auth_data->seed);
- g_free(auth_data);
+ g_free(auth_data);
return;
}
else if (len > 0 && ret_data && *ret_data) {
@@ -1972,7 +1972,7 @@ static void yahoo_process_authresp(Purpl
{
#ifdef TRY_WEBMESSENGER_LOGIN
struct yahoo_data *yd = gc->proto_data;
-#endif
+#endif /* TRY_WEBMESSENGER_LOGIN */
GSList *l = pkt->hash;
int err = 0;
char *msg;
@@ -2016,7 +2016,7 @@ static void yahoo_process_authresp(Purpl
yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
return;
}
-#endif
+#endif /* TRY_WEBMESSENGER_LOGIN */
if (!purple_account_get_remember_password(account))
purple_account_set_password(account, NULL);
@@ -2082,7 +2082,7 @@ static void yahoo_process_addbuddy(Purpl
return;
if (!group)
group = "";
-
+
if(msn)
who = g_strconcat("msn/", temp, NULL);
else
@@ -2123,7 +2123,7 @@ static void yahoo_p2p_write_pkt(gint sou
{
size_t pkt_len;
guchar *raw_packet;
-
+
/*build the raw packet and send it to the host*/
pkt_len = yahoo_packet_build(pkt, 0, 0, 0, &raw_packet);
if(write(source, raw_packet, pkt_len) != pkt_len)
@@ -2302,7 +2302,7 @@ static void yahoo_p2p_read_pkt_cb(gpoint
yahoo_p2p_disconnect_destroy_data(data);
return;
}
-
+
if(len < YAHOO_PACKET_HDRLEN)
return;
@@ -2442,7 +2442,7 @@ void yahoo_send_p2p_pkt(PurpleConnection
void yahoo_send_p2p_pkt(PurpleConnection *gc, const char *who, int val_13)
{
const char *public_ip;
- guint32 temp[4];
+ guint32 temp[4];
guint32 ip;
char temp_str[100];
gchar *base64_ip = NULL;
@@ -2463,7 +2463,7 @@ void yahoo_send_p2p_pkt(PurpleConnection
if( strcmp(purple_normalize(account, purple_account_get_username(account)), who) == 0)
return;
- /* send packet to only those friends who arent p2p connected and to whom we havent already sent. Do not send if this condition doesn't hold good */
+ /* send packet to only those friends who arent p2p connected and to whom we havent already sent. Do not send if this condition doesn't hold good */
if( !( f && (yahoo_friend_get_p2p_status(f) == YAHOO_P2PSTATUS_NOT_CONNECTED) && (f->p2p_packet_sent == 0)) )
return;
@@ -2526,7 +2526,7 @@ static void yahoo_p2p_init_cb(gpointer d
if(error_message != NULL) {
purple_debug_warning("yahoo","p2p: %s\n",error_message);
yahoo_send_p2p_pkt(p2p_data->gc, p2p_data->host_username, 2);/* send p2p init packet with val_13=2 */
-
+
yahoo_p2p_disconnect_destroy_data(p2p_data);
return;
}
@@ -3291,7 +3291,7 @@ yahoo_login_page_cb(PurpleUtilFetchUrlDa
purple_cipher_context_destroy(context);
}
-#endif
+#endif /* TRY_WEBMESSENGER_LOGIN */
static void yahoo_server_check(PurpleAccount *account)
{
@@ -3898,7 +3898,7 @@ yahoo_get_inbox_token_cb(PurpleUtilFetch
struct yahoo_data *yd = gc->proto_data;
g_return_if_fail(PURPLE_CONNECTION_IS_VALID(gc));
-
+
yd->url_datas = g_slist_remove(yd->url_datas, url_data);
if (error_message != NULL)
@@ -4039,7 +4039,7 @@ static void yahoo_get_sms_carrier_cb(Pur
xmlnode *validate_data_root = xmlnode_from_str(webdata, -1);
xmlnode *validate_data_child = xmlnode_get_child(validate_data_root, "mobile_no");
mobile_no = (char *)xmlnode_get_attrib(validate_data_child, "msisdn");
-
+
validate_data_root = xmlnode_copy(validate_data_child);
validate_data_child = xmlnode_get_child(validate_data_root, "status");
status = xmlnode_get_data(validate_data_child);
@@ -4142,7 +4142,7 @@ static int yahoo_send_im(PurpleConnectio
struct yahoo_p2p_data *p2p_data;
gboolean msn = FALSE;
msg2 = yahoo_string_encode(gc, msg, &utf8);
-
+
if(msg2) {
lenb = strlen(msg2);
lenc = g_utf8_strlen(msg2, -1);
@@ -4176,7 +4176,7 @@ static int yahoo_send_im(PurpleConnectio
sms_cb_data->what = g_strdup(what);
purple_conversation_write(conv, NULL, "Getting mobile carrier to send the sms", PURPLE_MESSAGE_SYSTEM, time(NULL));
-
+
yahoo_get_sms_carrier(gc, sms_cb_data);
g_free(msg);
@@ -4295,7 +4295,7 @@ static unsigned int yahoo_send_typing(Pu
if( (p2p_data = g_hash_table_lookup(yd->peers, who)) && !msn ) {
yahoo_packet_hash(pkt, "sssssis", 49, "TYPING", 1, purple_connection_get_display_name(gc),
14, " ", 13, state == PURPLE_TYPING ? "1" : "0",
- 5, who, 11, p2p_data->session_id, 1002, "1"); /* To-do: key 15 to be sent in case of p2p */
+ 5, who, 11, p2p_data->session_id, 1002, "1"); /* To-do: key 15 to be sent in case of p2p */
yahoo_p2p_write_pkt(p2p_data->source, pkt);
yahoo_packet_free(pkt);
}
============================================================
--- libpurple/protocols/yahoo/yahoo.h a160671378c7f3f63bf982d9809e23cc82f9cb4b
+++ libpurple/protocols/yahoo/yahoo.h daa5a59415ba45300404fd483a0a3061903f8ede
@@ -53,7 +53,7 @@
#define YAHOOJP_XFER_HOST "filetransfer.msg.yahoo.co.jp"
#define YAHOOJP_WEBCAM_HOST "wc.yahoo.co.jp"
/* not sure, must test: */
-#define YAHOOJP_XFER_RELAY_HOST "relay.msg.yahoo.co.jp"
+#define YAHOOJP_XFER_RELAY_HOST "relay.msg.yahoo.co.jp"
#define YAHOOJP_XFER_RELAY_PORT 80
#define YAHOOJP_ROOMLIST_URL "http://insider.msg.yahoo.co.jp/ycontent/"
#define YAHOOJP_ROOMLIST_LOCALE "ja"
@@ -201,7 +201,7 @@ struct yahoo_data {
GSList *url_datas;
GHashTable *xfer_peer_idstring_map;/* Hey, i dont know, but putting this HashTable next to friends gives a run time fault... */
GSList *cookies;/* contains all cookies, including _y and _t */
-
+
/**
* We may receive a list15 in multiple packets with no prior warning as to how many we'll be getting;
* the server expects us to keep track of the group for which it is sending us contact names.
============================================================
--- libpurple/protocols/yahoo/yahoo_aliases.h cb68f757e203f5f224e5d49484d9f7e77d00497c
+++ libpurple/protocols/yahoo/yahoo_aliases.h dfcc42fa79450b310ac318c4867fd9ceee7f7b53
============================================================
--- libpurple/protocols/yahoo/yahoo_filexfer.c a64bf92b3ba0c4ab7ca48f01cb9f8785ce2013fa
+++ libpurple/protocols/yahoo/yahoo_filexfer.c cf760dcc5854a7d39fe1981ddbd49dbd2728b4a9
@@ -380,12 +380,12 @@ static void yahoo_xfer_init_15(PurpleXfe
28, xfer->size,
301, 268,
303, 268);
- g_free(filename);
+ g_free(filename);
} else {
if(xfer_data->firstoflist == TRUE) {
pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANS_15,
YAHOO_STATUS_AVAILABLE, yd->session_id);
-
+
yahoo_packet_hash(pkt, "sssi",
1, purple_normalize(account, purple_account_get_username(account)),
5, xfer->who,
@@ -394,7 +394,7 @@ static void yahoo_xfer_init_15(PurpleXfe
} else {
pkt = yahoo_packet_new(YAHOO_SERVICE_FILETRANS_ACC_15,
YAHOO_STATUS_AVAILABLE, yd->session_id);
-
+
yahoo_packet_hash(pkt, "sssi",
1, purple_normalize(account, purple_account_get_username(account)),
5, xfer->who,
@@ -623,7 +623,7 @@ static void yahoo_p2p_ft_server_send_OK(
else if (written <= 0)
purple_debug_info("yahoo", "p2p filetransfer: Unable to write HTTP OK");
- /* close connection */
+ /* close connection */
close(xfer->fd);
xfer->fd = -1;
g_free(tx);
@@ -644,14 +644,14 @@ static void yahoo_xfer_end(PurpleXfer *x
/* Send HTTP OK in case of p2p transfer, when we act as server */
if((xfer_data->xfer_url != NULL) && (xfer_old->fd >=0) && (purple_xfer_get_status(xfer_old) == PURPLE_XFER_STATUS_DONE))
yahoo_p2p_ft_server_send_OK(xfer_old);
-
+
/* removing top of filename & size list completely */
g_free( xfer_data->filename_list->data );
g_free( xfer_data->size_list->data );
-
+
xfer_data->filename_list->data = NULL;
xfer_data->size_list->data = NULL;
-
+
xfer_data->filename_list = g_slist_delete_link(xfer_data->filename_list, xfer_data->filename_list);
xfer_data->size_list = g_slist_delete_link(xfer_data->size_list, xfer_data->size_list);
@@ -697,16 +697,16 @@ static void yahoo_xfer_end(PurpleXfer *x
/* Build the file transfer handle. */
xfer = purple_xfer_new(gc->account, PURPLE_XFER_RECEIVE, xfer_old->who);
-
+
if (xfer) {
/* Set the info about the incoming file. */
char *utf8_filename = yahoo_string_decode(gc, filename, TRUE);
purple_xfer_set_filename(xfer, utf8_filename);
g_free(utf8_filename);
purple_xfer_set_size(xfer, filesize);
-
+
xfer->data = xfer_data;
-
+
/* Setup our I/O op functions */
purple_xfer_set_init_fnc(xfer, yahoo_xfer_init_15);
purple_xfer_set_start_fnc(xfer, yahoo_xfer_start);
@@ -1003,7 +1003,7 @@ static void yahoo_xfer_dns_connected_15(
purple_xfer_cancel_remote(xfer);
return;
}
-
+
/* Discard the length... */
hosts = g_slist_remove(hosts, hosts->data);
if(!hosts)
@@ -1012,7 +1012,7 @@ static void yahoo_xfer_dns_connected_15(
purple_xfer_cancel_remote(xfer);
return;
}
-
+
/* TODO:actually, u must try with addr no.1 , if its not working addr no.2 ..... */
addr = hosts->data;
actaddr = addr->sin_addr.s_addr;
@@ -1113,7 +1113,7 @@ static void yahoo_xfer_recv_cb_15(gpoint
while((did = read(source, buf, 998)) > 0)
{
xd->txbuflen += did;
- buf[did] = '\0';
+ buf[did] = '\0';
t = xd->txbuf;
xd->txbuf = g_strconcat(t,buf,NULL);
g_free(t);
@@ -1276,7 +1276,7 @@ static void yahoo_xfer_connected_15(gpoi
}
}
else if(purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE && xd->status_15 == STARTED)
- {
+ {
if(xd->info_val_249 == 1)
{
/* receiving file via p2p, connected as client */
@@ -1592,7 +1592,7 @@ void yahoo_process_filetrans_15(PurpleCo
GSList *filename_list = NULL;
GSList *size_list = NULL;
int nooffiles = 0;
-
+
yd = gc->proto_data;
for (l = pkt->hash; l; l = l->next) {
@@ -1617,7 +1617,7 @@ void yahoo_process_filetrans_15(PurpleCo
break;
case 222:
val_222 = atol(pair->value);
- /* 1=send, 2=cancel, 3=accept, 4=reject */
+ /* 1=send, 2=cancel, 3=accept, 4=reject */
break;
/* check for p2p and imviron .... not sure it comes by this service packet. Since it was bundled with filexfer in old ymsg version, still keeping it. */
@@ -1655,7 +1655,7 @@ void yahoo_process_filetrans_15(PurpleCo
* so, purple dnsquery is used... but retries, trying with next ip
* address etc. is not implemented..TODO
*/
-
+
/* To send through p2p */
if( g_hash_table_lookup(yd->peers, from) ) {
/* send p2p file transfer information */
@@ -1685,7 +1685,7 @@ void yahoo_process_filetrans_15(PurpleCo
g_hash_table_replace(yd->imvironments, g_strdup(from), g_strdup(imv));
return;
}
-
+
if (pkt->service == YAHOO_SERVICE_P2PFILEXFER) {
if (service && (strcmp("FILEXFER", service) != 0)) {
purple_debug_misc("yahoo", "unhandled service 0x%02x\n", pkt->service);
@@ -1710,7 +1710,7 @@ void yahoo_process_filetrans_15(PurpleCo
xfer_data->xfer_peer_idstring = g_strdup(xfer_peer_idstring);
xfer_data->filename_list = filename_list;
xfer_data->size_list = size_list;
-
+
/* Build the file transfer handle. */
xfer = purple_xfer_new(gc->account, PURPLE_XFER_RECEIVE, from);
xfer->message = NULL;
@@ -1739,7 +1739,7 @@ void yahoo_process_filetrans_15(PurpleCo
g_hash_table_insert(yd->xfer_peer_idstring_map,
xfer_data->xfer_peer_idstring,
xfer);
-
+
if(nooffiles > 1) {
gchar* message;
message = g_strdup_printf(_("%s is trying to send you a group of %d files.\n"), xfer->who, nooffiles);
@@ -1825,7 +1825,7 @@ void yahoo_process_filetrans_info_15(Pur
purple_xfer_cancel_remote(xfer);
return;
}
-
+
account = purple_connection_get_account(xfer_data->gc);
pkt_to_send = yahoo_packet_new(YAHOO_SERVICE_FILETRANS_ACC_15,
@@ -1916,7 +1916,7 @@ void yahoo_process_filetrans_acc_15(Purp
xfer_data = xfer->data;
if(url)
purple_url_parse(url, &(xfer_data->host), &(xfer_data->port), &(xfer_data->path), NULL, NULL);
-
+
xfer_data->xfer_idstring_for_relay = g_strdup(xfer_idstring_for_relay);
xfer_data->status_15 = ACCEPTED;
account = purple_connection_get_account(gc);
============================================================
--- libpurple/protocols/yahoo/yahoo_packet.c 366d5870f6306c91b9379450e2968a3007deb10f
+++ libpurple/protocols/yahoo/yahoo_packet.c d89a01e8ac659d36378f8ae3c71f6e3f111b868e
@@ -195,7 +195,7 @@ void yahoo_packet_read(struct yahoo_pack
"Key: %d \tValue: %s\n", pair->key, esc);
g_free(esc);
}
-#endif
+#endif /* DEBUG */
} else {
g_free(pair);
}
@@ -282,7 +282,7 @@ void yahoo_packet_dump(guchar *data, int
}
purple_debug(PURPLE_DEBUG_MISC, NULL, "\n");
-#endif
+#endif /* YAHOO_DEBUG */
}
static void
@@ -329,7 +329,7 @@ size_t yahoo_packet_build(struct yahoo_p
if (wm)
pos += yahoo_put16(data + pos, YAHOO_WEBMESSENGER_PROTO_VER);
else if (jp)
- pos += yahoo_put16(data + pos, YAHOO_PROTO_VER_JAPAN);
+ pos += yahoo_put16(data + pos, YAHOO_PROTO_VER_JAPAN);
else
pos += yahoo_put16(data + pos, YAHOO_PROTO_VER);
pos += yahoo_put16(data + pos, 0x0000);
============================================================
--- libpurple/protocols/yahoo/yahoo_picture.c 31862929bc58845c16b575980f1d7e487c992290
+++ libpurple/protocols/yahoo/yahoo_picture.c ef6c43a5d4728b0e1da24d7fc5c6a214b208d45f
@@ -126,7 +126,7 @@ void yahoo_process_picture(PurpleConnect
gboolean use_whole_url = yahoo_account_use_http_proxy(gc);
/* FIXME: Cleanup this strtol() stuff if possible. */
- if (b && (locksum = purple_buddy_icons_get_checksum_for_user(b)) != NULL &&
+ if (b && (locksum = purple_buddy_icons_get_checksum_for_user(b)) != NULL &&
(checksum == strtol(locksum, NULL, 10)))
return;
@@ -506,7 +506,7 @@ static void yahoo_buddy_icon_upload_conn
"Content-Length: %" G_GSIZE_FORMAT "\r\n"
"Cache-Control: no-cache\r\n\r\n",
use_whole_url ? "http://" : "", use_whole_url ? tmp : "",
- yd->cookie_t, yd->cookie_y,
+ yd->cookie_t, yd->cookie_y,
tmp,
pkt_buf_len + 4 + d->str->len);
g_free(tmp);
@@ -573,7 +573,7 @@ static int yahoo_buddy_icon_calculate_ch
purple_debug_misc("yahoo", "Calculated buddy icon checksum: %d\n", checksum);
return checksum;
-}
+}
void yahoo_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img)
{
============================================================
--- libpurple/protocols/yahoo/yahoo_profile.c 15e898dd14155101d47b23523dc0075681a2476c
+++ libpurple/protocols/yahoo/yahoo_profile.c 3147e2bcb9bf65f548c860608182b1fd1a9d1d35
@@ -29,7 +29,7 @@
#include "util.h"
#if PHOTO_SUPPORT
#include "imgstore.h"
-#endif
+#endif /* PHOTO_SUPPORT */
#include "yahoo.h"
#include "yahoo_friend.h"
@@ -40,11 +40,11 @@ typedef enum profile_lang_id {
} YahooGetInfoData;
typedef enum profile_lang_id {
- XX, DA, DE, EL,
- EN, EN_GB,
+ XX, DA, DE, EL,
+ EN, EN_GB,
ES_AR, ES_ES, ES_MX, ES_US,
- FR_CA, FR_FR,
- IT, JA, KO, NO, PT, SV,
+ FR_CA, FR_FR,
+ IT, JA, KO, NO, PT, SV,
ZH_CN, ZH_HK, ZH_TW, ZH_US, PT_BR
} profile_lang_id_t;
@@ -702,7 +702,7 @@ static void yahoo_extract_user_info_text
const char *balias = purple_buddy_get_local_buddy_alias(b);
if(balias && balias[0]) {
char *aliastext = g_markup_escape_text(balias, -1);
- purple_notify_user_info_add_pair(user_info, _("Alias"), aliastext);
+ purple_notify_user_info_add_pair(user_info, _("Alias"), aliastext);
g_free(aliastext);
}
#if 0
@@ -777,7 +777,7 @@ static void yahoo_got_info(PurpleUtilFet
char *stripped;
int stripped_len;
char *last_updated_utf8_string = NULL;
-#endif
+#endif /* !PHOTO_SUPPORT */
const char *last_updated_string = NULL;
char *url_buffer;
GString *s;
@@ -899,7 +899,7 @@ static void yahoo_got_info(PurpleUtilFet
#if PHOTO_SUPPORT
photo_url_text = yahoo_get_photo_url(url_text, info_data->name);
-#endif
+#endif /* PHOTO_SUPPORT */
url_buffer = g_strdup(url_text);
@@ -1048,7 +1048,7 @@ yahoo_got_photo(PurpleUtilFetchUrlData *
purple_debug_info("yahoo", "%s is %" G_GSIZE_FORMAT
" bytes\n", photo_url_text, len);
id = purple_imgstore_add_with_id(g_memdup(url_text, len), len, NULL);
-
+
tmp = g_strdup_printf("<img id=\"%d\"><br>", id);
purple_notify_user_info_add_pair(user_info, NULL, tmp);
g_free(tmp);
@@ -1259,7 +1259,7 @@ yahoo_got_photo(PurpleUtilFetchUrlData *
g_free(info2_data);
if (id != -1)
purple_imgstore_unref_by_id(id);
-#endif
+#endif /* PHOTO_SUPPORT */
}
void yahoo_get_info(PurpleConnection *gc, const char *name)
============================================================
--- libpurple/protocols/yahoo/yahoochat.c 976332ef39bff8f491ce426fb7a2546187feb225
+++ libpurple/protocols/yahoo/yahoochat.c c143dc17510063c0c8f936255c486d449e68f130
@@ -30,7 +30,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
#include "debug.h"
#include "privacy.h"
============================================================
--- libpurple/protocols/yahoo/ycht.c f6ebdce24d6993c86b52837cc66896d69223f67c
+++ libpurple/protocols/yahoo/ycht.c 6ac5a6012b2301676b3f6963fb39de6b5195ef02
@@ -225,7 +225,7 @@ static void ycht_packet_dump(const gucha
}
purple_debug(PURPLE_DEBUG_MISC, NULL, "\n");
-#endif
+#endif /* YAHOO_YCHT_DEBUG */
}
static YchtPkt *ycht_packet_new(guint version, guint service, int status)
More information about the Commits
mailing list