diff libpurple/protocols/yahoo/yahoo_picture.c @ 15823:32c366eeeb99

sed -ie 's/gaim/purple/g'

--- a/libpurple/protocols/yahoo/yahoo_picture.c	Mon Mar 19 06:11:46 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_picture.c	Mon Mar 19 07:01:17 2007 +0000
@@ -1,7 +1,7 @@
 /*
- * gaim
+ * purple
  *
- * Gaim is the legal property of its developers, whose names are too numerous
+ * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
@@ -38,39 +38,39 @@
 
 
 struct yahoo_fetch_picture_data {
-	GaimConnection *gc;
+	PurpleConnection *gc;
 	char *who;
 	int checksum;
 };
 
 static void
-yahoo_fetch_picture_cb(GaimUtilFetchUrlData *url_data, gpointer user_data,
+yahoo_fetch_picture_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 		const gchar *pic_data, size_t len, const gchar *error_message)
 {
 	struct yahoo_fetch_picture_data *d;
 	struct yahoo_data *yd;
-	GaimBuddy *b;
+	PurpleBuddy *b;
 
 	d = user_data;
 	yd = d->gc->proto_data;
 	yd->url_datas = g_slist_remove(yd->url_datas, url_data);
 
 	if (error_message != NULL) {
-		gaim_debug_error("yahoo", "Fetching buddy icon failed: %s\n", error_message);
+		purple_debug_error("yahoo", "Fetching buddy icon failed: %s\n", error_message);
 	} else if (len == 0) {
-		gaim_debug_error("yahoo", "Fetched an icon with length 0.  Strange.\n");
+		purple_debug_error("yahoo", "Fetched an icon with length 0.  Strange.\n");
 	} else {
-		gaim_buddy_icons_set_for_user(gaim_connection_get_account(d->gc), d->who, (void *)pic_data, len);
-		b = gaim_find_buddy(gaim_connection_get_account(d->gc), d->who);
+		purple_buddy_icons_set_for_user(purple_connection_get_account(d->gc), d->who, (void *)pic_data, len);
+		b = purple_find_buddy(purple_connection_get_account(d->gc), d->who);
 		if (b)
-			gaim_blist_node_set_int((GaimBlistNode*)b, YAHOO_ICON_CHECKSUM_KEY, d->checksum);
+			purple_blist_node_set_int((PurpleBlistNode*)b, YAHOO_ICON_CHECKSUM_KEY, d->checksum);
 	}
 
 	g_free(d->who);
 	g_free(d);
 }
 
-void yahoo_process_picture(GaimConnection *gc, struct yahoo_packet *pkt)
+void yahoo_process_picture(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	struct yahoo_data *yd;
 	GSList *l = pkt->hash;
@@ -114,17 +114,17 @@
 	/* Yahoo IM 6 spits out 0.png as the URL if the buddy icon is not set */
 	if (who && got_icon_info && url && !strncasecmp(url, "http://", 7)) {
 		/* TODO: make this work p2p, try p2p before the url */
-		GaimUtilFetchUrlData *url_data;
+		PurpleUtilFetchUrlData *url_data;
 		struct yahoo_fetch_picture_data *data;
-		GaimBuddy *b = gaim_find_buddy(gc->account, who);
-		if (b && (checksum == gaim_blist_node_get_int((GaimBlistNode*)b, YAHOO_ICON_CHECKSUM_KEY)))
+		PurpleBuddy *b = purple_find_buddy(gc->account, who);
+		if (b && (checksum == purple_blist_node_get_int((PurpleBlistNode*)b, YAHOO_ICON_CHECKSUM_KEY)))
 			return;
 
 		data = g_new0(struct yahoo_fetch_picture_data, 1);
 		data->gc = gc;
 		data->who = g_strdup(who);
 		data->checksum = checksum;
-		url_data = gaim_util_fetch_url(url, FALSE,
+		url_data = purple_util_fetch_url(url, FALSE,
 				"Mozilla/4.0 (compatible; MSIE 5.0)", FALSE,
 				yahoo_fetch_picture_cb, data);
 		if (url_data != NULL) {
@@ -139,7 +139,7 @@
 	}
 }
 
-void yahoo_process_picture_update(GaimConnection *gc, struct yahoo_packet *pkt)
+void yahoo_process_picture_update(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	GSList *l = pkt->hash;
 	char *who = NULL;
@@ -166,19 +166,19 @@
 		if (icon == 2)
 			yahoo_send_picture_request(gc, who);
 		else if ((icon == 0) || (icon == 1)) {
-			GaimBuddy *b = gaim_find_buddy(gc->account, who);
+			PurpleBuddy *b = purple_find_buddy(gc->account, who);
 			YahooFriend *f;
-			gaim_buddy_icons_set_for_user(gc->account, who, NULL, 0);
+			purple_buddy_icons_set_for_user(gc->account, who, NULL, 0);
 			if (b)
-				gaim_blist_node_remove_setting((GaimBlistNode *)b, YAHOO_ICON_CHECKSUM_KEY);
+				purple_blist_node_remove_setting((PurpleBlistNode *)b, YAHOO_ICON_CHECKSUM_KEY);
 			if ((f = yahoo_friend_find(gc, who)))
 				yahoo_friend_set_buddy_icon_need_request(f, TRUE);
-			gaim_debug_misc("yahoo", "Setting user %s's icon to NULL.\n", who);
+			purple_debug_misc("yahoo", "Setting user %s's icon to NULL.\n", who);
 		}
 	}
 }
 
