/pidgin/main: 13870c71e6c6: Clean up some unused stuff

Daniel Atallah datallah at pidgin.im
Sat Mar 2 11:46:02 EST 2013


Changeset: 13870c71e6c6ef1e027d45cf5bb5957edde39e8a
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2013-03-02 11:45 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/13870c71e6c6

Description:

Clean up some unused stuff

diffstat:

 libpurple/protocols/novell/novell.c  |   4 ----
 libpurple/protocols/oscar/oscar.c    |  12 ------------
 libpurple/protocols/oscar/peer.c     |   4 ----
 libpurple/protocols/oscar/userinfo.c |   3 ---
 4 files changed, 0 insertions(+), 23 deletions(-)

diffs (124 lines):

diff --git a/libpurple/protocols/novell/novell.c b/libpurple/protocols/novell/novell.c
--- a/libpurple/protocols/novell/novell.c
+++ b/libpurple/protocols/novell/novell.c
@@ -1177,7 +1177,6 @@ static void
 	const char *dn;
 	const char *name;
 	int idle = 0;
-	gboolean loggedin = TRUE;
 
 	account = purple_buddy_get_account(buddy);
 	name = purple_buddy_get_name(buddy);
@@ -1194,7 +1193,6 @@ static void
 			break;
 		case NM_STATUS_OFFLINE:
 			status_id = NOVELL_STATUS_TYPE_OFFLINE;
-			loggedin = FALSE;
 			break;
 		case NM_STATUS_AWAY_IDLE:
 			status_id = NOVELL_STATUS_TYPE_AWAY;
@@ -1202,7 +1200,6 @@ static void
 			break;
 		default:
 			status_id = NOVELL_STATUS_TYPE_OFFLINE;
-			loggedin = FALSE;
 			break;
 	}
 
@@ -3303,7 +3300,6 @@ novell_set_permit_deny(PurpleConnection 
 				for (node = gc->account->permit; node; node = node->next) {
 					dn = nm_lookup_dn(user, (char *)node->data);
 					if (dn) {
-						user_record = nm_find_user_record(user, dn);
 
 						if (!g_slist_find_custom(user->allow_list,
 												 dn, (GCompareFunc)purple_utf8_strcasecmp)) {
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -2725,7 +2725,6 @@ purple_icons_fetch(PurpleConnection *gc)
 }
 
 static int purple_selfinfo(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
-	int warning_level;
 	va_list ap;
 	aim_userinfo_t *info;
 
@@ -2735,15 +2734,6 @@ static int purple_selfinfo(OscarData *od
 
 	purple_connection_set_display_name(od->gc, info->bn);
 
-	/*
-	 * What's with the + 0.5?
-	 * The 0.5 is basically poor-man's rounding.  Normally
-	 * casting "13.7" to an int will truncate to "13," but
-	 * with 13.7 + 0.5 = 14.2, which becomes "14" when
-	 * truncated.
-	 */
-	warning_level = info->warnlevel/10.0 + 0.5;
-
 	return 1;
 }
 
@@ -4606,7 +4596,6 @@ const char *oscar_list_emblem(PurpleBudd
 	OscarData *od = NULL;
 	PurpleAccount *account = NULL;
 	PurplePresence *presence;
-	PurpleStatus *status;
 	aim_userinfo_t *userinfo = NULL;
 	const char *name;
 
@@ -4620,7 +4609,6 @@ const char *oscar_list_emblem(PurpleBudd
 		userinfo = aim_locate_finduserinfo(od, name);
 
 	presence = purple_buddy_get_presence(b);
-	status = purple_presence_get_active_status(presence);
 
 	if (purple_presence_is_online(presence) == FALSE) {
 		char *gname;
diff --git a/libpurple/protocols/oscar/peer.c b/libpurple/protocols/oscar/peer.c
--- a/libpurple/protocols/oscar/peer.c
+++ b/libpurple/protocols/oscar/peer.c
@@ -603,15 +603,11 @@ void
 peer_connection_listen_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	PeerConnection *conn;
-	OscarData *od;
-	PurpleConnection *gc;
 	struct sockaddr addr;
 	socklen_t addrlen = sizeof(addr);
 	int flags;
 
 	conn = data;
-	od = conn->od;
-	gc = od->gc;
 
 	purple_debug_info("oscar", "Accepting connection on listener socket.\n");
 
diff --git a/libpurple/protocols/oscar/userinfo.c b/libpurple/protocols/oscar/userinfo.c
--- a/libpurple/protocols/oscar/userinfo.c
+++ b/libpurple/protocols/oscar/userinfo.c
@@ -309,7 +309,6 @@ oscar_user_info_append_extra_info(Purple
 {
 	OscarData *od;
 	PurpleAccount *account;
-	PurplePresence *presence = NULL;
 	PurpleGroup *g = NULL;
 	struct buddyinfo *bi = NULL;
 	char *tmp;
@@ -331,7 +330,6 @@ oscar_user_info_append_extra_info(Purple
 		bname = purple_buddy_get_name(b);
 		g = purple_buddy_get_group(b);
 		gname = purple_group_get_name(g);
-		presence = purple_buddy_get_presence(b);
 	}
 
 	if (userinfo != NULL)
@@ -386,7 +384,6 @@ oscar_user_info_display_icq(OscarData *o
 	struct buddyinfo *bi;
 	gchar who[16];
 	PurpleNotifyUserInfo *user_info;
-	const gchar *alias;
 
 	if (!info->uin)
 		return;



More information about the Commits mailing list