pidgin: 9e7a8858: Silence a swath of warnings regarding se...
darkrain42 at pidgin.im
darkrain42 at pidgin.im
Tue May 3 01:45:48 EDT 2011
----------------------------------------------------------------------
Revision: 9e7a88587826b22cdf5014a8e49ad2ca09626c1f
Parent: e3412a6219d7668318714021df92d7880656f447
Author: darkrain42 at pidgin.im
Date: 05/03/11 01:31:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9e7a88587826b22cdf5014a8e49ad2ca09626c1f
Changelog:
Silence a swath of warnings regarding set-but-unused.
Changes against parent e3412a6219d7668318714021df92d7880656f447
patched libpurple/protocols/gg/gg.c
patched libpurple/protocols/jabber/si.c
patched libpurple/protocols/msn/switchboard.c
patched libpurple/protocols/myspace/myspace.c
patched libpurple/protocols/myspace/user.c
-------------- next part --------------
============================================================
--- libpurple/protocols/gg/gg.c bf3dc2bdd23f0c8b823d1f93e2a4c1cefc80dc1e
+++ libpurple/protocols/gg/gg.c 65e88015ce6f3ce5c7b5ae19472df30c9c6ce926
@@ -818,7 +818,6 @@ static void ggp_callback_add_to_chat_ok(
static void ggp_callback_add_to_chat_ok(PurpleBuddy *buddy, PurpleRequestFields *fields)
{
- GGPInfo *info;
PurpleConnection *conn;
PurpleRequestField *field;
GList *sel;
@@ -827,8 +826,6 @@ static void ggp_callback_add_to_chat_ok(
g_return_if_fail(conn != NULL);
- info = conn->proto_data;
-
field = purple_request_fields_get_field(fields, "name");
sel = purple_request_field_list_get_selected(field);
@@ -2595,10 +2592,7 @@ static void ggp_register_user(PurpleAcco
static void ggp_register_user(PurpleAccount *account)
{
PurpleConnection *gc = purple_account_get_connection(account);
- GGPInfo *info;
- info = gc->proto_data = g_new0(GGPInfo, 1);
-
ggp_token_request(gc, ggp_register_user_dialog);
}
============================================================
--- libpurple/protocols/msn/switchboard.c 2cd7f767716033345057d934c630c04e093c16cb
+++ libpurple/protocols/msn/switchboard.c e9d36aa19e7e337d760d7b64d3f3f06c0304f284
@@ -643,10 +643,8 @@ iro_cmd(MsnCmdProc *cmdproc, MsnCommand
static void
iro_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
{
- PurpleAccount *account;
MsnSwitchBoard *swboard;
- account = cmdproc->session->account;
swboard = cmdproc->data;
swboard->total_users = atoi(cmd->params[2]);
@@ -658,14 +656,12 @@ joi_cmd(MsnCmdProc *cmdproc, MsnCommand
joi_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
{
MsnSession *session;
- PurpleAccount *account;
MsnSwitchBoard *swboard;
const char *passport;
passport = cmd->params[0];
session = cmdproc->session;
- account = session->account;
swboard = cmdproc->data;
msn_switchboard_add_user(swboard, passport);
============================================================
--- libpurple/protocols/jabber/si.c 29ae5a130fa7c0918da00beebd2b1ef118f71c28
+++ libpurple/protocols/jabber/si.c 5c71626b1c71320ec760266986915f3de9505a98
@@ -1691,7 +1691,10 @@ void jabber_si_parse(JabberStream *js, c
{
JabberSIXfer *jsx;
PurpleXfer *xfer;
- xmlnode *file, *feature, *x, *field, *option, *value, *thumbnail;
+ xmlnode *file, *feature, *x, *field, *option, *value;
+#if ENABLE_FT_THUMBNAILS
+ xmlnode *thumbnail;
+#endif
const char *stream_id, *filename, *filesize_c, *profile;
guint64 filesize_64 = 0;
size_t filesize = 0;
@@ -1802,7 +1805,6 @@ void jabber_si_parse(JabberStream *js, c
purple_xfer_request(xfer);
}
#else
- thumbnail = NULL; /* Silence warning */
purple_xfer_request(xfer);
#endif
}
============================================================
--- libpurple/protocols/myspace/myspace.c 8b720fae9e178327c605495ac5176308e90fc288
+++ libpurple/protocols/myspace/myspace.c a0f5f587c444aa3bf24e8ef599318e94795011eb
@@ -377,20 +377,14 @@ msim_status_text(PurpleBuddy *buddy)
static char *
msim_status_text(PurpleBuddy *buddy)
{
- MsimSession *session;
MsimUser *user;
- const gchar *display_name, *headline;
+ const gchar *display_name = NULL, *headline = NULL;
PurpleAccount *account;
- PurpleConnection *gc;
g_return_val_if_fail(buddy != NULL, NULL);
account = purple_buddy_get_account(buddy);
- gc = purple_account_get_connection(account);
- session = (MsimSession *)gc->proto_data;
- display_name = headline = NULL;
-
user = msim_get_user_from_buddy(buddy, FALSE);
if (user != NULL) {
/* Retrieve display name and/or headline, depending on user preference. */
@@ -859,7 +853,6 @@ msim_check_inbox_cb(MsimSession *session
msim_check_inbox_cb(MsimSession *session, const MsimMessage *reply, gpointer data)
{
MsimMessage *body;
- guint old_inbox_status;
guint i, n;
/* Information for each new inbox message type. */
static struct
@@ -896,8 +889,6 @@ msim_check_inbox_cb(MsimSession *session
if (body == NULL)
return;
- old_inbox_status = session->inbox_status;
-
n = 0;
for (i = 0; i < G_N_ELEMENTS(message_types); ++i) {
@@ -1357,7 +1348,6 @@ msim_incoming_status(MsimSession *sessio
static gboolean
msim_incoming_status(MsimSession *session, MsimMessage *msg)
{
- PurpleBuddyList *blist;
MsimUser *user;
GList *list;
gchar *status_headline, *status_headline_escaped;
@@ -1391,8 +1381,6 @@ msim_incoming_status(MsimSession *sessio
purple_debug_info("msim", "msim_status: %s's status code = %d\n", username, status_code);
status_headline = msim_msg_get_string_from_element(g_list_nth_data(list, MSIM_STATUS_ORDINAL_HEADLINE));
- blist = purple_get_blist();
-
/* Add buddy if not found.
* TODO: Could this be responsible for #3444? */
user = msim_find_user(session, username);
@@ -2026,7 +2014,6 @@ msim_input_cb(gpointer gc_uncasted, gint
msim_input_cb(gpointer gc_uncasted, gint source, PurpleInputCondition cond)
{
PurpleConnection *gc;
- PurpleAccount *account;
MsimSession *session;
gchar *end;
int n;
@@ -2035,7 +2022,6 @@ msim_input_cb(gpointer gc_uncasted, gint
g_return_if_fail(source >= 0); /* Note: 0 is a valid fd */
gc = (PurpleConnection *)(gc_uncasted);
- account = purple_connection_get_account(gc);
session = gc->proto_data;
/* libpurple/eventloop.h only defines these two */
@@ -3187,14 +3173,11 @@ static GList *
* Actions menu for account.
*/
static GList *
-msim_actions(PurplePlugin *plugin, gpointer context)
+msim_actions(PurplePlugin *plugin, gpointer context /* PurpleConnection* */)
{
- PurpleConnection *gc;
GList *menu;
PurplePluginAction *act;
- gc = (PurpleConnection *)context;
-
menu = NULL;
#if 0
============================================================
--- libpurple/protocols/myspace/user.c cb959bd0fe818bff43000b0af3023ec56fdc4db9
+++ libpurple/protocols/myspace/user.c b59cb830479ac0022aaf6d1c91b91f55f8d1075d
@@ -565,7 +565,7 @@ msim_lookup_user(MsimSession *session, c
{
MsimMessage *body;
gchar *field_name;
- guint rid, cmd, dsn, lid;
+ guint rid, dsn, lid;
g_return_if_fail(user != NULL);
/* Callback can be null to not call anything, just lookup & store information. */
@@ -579,8 +579,6 @@ msim_lookup_user(MsimSession *session, c
/* Send request */
- cmd = MSIM_CMD_GET;
-
if (msim_is_userid(user)) {
field_name = "UserID";
dsn = MG_MYSPACE_INFO_BY_ID_DSN;
@@ -602,7 +600,7 @@ msim_lookup_user(MsimSession *session, c
g_return_if_fail(msim_send(session,
"persist", MSIM_TYPE_INTEGER, 1,
"sesskey", MSIM_TYPE_INTEGER, session->sesskey,
- "cmd", MSIM_TYPE_INTEGER, 1,
+ "cmd", MSIM_TYPE_INTEGER, MSIM_CMD_GET,
"dsn", MSIM_TYPE_INTEGER, dsn,
"uid", MSIM_TYPE_INTEGER, session->userid,
"lid", MSIM_TYPE_INTEGER, lid,
More information about the Commits
mailing list