Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/bonjour/jabber.c	Wed Feb 20 22:13:23 2013 +0100
+++ b/libpurple/protocols/bonjour/jabber.c	Fri Feb 22 18:54:43 2013 -0500
@@ -181,7 +181,7 @@
 			/* Types of messages sent by iChat */
 			if (html_body_font_node != NULL) {
 				gchar *html_body;
-				const char *font_face, *font_size, *font_color,
+				const char *font_face, *font_size,
 					*ichat_balloon_color, *ichat_text_color;
 
 				font_face = xmlnode_get_attrib(html_body_font_node, "face");
@@ -189,7 +189,7 @@
 				font_size = xmlnode_get_attrib(html_body_font_node, "ABSZ");
 				if (font_size != NULL)
 					font_size = _font_size_ichat_to_purple(atoi(font_size));
-				font_color = xmlnode_get_attrib(html_body_font_node, "color");
+				/*font_color = xmlnode_get_attrib(html_body_font_node, "color");*/
 				ichat_balloon_color = xmlnode_get_attrib(html_body_node, "ichatballooncolor");
 				ichat_text_color = xmlnode_get_attrib(html_body_node, "ichattextcolor");
 

--- a/libpurple/protocols/mxit/multimx.c	Wed Feb 20 22:13:23 2013 +0100
+++ b/libpurple/protocols/mxit/multimx.c	Fri Feb 22 18:54:43 2013 -0500
@@ -275,7 +275,6 @@
 void multimx_invite(struct MXitSession* session, struct contact* contact, const char* creator)
 {
 	GHashTable *components;
-	struct multimx* multimx = NULL;
 
 	purple_debug_info(MXIT_PLUGIN_ID, "Groupchat invite to '%s' (roomid='%s') by '%s'\n", contact->alias, contact->username, creator);
 
@@ -284,7 +283,7 @@
 		return;
 
 	/* Create a new room */
-	multimx = room_create(session, contact->username, contact->alias, STATE_INVITED);
+	room_create(session, contact->username, contact->alias, STATE_INVITED);
 
 	components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 	g_hash_table_insert(components, g_strdup("room"), g_strdup(contact->alias));

--- a/libpurple/protocols/novell/novell.c	Wed Feb 20 22:13:23 2013 +0100
+++ b/libpurple/protocols/novell/novell.c	Fri Feb 22 18:54:43 2013 -0500
@@ -1284,7 +1284,6 @@
 	PurpleBuddy *buddy = NULL;
 	PurpleGroup *group;
 	NMERR_T cnt = 0, i;
-	const char *text = NULL;
 	const char *name = NULL;
 	const char *fname = NULL;
 	int status = 0;
@@ -1327,7 +1326,6 @@
 				user_record = nm_contact_get_user_record(contact);
 				if (user_record) {
 					status = nm_user_record_get_status(user_record);
-					text = nm_user_record_get_status_text(user_record);
 				}
 				_update_buddy_status(user, buddy, status, time(0));
 
@@ -3303,11 +3301,9 @@
 				}
 
 				for (node = gc->account->permit; node; node = node->next) {
-					name = NULL;
 					dn = nm_lookup_dn(user, (char *)node->data);
 					if (dn) {
 						user_record = nm_find_user_record(user, dn);
-						name = nm_user_record_get_display_id(user_record);
 
 						if (!g_slist_find_custom(user->allow_list,
 												 dn, (GCompareFunc)purple_utf8_strcasecmp)) {

--- a/libpurple/protocols/oscar/oscar.c	Wed Feb 20 22:13:23 2013 +0100
+++ b/libpurple/protocols/oscar/oscar.c	Fri Feb 22 18:54:43 2013 -0500
@@ -3471,13 +3471,11 @@
 static guint32
 oscar_get_extended_status(PurpleConnection *gc)
 {
-	OscarData *od;
 	PurpleAccount *account;
 	PurpleStatus *status;
 	const gchar *status_id;
 	guint32 data = 0x00000000;
 
-	od = purple_connection_get_protocol_data(gc);
 	account = purple_connection_get_account(gc);
 	status = purple_account_get_active_status(account);
 	status_id = purple_status_get_id(status);
@@ -4609,7 +4607,6 @@
 	PurpleAccount *account = NULL;
 	PurplePresence *presence;
 	PurpleStatus *status;
-	const char *status_id;
 	aim_userinfo_t *userinfo = NULL;
 	const char *name;
 
@@ -4624,7 +4621,6 @@
 
 	presence = purple_buddy_get_presence(b);
 	status = purple_presence_get_active_status(presence);
-	status_id = purple_status_get_id(status);
 
 	if (purple_presence_is_online(presence) == FALSE) {
 		char *gname;
@@ -4683,7 +4679,6 @@
 	OscarData *od;
 	const PurplePresence *presence;
 	const PurpleStatus *status;
-	const char *id;
 	const char *message;
 	gchar *ret = NULL;
 
@@ -4692,7 +4687,6 @@
 	od = purple_connection_get_protocol_data(gc);
 	presence = purple_buddy_get_presence(b);
 	status = purple_presence_get_active_status(presence);
-	id = purple_status_get_id(status);
 
 	if ((od != NULL) && !purple_presence_is_online(presence))
 	{

--- a/libpurple/protocols/oscar/userinfo.c	Wed Feb 20 22:13:23 2013 +0100
+++ b/libpurple/protocols/oscar/userinfo.c	Fri Feb 22 18:54:43 2013 -0500
@@ -310,7 +310,6 @@
 	OscarData *od;
 	PurpleAccount *account;
 	PurplePresence *presence = NULL;
-	PurpleStatus *status = NULL;
 	PurpleGroup *g = NULL;
 	struct buddyinfo *bi = NULL;
 	char *tmp;
@@ -333,7 +332,6 @@
 		g = purple_buddy_get_group(b);
 		gname = purple_group_get_name(g);
 		presence = purple_buddy_get_presence(b);
-		status = purple_presence_get_active_status(presence);
 	}
 
 	if (userinfo != NULL)
@@ -485,10 +483,6 @@
 		oscar_user_info_convert_and_add_hyperlink(account, od, user_info, _("Web Page"), info->email, "");
 	}
 
-	if (buddy != NULL)
-		alias = purple_buddy_get_alias(buddy);
-	else
-		alias = who;
 	purple_notify_userinfo(gc, who, user_info, NULL, NULL);
 	purple_notify_user_info_destroy(user_info);
 }
@@ -547,4 +541,4 @@
 
 	purple_notify_userinfo(gc, userinfo->bn, user_info, NULL, NULL);
 	purple_notify_user_info_destroy(user_info);
-}
\ No newline at end of file
+}

--- a/libpurple/protocols/sametime/sametime.c	Wed Feb 20 22:13:23 2013 +0100
+++ b/libpurple/protocols/sametime/sametime.c	Fri Feb 22 18:54:43 2013 -0500
@@ -986,7 +986,6 @@
   struct mwSametimeUser *stuser;
 
   PurpleGroup *group;
-  PurpleBuddy *buddy;
 
   GList *gl, *gtl, *ul, *utl;
 
@@ -1000,7 +999,7 @@
     for(; ul; ul = ul->next) {
 
       stuser = (struct mwSametimeUser *) ul->data;
-      buddy = buddy_ensure(gc, group, stuser);
+      buddy_ensure(gc, group, stuser);
     }
     g_list_free(utl);
   }

--- a/libpurple/protocols/simple/simple.c	Wed Feb 20 22:13:23 2013 +0100
+++ b/libpurple/protocols/simple/simple.c	Fri Feb 22 18:54:43 2013 -0500
@@ -901,11 +901,11 @@
 
 		for(item = xmlnode_get_child(isc, "contact"); item; item = xmlnode_get_next_twin(item))
 		{
-			const char *uri, *name, *groups;
+			const char *uri;
 			char *buddy_name;
 			uri = xmlnode_get_attrib(item, "uri");
-			name = xmlnode_get_attrib(item, "name");
-			groups = xmlnode_get_attrib(item, "groups");
+			/*name = xmlnode_get_attrib(item, "name");
+			groups = xmlnode_get_attrib(item, "groups");*/
 			purple_debug_info("simple", "URI->%s\n", uri);
 
 			buddy_name = g_strdup_printf("sip:%s", uri);

--- a/libpurple/protocols/yahoo/yahoo_doodle.c	Wed Feb 20 22:13:23 2013 +0100
+++ b/libpurple/protocols/yahoo/yahoo_doodle.c	Fri Feb 22 18:54:43 2013 -0500
@@ -104,20 +104,18 @@
 {
 	PurpleAccount *account;
 	char *to = (char*)name;
-	PurpleWhiteboard *wb;
 
 	g_return_if_fail(gc);
 	g_return_if_fail(name);
 
 	account = purple_connection_get_account(gc);
-	wb = purple_whiteboard_get_session(account, to);
 
-	if(wb == NULL)
+	if(purple_whiteboard_get_session(account, to) == NULL)
 	{
 		/* Insert this 'session' in the list.  At this point, it's only a
 		 * requested session.
 		 */
-		wb = purple_whiteboard_create(account, to, DOODLE_STATE_REQUESTING);
+		purple_whiteboard_create(account, to, DOODLE_STATE_REQUESTING);
 	}
 
 	/* NOTE Perhaps some careful handling of remote assumed established

--- a/libpurple/protocols/zephyr/zephyr.c	Wed Feb 20 22:13:23 2013 +0100
+++ b/libpurple/protocols/zephyr/zephyr.c	Fri Feb 22 18:54:43 2013 -0500
@@ -1515,10 +1515,10 @@
 		while (fgets(buff, BUFSIZ, fd)) {
 			strip_comments(buff);
 			if (buff[0]) {
-				if (!(b = purple_find_buddy(gc->account, buff))) {
+				if (!purple_find_buddy(gc->account, buff)) {
 					char *stripped_user = zephyr_strip_local_realm(zephyr,buff);
 					purple_debug_info("zephyr","stripped_user %s\n",stripped_user);
-					if (!(b = purple_find_buddy(gc->account,stripped_user))){
+					if (!purple_find_buddy(gc->account,stripped_user)){
 						b = purple_buddy_new(gc->account, stripped_user, NULL);
 						purple_blist_add_buddy(b, NULL, g, NULL);
 					}

--- a/libpurple/smiley.c	Wed Feb 20 22:13:23 2013 +0100
+++ b/libpurple/smiley.c	Fri Feb 22 18:54:43 2013 -0500
@@ -114,7 +114,7 @@
 
 static PurpleSmiley *purple_smiley_create(const char *shortcut);
 
-static PurpleSmiley *purple_smiley_load_file(const char *shortcut, const char *checksum,
+static void purple_smiley_load_file(const char *shortcut, const char *checksum,
 		const char *filename);
 
 static void
@@ -227,10 +227,9 @@
  * Reading from disk                                                 *
  *********************************************************************/
 
-static PurpleSmiley *
+static void
 parse_smiley(xmlnode *smiley_node)
 {
-	PurpleSmiley *smiley;
 	const char *shortcut = NULL;
 	const char *checksum = NULL;
 	const char *filename = NULL;
@@ -240,11 +239,9 @@
 	filename = xmlnode_get_attrib(smiley_node, XML_FILENAME_ATRIB_TAG);
 
 	if ((shortcut == NULL) || (checksum == NULL) || (filename == NULL))
-		return NULL;
+		return;
 
-	smiley = purple_smiley_load_file(shortcut, checksum, filename);
-
-	return smiley;
+	purple_smiley_load_file(shortcut, checksum, filename);
 }
 
 static void
@@ -272,9 +269,7 @@
 		smiley_node = xmlnode_get_child(smileyset_node, XML_SMILEY_TAG);
 		for (; smiley_node != NULL;
 				smiley_node = xmlnode_get_next_twin(smiley_node)) {
-			PurpleSmiley *smiley;
-
-			smiley = parse_smiley(smiley_node);
+			parse_smiley(smiley_node);
 		}
 	}
 
@@ -473,7 +468,7 @@
 	return path;
 }
 
-static PurpleSmiley *
+static void
 purple_smiley_load_file(const char *shortcut, const char *checksum, const char *filename)
 {
 	PurpleSmiley *smiley = NULL;
@@ -481,18 +476,20 @@
 	size_t smiley_data_len;
 	char *fullpath = NULL;
 
-	g_return_val_if_fail(shortcut  != NULL, NULL);
-	g_return_val_if_fail(checksum  != NULL, NULL);
-	g_return_val_if_fail(filename != NULL, NULL);
+	g_return_if_fail(shortcut  != NULL);
+	g_return_if_fail(checksum  != NULL);
+	g_return_if_fail(filename != NULL);
 
 	fullpath = get_file_full_path(filename);
-	if (!fullpath)
-		return NULL;
+	if (!fullpath) {
+		purple_debug_error(SMILEYS_LOG_ID, "Path for filename %s doesn't exist\n", filename);
+		return;
+	}
 
 	smiley = purple_smiley_create(shortcut);
 	if (!smiley) {
 		g_free(fullpath);
-		return NULL;
+		return;
 	}
 
 	smiley->checksum = g_strdup(checksum);
@@ -505,7 +502,6 @@
 
 	g_free(fullpath);
 
-	return smiley;
 }
 
 static void

--- a/pidgin/gtkconv.c	Wed Feb 20 22:13:23 2013 +0100
+++ b/pidgin/gtkconv.c	Fri Feb 22 18:54:43 2013 -0500
@@ -4278,7 +4278,7 @@
 											 matches->data, -1);
 
 		g_free(matches->data);
