# HG changeset patch
# User Richard Laager <rlaager@pidgin.im>
# Date 1146515857 0
# Node ID 1ae8790174a45ed11eaec6971b66f2eb4776de6d
# Parent  fa55fb41ed0d8c38d50af6e31d6ec714dc47b350
[gaim-migrate @ 16115]
Resolve some unused value CIDs. This changeset just removes dead code.

jabber
	chat.c
		CID 180
		CID 181
msn
	httpconn.c
		CID 179
	msn.c
		CID 185
		CID 186
	notification.c
		CID 189
	slp.c
		CID 183
		CID 184
	switchboard.c
		CID 178
	sync.c
		CID 187
		CID 188
	user.c
		CID 182
novell
	novell.c
		CID 190
sametime
	sametime.c
		CID 214
		CID 215
yahoo
	yahoo.c
		CID 200
		CID 201
		CID 202
	yahoo_doodle.c
		CID 168
		CID 169
	yahoo_filexfer.c
		CID 170
		CID 171
		CID 172

diff -r fa55fb41ed0d -r 1ae8790174a4 src/protocols/jabber/chat.c
--- a/src/protocols/jabber/chat.c	Mon May 01 20:31:25 2006 +0000
+++ b/src/protocols/jabber/chat.c	Mon May 01 20:37:37 2006 +0000
@@ -408,7 +408,6 @@
 
 void jabber_chat_request_room_configure(JabberChat *chat) {
 	JabberIq *iq;
-	xmlnode *query;
 	char *room_jid;
 
 	if(!chat)
@@ -424,7 +423,6 @@
 
 	iq = jabber_iq_new_query(chat->js, JABBER_IQ_GET,
 			"http://jabber.org/protocol/muc#owner");
-	query = xmlnode_get_child(iq->node, "query");
 	room_jid = g_strdup_printf("%s@%s", chat->room, chat->server);
 
 	xmlnode_set_attrib(iq->node, "to", room_jid);
@@ -946,7 +944,7 @@
 static void jabber_chat_disco_traffic_cb(JabberStream *js, xmlnode *packet, gpointer data)
 {
 	JabberChat *chat;
-	xmlnode *query, *x, *error;
+	xmlnode *query, *x;
 	int id = GPOINTER_TO_INT(data);
 
 	if(!(chat = jabber_chat_find_by_id(js, id)))
@@ -956,7 +954,7 @@
 	 * support this request */
 	chat->xhtml = TRUE;
 
-	if((error = xmlnode_get_child(packet, "error"))) {
+	if(xmlnode_get_child(packet, "error")) {
 		return;
 	}
 
diff -r fa55fb41ed0d -r 1ae8790174a4 src/protocols/msn/httpconn.c
--- a/src/protocols/msn/httpconn.c	Mon May 01 20:31:25 2006 +0000
+++ b/src/protocols/msn/httpconn.c	Mon May 01 20:37:37 2006 +0000
@@ -564,7 +564,6 @@
 						size_t size, char **ret_buf, size_t *ret_size,
 						gboolean *error)
 {
-	GaimConnection *gc;
 	const char *s, *c;
 	char *header, *body;
 	const char *body_start;
@@ -585,8 +584,6 @@
 
 	httpconn->waiting_response = FALSE;
 
-	gc = gaim_account_get_connection(httpconn->session->account);
-
 	/* Healthy defaults. */
 	body = NULL;
 
diff -r fa55fb41ed0d -r 1ae8790174a4 src/protocols/msn/msn.c
--- a/src/protocols/msn/msn.c	Mon May 01 20:31:25 2006 +0000
+++ b/src/protocols/msn/msn.c	Mon May 01 20:37:37 2006 +0000
@@ -401,12 +401,10 @@
 	if ((fp = g_fopen(filename, "rb")) == NULL)
 	{
 		GaimAccount *account;
-		GaimConnection *gc;
 		const char *who;
 		char *msg;
 
 		account = slplink->session->account;
-		gc = gaim_account_get_connection(account);
 		who = slplink->remote_user;
 
 		msg = g_strdup_printf(_("Error reading %s: \n%s.\n"),
@@ -1354,12 +1352,9 @@
 
 	if (b)
 	{
-		GaimPresence *presence;
 		GString *str = g_string_new("");
 		char *tmp;
 
-		presence = gaim_buddy_get_presence(b);
-
 		if (b->alias && b->alias[0])
 		{
 			char *aliastext = g_markup_escape_text(b->alias, -1);
diff -r fa55fb41ed0d -r 1ae8790174a4 src/protocols/msn/notification.c
--- a/src/protocols/msn/notification.c	Mon May 01 20:31:25 2006 +0000
+++ b/src/protocols/msn/notification.c	Mon May 01 20:37:37 2006 +0000
@@ -557,7 +557,6 @@
 static void
 adg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	MsnGroup *group;
 	MsnSession *session;
 	gint group_id;
 	const char *group_name;
@@ -568,7 +567,7 @@
 
 	group_name = gaim_url_decode(cmd->params[2]);
 
-	group = msn_group_new(session->userlist, group_id, group_name);
+	msn_group_new(session->userlist, group_id, group_name);
 
 	/* There is a user that must me moved to this group */
 	if (cmd->trans->data)
diff -r fa55fb41ed0d -r 1ae8790174a4 src/protocols/msn/slp.c
--- a/src/protocols/msn/slp.c	Mon May 01 20:31:25 2006 +0000
+++ b/src/protocols/msn/slp.c	Mon May 01 20:37:37 2006 +0000
@@ -253,7 +253,6 @@
 		MsnSlpMessage *slpmsg;
 		MsnObject *obj;
 		char *msnobj_data;
-		const char *sha1c;
 		const char *file_name;
 		char *content;
 		gsize len;
@@ -273,7 +272,6 @@
 		msnobj_data = (char *)gaim_base64_decode(context, &len);
 		obj = msn_object_new_from_string(msnobj_data);
 		type = msn_object_get_type(obj);
-		sha1c = msn_object_get_sha1c(obj);
 		g_free(msnobj_data);
 
 		if (!(type == MSN_OBJECT_USERTILE))
@@ -1095,10 +1093,8 @@
 	else
 	{
 		MsnObject *my_obj = NULL;
-		const char *filename = NULL;
 		gchar *data = NULL;
 		gsize len = 0;
-		const char *my_info = NULL;
 		GSList *sl, *list;
 
 #ifdef MSN_DEBUG_UD
@@ -1109,13 +1105,12 @@
 
 		if (my_obj != NULL)
 		{
-			filename = msn_object_get_real_location(my_obj);
-			my_info = msn_object_get_sha1c(my_obj);
+			const char *filename = msn_object_get_real_location(my_obj);
+
+			if (filename != NULL)
+				g_file_get_contents(filename, &data, &len, NULL);
 		}
 
-		if (filename != NULL)
-			g_file_get_contents(filename, &data, &len, NULL);
-
 		/* TODO: I think we need better buddy icon core functions. */
 		gaim_buddy_icons_set_for_user(account, user->passport, (void *)data, len);
 		g_free(data);
diff -r fa55fb41ed0d -r 1ae8790174a4 src/protocols/msn/switchboard.c
--- a/src/protocols/msn/switchboard.c	Mon May 01 20:31:25 2006 +0000
+++ b/src/protocols/msn/switchboard.c	Mon May 01 20:37:37 2006 +0000
@@ -899,7 +899,6 @@
 {
 	GaimConnection *gc;
 	MsnSwitchBoard *swboard;
-	const char *value;
 	char *passport;
 
 	gc = cmdproc->session->account->gc;
@@ -907,7 +906,7 @@
 	passport = msg->remote_user;
 
 	if (swboard->current_users == 1 &&
-		(value = msn_message_get_attr(msg, "TypingUser")) != NULL)
+		msn_message_get_attr(msg, "TypingUser") != NULL)
 	{
 		serv_got_typing(gc, passport, MSN_TYPING_RECV_TIMEOUT,
 						GAIM_TYPING);
diff -r fa55fb41ed0d -r 1ae8790174a4 src/protocols/msn/sync.c
--- a/src/protocols/msn/sync.c	Mon May 01 20:31:25 2006 +0000
+++ b/src/protocols/msn/sync.c	Mon May 01 20:37:37 2006 +0000
@@ -89,24 +89,22 @@
 lsg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session = cmdproc->session;
-	MsnGroup *group;
-	GaimGroup *g;
 	const char *name;
 	int group_id;
 
 	group_id = atoi(cmd->params[0]);
 	name = gaim_url_decode(cmd->params[1]);
 
-	group = msn_group_new(session->userlist, group_id, name);
+	msn_group_new(session->userlist, group_id, name);
 
 	/* HACK */
 	if (group_id == 0)
 		/* Group of ungroupped buddies */
 		return;
 
-	if ((g = gaim_find_group(name)) == NULL)
+	if ((gaim_find_group(name)) == NULL)
 	{
-		g = gaim_group_new(name);
+		GaimGroup *g = gaim_group_new(name);
 		gaim_blist_add_group(g, NULL);
 	}
 }
diff -r fa55fb41ed0d -r 1ae8790174a4 src/protocols/msn/user.c
--- a/src/protocols/msn/user.c	Mon May 01 20:31:25 2006 +0000
+++ b/src/protocols/msn/user.c	Mon May 01 20:37:37 2006 +0000
@@ -78,10 +78,8 @@
 msn_user_update(MsnUser *user)
 {
 	GaimAccount *account;
-	GaimConnection *gc;
 
 	account = user->userlist->session->account;
-	gc = gaim_account_get_connection(account);
 
 	if (user->status != NULL)
 		gaim_prpl_got_user_status(account, user->passport, user->status, NULL);
diff -r fa55fb41ed0d -r 1ae8790174a4 src/protocols/novell/novell.c
--- a/src/protocols/novell/novell.c	Mon May 01 20:31:25 2006 +0000
+++ b/src/protocols/novell/novell.c	Mon May 01 20:37:37 2006 +0000
@@ -956,7 +956,6 @@
 	GaimConnection *gc;
 	NMUserRecord *user_record = resp_data;
 	char *err;
-	const char *display_id;
 	GSList *cnode;
 	NMConference *conference;
 	gpointer chat;
@@ -966,7 +965,6 @@
 		return;
 
 	gc = gaim_account_get_connection(user->client_data);
-	display_id = nm_user_record_get_display_id(user_record);
 
 	if (ret_code == NM_OK) {
 
diff -r fa55fb41ed0d -r 1ae8790174a4 src/protocols/sametime/sametime.c
--- a/src/protocols/sametime/sametime.c	Mon May 01 20:31:25 2006 +0000
+++ b/src/protocols/sametime/sametime.c	Mon May 01 20:37:37 2006 +0000
@@ -1176,7 +1176,6 @@
 
   struct mwGaimPluginData *pd = data;
   struct mwSametimeList *stlist;
-  struct mwSession *s;
 
   struct mwGetBuffer *b;
 
@@ -1193,8 +1192,6 @@
   stlist = mwSametimeList_new();
   mwSametimeList_get(b, stlist);
 
-  s = mwService_getSession(MW_SERVICE(srvc));
-
   /* merge or synch depending on preferences */
   if(BLIST_PREF_IS_MERGE() || BLIST_PREF_IS_STORE()) {
     blist_merge(pd->gc, stlist);
@@ -2615,8 +2612,6 @@
 			 struct mwGaimPluginData *pd,
 			 const char *data) {
 
-  struct mwIdBlock *idb;
-
   GHashTable *img_by_cid;
   GList *images;
 
@@ -2625,8 +2620,6 @@
   GaimMimeDocument *doc;
   const GList *parts;
 
-  idb = mwConversation_getTarget(conv);
-
   img_by_cid = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
   images = NULL;
 
diff -r fa55fb41ed0d -r 1ae8790174a4 src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Mon May 01 20:31:25 2006 +0000
+++ b/src/protocols/yahoo/yahoo.c	Mon May 01 20:37:37 2006 +0000
@@ -2383,15 +2383,15 @@
 {
 	if (!strcmp(key, "passwd"))
 		return;
-	url = g_string_append_c(url, '&');
-	url = g_string_append(url, key);
-	url = g_string_append_c(url, '=');
+	g_string_append_c(url, '&');
+	g_string_append(url, key);
+	g_string_append_c(url, '=');
 	if (!strcmp(key, ".save") || !strcmp(key, ".js"))
-		url = g_string_append_c(url, '1');
+		g_string_append_c(url, '1');
 	else if (!strcmp(key, ".challenge"))
-		url = g_string_append(url, val);
+		g_string_append(url, val);
 	else
-		url = g_string_append(url, gaim_url_encode(val));
+		g_string_append(url, gaim_url_encode(val));
 }
 
 static GHashTable *yahoo_login_page_hash(const char *buf, size_t len)
@@ -2669,7 +2669,6 @@
 	YahooFriend *f;
 	GaimPresence *presence;
 	GaimStatus *status;
-	const char *status_id;
 
 	if (!b || !(account = b->account) || !(gc = gaim_account_get_connection(account)) ||
 					     !(yd = gc->proto_data))
@@ -2683,7 +2682,6 @@
 
 	presence = gaim_buddy_get_presence(b);
 	status = gaim_presence_get_active_status(presence);
-	status_id = gaim_status_get_id(status);
 
 	if (gaim_presence_is_online(presence) == FALSE) {
 		*se = "offline";
@@ -3383,14 +3381,13 @@
 static void yahoo_remove_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group)
 {
 	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;
-	YahooFriend *f;
         struct yahoo_packet *pkt;
 	GSList *buddies, *l;
 	GaimGroup *g;
 	gboolean remove = TRUE;
 	char *cg;
 
-	if (!(f = yahoo_friend_find(gc, buddy->name)))
+	if (!(yahoo_friend_find(gc, buddy->name)))
 		return;
 
 	buddies = gaim_find_buddies(gaim_connection_get_account(gc), buddy->name);
diff -r fa55fb41ed0d -r 1ae8790174a4 src/protocols/yahoo/yahoo_doodle.c
--- a/src/protocols/yahoo/yahoo_doodle.c	Mon May 01 20:31:25 2006 +0000
+++ b/src/protocols/yahoo/yahoo_doodle.c	Mon May 01 20:37:37 2006 +0000
@@ -116,7 +116,7 @@
 		/* Insert this 'session' in the list.  At this point, it's only a
 		 * requested session.
 		 */
-		wb = gaim_whiteboard_create(account, to, DOODLE_STATE_REQUESTING);
+		gaim_whiteboard_create(account, to, DOODLE_STATE_REQUESTING);
 	}
 
 	/* NOTE Perhaps some careful handling of remote assumed established
@@ -193,7 +193,7 @@
 		dialog_message, NULL, NULL, NULL);
 		*/
 
-		wb = gaim_whiteboard_create(account, from, DOODLE_STATE_REQUESTED);
+		gaim_whiteboard_create(account, from, DOODLE_STATE_REQUESTED);
 
 		yahoo_doodle_command_send_request(gc, from);
 	}
diff -r fa55fb41ed0d -r 1ae8790174a4 src/protocols/yahoo/yahoo_filexfer.c
--- a/src/protocols/yahoo/yahoo_filexfer.c	Mon May 01 20:31:25 2006 +0000
+++ b/src/protocols/yahoo/yahoo_filexfer.c	Mon May 01 20:37:37 2006 +0000
@@ -281,10 +281,8 @@
 
 static void yahoo_xfer_end(GaimXfer *xfer)
 {
-	GaimAccount *account;
 	struct yahoo_xfer_data *xfer_data;
 
-	account   = gaim_xfer_get_account(xfer);
 	xfer_data = xfer->data;
 
 	if (xfer_data)
@@ -400,11 +398,9 @@
 
 static void yahoo_xfer_cancel_send(GaimXfer *xfer)
 {
-	GaimAccount *account;
 	struct yahoo_xfer_data *xfer_data;
 
 	xfer_data = xfer->data;
-	account   = gaim_xfer_get_account(xfer);
 
 	if (xfer_data)
 		yahoo_xfer_data_free(xfer_data);
@@ -413,10 +409,8 @@
 
 static void yahoo_xfer_cancel_recv(GaimXfer *xfer)
 {
-	GaimAccount *account;
 	struct yahoo_xfer_data *xfer_data;
 
-	account   = gaim_xfer_get_account(xfer);
 	xfer_data = xfer->data;
 
 	if (xfer_data)