-void yahoo_process_picture_checksum(GaimConnection *gc, struct yahoo_packet *pkt)
+void yahoo_process_picture_checksum(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	GSList *l = pkt->hash;
 	char *who = NULL;
@@ -202,15 +202,15 @@
 	}
 
 	if (who) {
-		GaimBuddy *b = gaim_find_buddy(gc->account, who);
-		if (b && (checksum != gaim_blist_node_get_int((GaimBlistNode*)b, YAHOO_ICON_CHECKSUM_KEY)))
+		PurpleBuddy *b = purple_find_buddy(gc->account, who);
+		if (b && (checksum != purple_blist_node_get_int((PurpleBlistNode*)b, YAHOO_ICON_CHECKSUM_KEY)))
 			yahoo_send_picture_request(gc, who);
 	}
 }
 
-void yahoo_process_picture_upload(GaimConnection *gc, struct yahoo_packet *pkt)
+void yahoo_process_picture_upload(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
-	GaimAccount *account = gaim_connection_get_account(gc);
+	PurpleAccount *account = purple_connection_get_account(gc);
 	struct yahoo_data *yd = gc->proto_data;
 	GSList *l = pkt->hash;
 	char *url = NULL;
@@ -237,14 +237,14 @@
 		if (yd->picture_url)
 			g_free(yd->picture_url);
 		yd->picture_url = g_strdup(url);
-		gaim_account_set_string(account, YAHOO_PICURL_SETTING, url);
-		gaim_account_set_int(account, YAHOO_PICCKSUM_SETTING, yd->picture_checksum);
+		purple_account_set_string(account, YAHOO_PICURL_SETTING, url);
+		purple_account_set_int(account, YAHOO_PICCKSUM_SETTING, yd->picture_checksum);
 		yahoo_send_picture_update(gc, 2);
 		yahoo_send_picture_checksum(gc);
 	}
 }
 
-void yahoo_process_avatar_update(GaimConnection *gc, struct yahoo_packet *pkt)
+void yahoo_process_avatar_update(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	GSList *l = pkt->hash;
 	char *who = NULL;
@@ -276,70 +276,70 @@
 		if (avatar == 2)
 			yahoo_send_picture_request(gc, who);
 		else if ((avatar == 0) || (avatar == 1)) {
-			GaimBuddy *b = gaim_find_buddy(gc->account, who);
+			PurpleBuddy *b = purple_find_buddy(gc->account, who);
 			YahooFriend *f;
-			gaim_buddy_icons_set_for_user(gc->account, who, NULL, 0);
+			purple_buddy_icons_set_for_user(gc->account, who, NULL, 0);
 			if (b)
-				gaim_blist_node_remove_setting((GaimBlistNode *)b, YAHOO_ICON_CHECKSUM_KEY);
+				purple_blist_node_remove_setting((PurpleBlistNode *)b, YAHOO_ICON_CHECKSUM_KEY);
 			if ((f = yahoo_friend_find(gc, who)))
 				yahoo_friend_set_buddy_icon_need_request(f, TRUE);
-			gaim_debug_misc("yahoo", "Setting user %s's icon to NULL.\n", who);
+			purple_debug_misc("yahoo", "Setting user %s's icon to NULL.\n", who);
 		}
 	}
 }
 
-void yahoo_send_picture_info(GaimConnection *gc, const char *who)
+void yahoo_send_picture_info(PurpleConnection *gc, const char *who)
 {
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 
 	if (!yd->picture_url) {
-		gaim_debug_warning("yahoo", "Attempted to send picture info without a picture\n");
+		purple_debug_warning("yahoo", "Attempted to send picture info without a picture\n");
 		return;
 	}
 
 	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE, YAHOO_STATUS_AVAILABLE, 0);
