diff options
author | Paul Aurich <darkrain42@pidgin.im> | 2011-05-03 05:31:38 +0000 |
---|---|---|
committer | Paul Aurich <darkrain42@pidgin.im> | 2011-05-03 05:31:38 +0000 |
commit | 1a463b90b944aa40cfea673360fab47abc4fe65f (patch) | |
tree | 182a06c596a9b5c57fe3d6c2317d78ab2c0520c6 | |
parent | e62abedae68b9105bdd5265360aaaef0b9675110 (diff) | |
download | pidgin-1a463b90b944aa40cfea673360fab47abc4fe65f.tar.gz |
Silence a swath of warnings regarding set-but-unused.
-rw-r--r-- | libpurple/protocols/gg/gg.c | 6 | ||||
-rw-r--r-- | libpurple/protocols/jabber/si.c | 6 | ||||
-rw-r--r-- | libpurple/protocols/msn/switchboard.c | 4 | ||||
-rw-r--r-- | libpurple/protocols/myspace/myspace.c | 21 | ||||
-rw-r--r-- | libpurple/protocols/myspace/user.c | 6 |
5 files changed, 8 insertions, 35 deletions
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c index eb329e5599..ec104eb033 100644 --- a/libpurple/protocols/gg/gg.c +++ b/libpurple/protocols/gg/gg.c @@ -818,7 +818,6 @@ static void ggp_action_change_status_broadcasting(PurplePluginAction *action) 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(PurpleBuddy *buddy, PurpleRequestFields 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,9 +2592,6 @@ static void ggp_keepalive(PurpleConnection *gc) 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); } diff --git a/libpurple/protocols/jabber/si.c b/libpurple/protocols/jabber/si.c index 8140f60c32..ce14df68ed 100644 --- a/libpurple/protocols/jabber/si.c +++ b/libpurple/protocols/jabber/si.c @@ -1691,7 +1691,10 @@ void jabber_si_parse(JabberStream *js, const char *from, JabberIqType type, { 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, const char *from, JabberIqType type, purple_xfer_request(xfer); } #else - thumbnail = NULL; /* Silence warning */ purple_xfer_request(xfer); #endif } diff --git a/libpurple/protocols/msn/switchboard.c b/libpurple/protocols/msn/switchboard.c index 6573b69c3b..7dad84d2c8 100644 --- a/libpurple/protocols/msn/switchboard.c +++ b/libpurple/protocols/msn/switchboard.c @@ -643,10 +643,8 @@ bye_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) 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 @@ static void 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); diff --git a/libpurple/protocols/myspace/myspace.c b/libpurple/protocols/myspace/myspace.c index 7e77ae7958..9cc52f5df4 100644 --- a/libpurple/protocols/myspace/myspace.c +++ b/libpurple/protocols/myspace/myspace.c @@ -377,19 +377,13 @@ msim_list_icon(PurpleAccount *acct, 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) { @@ -859,7 +853,6 @@ static void 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, const MsimMessage *reply, gpointer dat 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_mood(MsimSession *session, MsimMessage *msg) { 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 *session, MsimMessage *msg) 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 @@ static void 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 source, PurpleInputCondition cond) 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 void msim_import_friends(PurplePluginAction *action) * 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 diff --git a/libpurple/protocols/myspace/user.c b/libpurple/protocols/myspace/user.c index 8ef05fb6c8..738045043a 100644 --- a/libpurple/protocols/myspace/user.c +++ b/libpurple/protocols/myspace/user.c @@ -565,7 +565,7 @@ msim_lookup_user(MsimSession *session, const gchar *user, MSIM_USER_LOOKUP_CB cb { 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, const gchar *user, MSIM_USER_LOOKUP_CB cb /* 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, const gchar *user, MSIM_USER_LOOKUP_CB cb 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, |