-		matches = g_list_remove(matches, matches->data);
+		g_list_free(matches);
 	}
 	else {
 		/*

--- a/pidgin/gtkdocklet.c	Wed Feb 20 22:13:23 2013 +0100
+++ b/pidgin/gtkdocklet.c	Fri Feb 22 18:54:43 2013 -0500
@@ -188,7 +188,6 @@
 	for(l = purple_accounts_get_all(); l != NULL; l = l->next) {
 
 		PurpleAccount *account = (PurpleAccount*)l->data;
-		PurpleStatus *account_status;
 
 		if (!purple_account_get_enabled(account, PIDGIN_UI))
 			continue;
@@ -196,7 +195,6 @@
 		if (purple_account_is_disconnected(account))
 			continue;
 
-		account_status = purple_account_get_active_status(account);
 		if (purple_account_is_connecting(account))
 			newconnecting = TRUE;
 	}

--- a/pidgin/gtkpounce.c	Wed Feb 20 22:13:23 2013 +0100
+++ b/pidgin/gtkpounce.c	Fri Feb 22 18:54:43 2013 -0500
@@ -1419,7 +1419,6 @@
 	if (purple_pounce_action_is_enabled(pounce, "popup-notify"))
 	{
 		char *tmp;
-		const char *name_shown;
 		const char *reason;
 		reason = purple_pounce_action_get_attribute(pounce, "popup-notify",
 														  "reason");
@@ -1452,14 +1451,6 @@
 				   _("Unknown.... Please report this!")
 				   );
 
-		/*
-		 * Ok here is where I change the second argument, title, from
-		 * NULL to the account alias if we have it or the account
-		 * name if that's all we have
-		 */
-		if ((name_shown = purple_account_get_alias(account)) == NULL)
-			name_shown = purple_account_get_username(account);
-
 		pidgin_notify_pounce_add(account, pounce, alias, tmp, reason,
 				purple_date_format_full(NULL));