-	yahoo_packet_hash(pkt, "sssssi", 1, gaim_connection_get_display_name(gc),
-	                  4, gaim_connection_get_display_name(gc), 5, who,
+	yahoo_packet_hash(pkt, "sssssi", 1, purple_connection_get_display_name(gc),
+	                  4, purple_connection_get_display_name(gc), 5, who,
 	                  13, "2", 20, yd->picture_url, 192, yd->picture_checksum);
 	yahoo_packet_send_and_free(pkt, yd);
 }
 
-void yahoo_send_picture_request(GaimConnection *gc, const char *who)
+void yahoo_send_picture_request(PurpleConnection *gc, const char *who)
 {
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 
 	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE, YAHOO_STATUS_AVAILABLE, 0);
-	yahoo_packet_hash_str(pkt, 4, gaim_connection_get_display_name(gc)); /* me */
+	yahoo_packet_hash_str(pkt, 4, purple_connection_get_display_name(gc)); /* me */
 	yahoo_packet_hash_str(pkt, 5, who); /* the other guy */
 	yahoo_packet_hash_str(pkt, 13, "1"); /* 1 = request, 2 = reply */
 	yahoo_packet_send_and_free(pkt, yd);
 }
 
-void yahoo_send_picture_checksum(GaimConnection *gc)
+void yahoo_send_picture_checksum(PurpleConnection *gc)
 {
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 
 	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE_CHECKSUM, YAHOO_STATUS_AVAILABLE, 0);
-	yahoo_packet_hash(pkt, "ssi", 1, gaim_connection_get_display_name(gc),
+	yahoo_packet_hash(pkt, "ssi", 1, purple_connection_get_display_name(gc),
 			  212, "1", 192, yd->picture_checksum);
 	yahoo_packet_send_and_free(pkt, yd);
 }
 
-void yahoo_send_picture_update_to_user(GaimConnection *gc, const char *who, int type)
+void yahoo_send_picture_update_to_user(PurpleConnection *gc, const char *who, int type)
 {
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
 
 	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE_UPDATE, YAHOO_STATUS_AVAILABLE, 0);
-	yahoo_packet_hash(pkt, "ssi", 1, gaim_connection_get_display_name(gc), 5, who, 206, type);
+	yahoo_packet_hash(pkt, "ssi", 1, purple_connection_get_display_name(gc), 5, who, 206, type);
 	yahoo_packet_send_and_free(pkt, yd);
 }
 
 struct yspufe {
-	GaimConnection *gc;
+	PurpleConnection *gc;
 	int type;
 };
 
@@ -353,7 +353,7 @@
 		yahoo_send_picture_update_to_user(d->gc, who, d->type);
 }
 
-void yahoo_send_picture_update(GaimConnection *gc, int type)
+void yahoo_send_picture_update(PurpleConnection *gc, int type)
 {
 	struct yahoo_data *yd = gc->proto_data;
 	struct yspufe data;
@@ -366,27 +366,27 @@
 
 void yahoo_buddy_icon_upload_data_free(struct yahoo_buddy_icon_upload_data *d)
 {
-	gaim_debug_misc("yahoo", "In yahoo_buddy_icon_upload_data_free()\n");
+	purple_debug_misc("yahoo", "In yahoo_buddy_icon_upload_data_free()\n");
 
 	if (d->str)
 		g_string_free(d->str, TRUE);
 	g_free(d->filename);
 	if (d->watcher)
-		gaim_input_remove(d->watcher);
+		purple_input_remove(d->watcher);
 	if (d->fd != -1)
 		close(d->fd);
 	g_free(d);
 }
 
 /* we couldn't care less about the server's response, but yahoo gets grumpy if we close before it sends it */
-static void yahoo_buddy_icon_upload_reading(gpointer data, gint source, GaimInputCondition condition)
+static void yahoo_buddy_icon_upload_reading(gpointer data, gint source, PurpleInputCondition condition)
 {
 	struct yahoo_buddy_icon_upload_data *d = data;
-	GaimConnection *gc = d->gc;
+	PurpleConnection *gc = d->gc;
 	char buf[1024];
 	int ret;
 
-	if (!GAIM_CONNECTION_IS_VALID(gc)) {
+	if (!PURPLE_CONNECTION_IS_VALID(gc)) {
 		yahoo_buddy_icon_upload_data_free(d);
 		return;
 	}
@@ -399,13 +399,13 @@
 		yahoo_buddy_icon_upload_data_free(d);
 }
 
-static void yahoo_buddy_icon_upload_pending(gpointer data, gint source, GaimInputCondition condition)
+static void yahoo_buddy_icon_upload_pending(gpointer data, gint source, PurpleInputCondition condition)
 {
 	struct yahoo_buddy_icon_upload_data *d = data;
-	GaimConnection *gc = d->gc;
+	PurpleConnection *gc = d->gc;
 	ssize_t wrote;
 
-	if (!GAIM_CONNECTION_IS_VALID(gc)) {
+	if (!PURPLE_CONNECTION_IS_VALID(gc)) {
 		yahoo_buddy_icon_upload_data_free(d);
 		return;
 	}
@@ -419,9 +419,9 @@
 	}
 	d->pos += wrote;
 	if (d->pos >= d->str->len) {
-		gaim_debug_misc("yahoo", "Finished uploading buddy icon.\n");
-		gaim_input_remove(d->watcher);
-		d->watcher = gaim_input_add(d->fd, GAIM_INPUT_READ, yahoo_buddy_icon_upload_reading, d);
+		purple_debug_misc("yahoo", "Finished uploading buddy icon.\n");
+		purple_input_remove(d->watcher);
+		d->watcher = purple_input_add(d->fd, PURPLE_INPUT_READ, yahoo_buddy_icon_upload_reading, d);
 	}
 }
 
@@ -434,19 +434,19 @@
 	const char *host;
 	int port;
 	size_t content_length, pkt_buf_len;
-	GaimConnection *gc;
-	GaimAccount *account;
+	PurpleConnection *gc;
+	PurpleAccount *account;
 	struct yahoo_data *yd;
 
 	gc = d->gc;
-	account = gaim_connection_get_account(gc);
+	account = purple_connection_get_account(gc);
 	yd = gc->proto_data;
 
-	/* Buddy icon connect is now complete; clear the GaimProxyConnectData */
+	/* Buddy icon connect is now complete; clear the PurpleProxyConnectData */
 	yd->buddy_icon_connect_data = NULL;
 
 	if (source < 0) {
-		gaim_debug_error("yahoo", "Buddy icon upload failed: %s\n", error_message);
+		purple_debug_error("yahoo", "Buddy icon upload failed: %s\n", error_message);
 		yahoo_buddy_icon_upload_data_free(d);
 		return;
 	}
@@ -455,10 +455,10 @@
 
 	size = g_strdup_printf("%" G_GSIZE_FORMAT, d->str->len);
 	/* 1 = me, 38 = expire time(?), 0 = me, 28 = size, 27 = filename, 14 = NULL, 29 = data */
-	yahoo_packet_hash_str(pkt, 1, gaim_connection_get_display_name(gc));
+	yahoo_packet_hash_str(pkt, 1, purple_connection_get_display_name(gc));
 	yahoo_packet_hash_str(pkt, 38, "604800"); /* time til expire */
-	gaim_account_set_int(account, YAHOO_PICEXPIRE_SETTING, time(NULL) + 604800);
-	yahoo_packet_hash_str(pkt, 0, gaim_connection_get_display_name(gc));
+	purple_account_set_int(account, YAHOO_PICEXPIRE_SETTING, time(NULL) + 604800);
+	yahoo_packet_hash_str(pkt, 0, purple_connection_get_display_name(gc));
 	yahoo_packet_hash_str(pkt, 28, size);
 	g_free(size);
 	yahoo_packet_hash_str(pkt, 27, d->filename);
@@ -466,8 +466,8 @@
 
 	content_length = YAHOO_PACKET_HDRLEN + yahoo_packet_length(pkt);
 
-	host = gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST);
-	port = gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT);
+	host = purple_account_get_string(account, "xfer_host", YAHOO_XFER_HOST);
+	port = purple_account_get_int(account, "xfer_port", YAHOO_XFER_PORT);
 	header = g_strdup_printf(
 		"POST http://%s:%d/notifyft HTTP/1.0\r\n"
 		"Content-length: %" G_GSIZE_FORMAT "\r\n"
@@ -489,39 +489,39 @@
 	g_free(header);
 
 	d->fd = source;
-	d->watcher = gaim_input_add(d->fd, GAIM_INPUT_WRITE, yahoo_buddy_icon_upload_pending, d);
+	d->watcher = purple_input_add(d->fd, PURPLE_INPUT_WRITE, yahoo_buddy_icon_upload_pending, d);
 
-	yahoo_buddy_icon_upload_pending(d, d->fd, GAIM_INPUT_WRITE);
+	yahoo_buddy_icon_upload_pending(d, d->fd, PURPLE_INPUT_WRITE);
 }
 
-void yahoo_buddy_icon_upload(GaimConnection *gc, struct yahoo_buddy_icon_upload_data *d)
+void yahoo_buddy_icon_upload(PurpleConnection *gc, struct yahoo_buddy_icon_upload_data *d)
 {
-	GaimAccount *account = gaim_connection_get_account(gc);
+	PurpleAccount *account = purple_connection_get_account(gc);
 	struct yahoo_data *yd = gc->proto_data;
 
 	if (yd->buddy_icon_connect_data != NULL) {
 		/* Cancel any in-progress buddy icon upload */
-		gaim_proxy_connect_cancel(yd->buddy_icon_connect_data);
+		purple_proxy_connect_cancel(yd->buddy_icon_connect_data);
 		yd->buddy_icon_connect_data = NULL;
 	}
 
-	yd->buddy_icon_connect_data = gaim_proxy_connect(NULL, account,
-			yd->jp ? gaim_account_get_string(account, "xferjp_host",  YAHOOJP_XFER_HOST)
-			       : gaim_account_get_string(account, "xfer_host",  YAHOO_XFER_HOST),
-			gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
+	yd->buddy_icon_connect_data = purple_proxy_connect(NULL, account,
+			yd->jp ? purple_account_get_string(account, "xferjp_host",  YAHOOJP_XFER_HOST)
+			       : purple_account_get_string(account, "xfer_host",  YAHOO_XFER_HOST),
+			purple_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
 			yahoo_buddy_icon_upload_connected, d);
 
 	if (yd->buddy_icon_connect_data == NULL)
 	{
-		gaim_debug_error("yahoo", "Uploading our buddy icon failed to connect.\n");
+		purple_debug_error("yahoo", "Uploading our buddy icon failed to connect.\n");
 		yahoo_buddy_icon_upload_data_free(d);
 	}
 }
 
-void yahoo_set_buddy_icon(GaimConnection *gc, const char *iconfile)
+void yahoo_set_buddy_icon(PurpleConnection *gc, const char *iconfile)
 {
 	struct yahoo_data *yd = gc->proto_data;
-	GaimAccount *account = gc->account;
+	PurpleAccount *account = gc->account;
 	gchar *icondata;
 	gsize len;
 	GError *error = NULL;
@@ -530,9 +530,9 @@
 		g_free(yd->picture_url);
 		yd->picture_url = NULL;
 
-		gaim_account_set_string(account, YAHOO_PICURL_SETTING, NULL);
-		gaim_account_set_int(account, YAHOO_PICCKSUM_SETTING, 0);
-		gaim_account_set_int(account, YAHOO_PICEXPIRE_SETTING, 0);
+		purple_account_set_string(account, YAHOO_PICURL_SETTING, NULL);
+		purple_account_set_int(account, YAHOO_PICCKSUM_SETTING, 0);
+		purple_account_set_int(account, YAHOO_PICEXPIRE_SETTING, 0);
 		if (yd->logged_in)
 			/* Tell everyone we ain't got one no more */
 			yahoo_send_picture_update(gc, 0);
@@ -540,16 +540,16 @@
 	} else if (g_file_get_contents(iconfile, &icondata, &len, &error)) {
 		GString *s = g_string_new_len(icondata, len);
 		struct yahoo_buddy_icon_upload_data *d;
-		int oldcksum = gaim_account_get_int(account, YAHOO_PICCKSUM_SETTING, 0);
-		int expire = gaim_account_get_int(account, YAHOO_PICEXPIRE_SETTING, 0);
-		const char *oldurl = gaim_account_get_string(account, YAHOO_PICURL_SETTING, NULL);
+		int oldcksum = purple_account_get_int(account, YAHOO_PICCKSUM_SETTING, 0);
+		int expire = purple_account_get_int(account, YAHOO_PICEXPIRE_SETTING, 0);
+		const char *oldurl = purple_account_get_string(account, YAHOO_PICURL_SETTING, NULL);
 
 		yd->picture_checksum = g_string_hash(s);
 
 		if ((yd->picture_checksum == oldcksum) &&
 			(expire > (time(NULL) + 60*60*24)) && oldurl)
 		{
-			gaim_debug_misc("yahoo", "buddy icon is up to date. Not reuploading.\n");
+			purple_debug_misc("yahoo", "buddy icon is up to date. Not reuploading.\n");
 			g_string_free(s, TRUE);
 			g_free(yd->picture_url);
 			yd->picture_url = g_strdup(oldurl);
@@ -570,7 +570,7 @@
 		yahoo_buddy_icon_upload(gc, d);
 
 	} else {
-		gaim_debug_error("yahoo",
+		purple_debug_error("yahoo",
 				"Could not read buddy icon file '%s': %s\n",
 				iconfile, error->message);
 		g_error_free(error);