# HG changeset patch # User Elliott Sales de Andrade # Date 1282540931 0 # Node ID d487a2adc3a662fc9b61b66893834b9a06ae3094 # Parent cc75490da0e3eb4ac1b47dadd8df6128a10360b3# Parent 3e06c30b75bb19e7c0ea8304c39cfe84748a6586 merge of '86d9ff7ca5af691007b1e85ef39959fa13e7d996' and 'd0cbcbb1a25505fd8801dd556c1ec42e98414c9a' diff -r cc75490da0e3 -r d487a2adc3a6 ChangeLog --- a/ChangeLog Mon Aug 23 01:18:12 2010 +0000 +++ b/ChangeLog Mon Aug 23 05:22:11 2010 +0000 @@ -10,6 +10,10 @@ (>500 buddies) list and may improve login speed for those on slow connections. + Pidgin: + * Add support for the Gadu-Gadu protocol in the gevolution plugin to + provide Evolution integration with contacts with GG IDs. (#10709) + version 2.7.3 (08/10/2010): General: * Use silent build rules for automake >1.11. You can enable verbose diff -r cc75490da0e3 -r d487a2adc3a6 finch/gntft.c --- a/finch/gntft.c Mon Aug 23 01:18:12 2010 +0000 +++ b/finch/gntft.c Mon Aug 23 05:22:11 2010 +0000 @@ -383,12 +383,10 @@ return; } - data = FINCHXFER(xfer); - update_title_progress(); if (purple_xfer_is_canceled(xfer)) - status = _("Canceled"); + status = _("Cancelled"); else status = _("Failed"); @@ -402,7 +400,7 @@ char *size_str, *remaining_str; time_t current_time; char prog_str[5]; - double kb_sent, kb_rem; + double kb_sent; double kbps = 0.0; time_t elapsed, now; char *kbsec; @@ -412,7 +410,6 @@ now = time(NULL); kb_sent = purple_xfer_get_bytes_sent(xfer) / 1024.0; - kb_rem = purple_xfer_get_bytes_remaining(xfer) / 1024.0; elapsed = (purple_xfer_get_start_time(xfer) > 0 ? now - purple_xfer_get_start_time(xfer) : 0); kbps = (elapsed > 0 ? (kb_sent / elapsed) : 0); diff -r cc75490da0e3 -r d487a2adc3a6 finch/gntft.h --- a/finch/gntft.h Mon Aug 23 01:18:12 2010 +0000 +++ b/finch/gntft.h Mon Aug 23 05:22:11 2010 +0000 @@ -72,9 +72,9 @@ void finch_xfer_dialog_remove_xfer(PurpleXfer *xfer); /** - * Indicate in a file transfer dialog that a transfer was canceled. + * Indicate in a file transfer dialog that a transfer was cancelled. * - * @param xfer The file transfer that was canceled. + * @param xfer The file transfer that was cancelled. */ void finch_xfer_dialog_cancel_xfer(PurpleXfer *xfer); diff -r cc75490da0e3 -r d487a2adc3a6 finch/libgnt/gntentry.c --- a/finch/libgnt/gntentry.c Mon Aug 23 01:18:12 2010 +0000 +++ b/finch/libgnt/gntentry.c Mon Aug 23 05:22:11 2010 +0000 @@ -481,7 +481,6 @@ GntEntry *entry = GNT_ENTRY(bind); GList *iter; const char *current; - int len; if (entry->history->prev && entry->search->needle) current = entry->search->needle; @@ -491,8 +490,6 @@ if (!entry->histlength || !entry->history->next || !*current) return FALSE; - len = g_utf8_strlen(current, -1); - for (iter = entry->history->next; iter; iter = iter->next) { const char *str = iter->data; /* A more utf8-friendly version of strstr would have been better, but diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/account.c --- a/libpurple/account.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/account.c Mon Aug 23 05:22:11 2010 +0000 @@ -1129,7 +1129,7 @@ static void request_password_cancel_cb(PurpleAccount *account, PurpleRequestFields *fields) { - /* Disable the account as the user has canceled connecting */ + /* Disable the account as the user has cancelled connecting */ purple_account_set_enabled(account, purple_core_get_ui(), FALSE); } diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/conversation.c --- a/libpurple/conversation.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/conversation.c Mon Aug 23 05:22:11 2010 +0000 @@ -1124,7 +1124,6 @@ purple_conv_im_start_typing_timeout(PurpleConvIm *im, int timeout) { PurpleConversation *conv; - const char *name; g_return_if_fail(im != NULL); @@ -1132,7 +1131,6 @@ purple_conv_im_stop_typing_timeout(im); conv = purple_conv_im_get_conversation(im); - name = purple_conversation_get_name(conv); im->typing_timeout = purple_timeout_add_seconds(timeout, reset_typing_cb, conv); } @@ -1520,7 +1518,6 @@ PurpleAccount *account; PurpleConversation *conv; PurpleConnection *gc; - PurplePluginProtocolInfo *prpl_info; g_return_if_fail(chat != NULL); g_return_if_fail(who != NULL); @@ -1529,7 +1526,6 @@ conv = purple_conv_chat_get_conversation(chat); gc = purple_conversation_get_gc(conv); account = purple_connection_get_account(gc); - prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc)); /* Don't display this if the person who wrote it is ignored. */ if (purple_conv_chat_is_user_ignored(chat, who)) diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/desktopitem.c --- a/libpurple/desktopitem.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/desktopitem.c Mon Aug 23 05:22:11 2010 +0000 @@ -330,7 +330,7 @@ if (c == EOF && pos == 0) return NULL; - buf[pos++] = '\0'; + buf[pos] = '\0'; return buf; } diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/ft.c --- a/libpurple/ft.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/ft.c Mon Aug 23 05:22:11 2010 +0000 @@ -752,6 +752,7 @@ return xfer->status; } +/* FIXME: Rename with cancelled for 3.0.0. */ gboolean purple_xfer_is_canceled(const PurpleXfer *xfer) { diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/ft.h --- a/libpurple/ft.h Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/ft.h Mon Aug 23 05:22:11 2010 +0000 @@ -58,8 +58,8 @@ PURPLE_XFER_STATUS_ACCEPTED, /**< Receive accepted, but destination file not selected yet */ PURPLE_XFER_STATUS_STARTED, /**< purple_xfer_start has been called. */ PURPLE_XFER_STATUS_DONE, /**< The xfer completed successfully. */ - PURPLE_XFER_STATUS_CANCEL_LOCAL, /**< The xfer was canceled by us. */ - PURPLE_XFER_STATUS_CANCEL_REMOTE /**< The xfer was canceled by the other end, or we couldn't connect. */ + PURPLE_XFER_STATUS_CANCEL_LOCAL, /**< The xfer was cancelled by us. */ + PURPLE_XFER_STATUS_CANCEL_REMOTE /**< The xfer was cancelled by the other end, or we couldn't connect. */ } PurpleXferStatusType; /** @@ -304,11 +304,12 @@ PurpleXferStatusType purple_xfer_get_status(const PurpleXfer *xfer); /** - * Returns true if the file transfer was canceled. + * Returns true if the file transfer was cancelled. * * @param xfer The file transfer. * - * @return Whether or not the transfer was canceled. + * @return Whether or not the transfer was cancelled. + * FIXME: This should be renamed using cancelled for 3.0.0. */ gboolean purple_xfer_is_canceled(const PurpleXfer *xfer); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/media/backend-fs2.c --- a/libpurple/media/backend-fs2.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/media/backend-fs2.c Mon Aug 23 05:22:11 2010 +0000 @@ -1837,15 +1837,12 @@ purple_media_backend_fs2_get_codecs(PurpleMediaBackend *self, const gchar *sess_id) { - PurpleMediaBackendFs2Private *priv; PurpleMediaBackendFs2Session *session; GList *fscodecs; GList *codecs; g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL); - priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); - session = get_session(PURPLE_MEDIA_BACKEND_FS2(self), sess_id); if (session == NULL) @@ -2014,13 +2011,10 @@ const gchar *sess_id, const gchar *who, double level) { #ifdef USE_VV - PurpleMediaBackendFs2Private *priv; GList *streams; g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self)); - priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self); - purple_prefs_set_int("/purple/media/audio/volume/output", level); streams = get_streams(self, sess_id, who); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/network.h --- a/libpurple/network.h Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/network.h Mon Aug 23 05:22:11 2010 +0000 @@ -239,7 +239,7 @@ * by passing in the return value from either purple_network_listen() * or purple_network_listen_range(). * - * @param listen_data This listener attempt will be canceled and + * @param listen_data This listener attempt will be cancelled and * the struct will be freed. */ void purple_network_listen_cancel(PurpleNetworkListenData *listen_data); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/plugins/idle.c --- a/libpurple/plugins/idle.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/plugins/idle.c Mon Aug 23 05:22:11 2010 +0000 @@ -110,9 +110,6 @@ for(iter = list; iter; iter = iter->next) { acct = (PurpleAccount *)(iter->data); - if(acct) - prpl_id = purple_account_get_protocol_id(acct); - if(acct && idleable_filter(acct)) { purple_debug_misc("idle", "Idling %s.\n", purple_account_get_username(acct)); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/plugins/signals-test.c --- a/libpurple/plugins/signals-test.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/plugins/signals-test.c Mon Aug 23 05:22:11 2010 +0000 @@ -592,12 +592,12 @@ static void ft_recv_cancel_cb(PurpleXfer *xfer, gpointer data) { - purple_debug_misc("signals test", "file receive canceled\n"); + purple_debug_misc("signals test", "file receive cancelled\n"); } static void ft_send_cancel_cb(PurpleXfer *xfer, gpointer data) { - purple_debug_misc("signals test", "file send canceled\n"); + purple_debug_misc("signals test", "file send cancelled\n"); } static void diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/prefs.c --- a/libpurple/prefs.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/prefs.c Mon Aug 23 05:22:11 2010 +0000 @@ -506,7 +506,6 @@ return g_strdup("/"); name = g_string_new(pref->name); - parent = pref->parent; for(parent = pref->parent; parent && parent->name; parent = parent->parent) { name = g_string_prepend_c(name, '/'); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/bonjour/bonjour.c --- a/libpurple/protocols/bonjour/bonjour.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/bonjour/bonjour.c Mon Aug 23 05:22:11 2010 +0000 @@ -206,18 +206,12 @@ { PurpleConnection *gc; BonjourData *bd; - gboolean disconnected; - PurpleStatusType *type; - int primitive; PurplePresence *presence; const char *message, *bonjour_status; gchar *stripped; gc = purple_account_get_connection(account); bd = gc->proto_data; - disconnected = purple_account_is_disconnected(account); - type = purple_status_get_type(status); - primitive = purple_status_type_get_primitive(type); presence = purple_account_get_presence(account); message = purple_status_get_attr_string(status, "message"); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/jabber/auth.c --- a/libpurple/protocols/jabber/auth.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/jabber/auth.c Mon Aug 23 05:22:11 2010 +0000 @@ -123,7 +123,7 @@ if (!PURPLE_CONNECTION_IS_VALID(gc)) return; - /* Disable the account as the user has canceled connecting */ + /* Disable the account as the user has cancelled connecting */ purple_account_set_enabled(purple_connection_get_account(gc), purple_core_get_ui(), FALSE); } #endif diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/jabber/auth_cyrus.c --- a/libpurple/protocols/jabber/auth_cyrus.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/jabber/auth_cyrus.c Mon Aug 23 05:22:11 2010 +0000 @@ -177,7 +177,7 @@ account = purple_connection_get_account(gc); js = purple_connection_get_protocol_data(gc); - /* Disable the account as the user has canceled connecting */ + /* Disable the account as the user has cancelled connecting */ purple_account_set_enabled(account, purple_core_get_ui(), FALSE); } diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/jabber/jingle/transport.c --- a/libpurple/protocols/jabber/jingle/transport.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/jabber/jingle/transport.c Mon Aug 23 05:22:11 2010 +0000 @@ -111,8 +111,6 @@ JingleTransport *transport; g_return_if_fail(JINGLE_IS_TRANSPORT(object)); - transport = JINGLE_TRANSPORT(object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -125,8 +123,6 @@ { JingleTransport *transport; g_return_if_fail(JINGLE_IS_TRANSPORT(object)); - - transport = JINGLE_TRANSPORT(object); switch (prop_id) { default: diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/jabber/oob.c --- a/libpurple/protocols/jabber/oob.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/jabber/oob.c Mon Aug 23 05:22:11 2010 +0000 @@ -185,7 +185,7 @@ jabber_oob_xfer_recv_error(xfer, "406"); } -static void jabber_oob_xfer_recv_canceled(PurpleXfer *xfer) { +static void jabber_oob_xfer_recv_cancelled(PurpleXfer *xfer) { jabber_oob_xfer_recv_error(xfer, "404"); } @@ -233,7 +233,7 @@ purple_xfer_set_init_fnc(xfer, jabber_oob_xfer_init); purple_xfer_set_end_fnc(xfer, jabber_oob_xfer_end); purple_xfer_set_request_denied_fnc(xfer, jabber_oob_xfer_recv_denied); - purple_xfer_set_cancel_recv_fnc(xfer, jabber_oob_xfer_recv_canceled); + purple_xfer_set_cancel_recv_fnc(xfer, jabber_oob_xfer_recv_cancelled); purple_xfer_set_read_fnc(xfer, jabber_oob_xfer_read); purple_xfer_set_start_fnc(xfer, jabber_oob_xfer_start); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/jabber/roster.c --- a/libpurple/protocols/jabber/roster.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/jabber/roster.c Mon Aug 23 05:22:11 2010 +0000 @@ -76,12 +76,9 @@ void jabber_roster_request(JabberStream *js) { - PurpleAccount *account; JabberIq *iq; xmlnode *query; - account = purple_connection_get_account(js->gc); - iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster"); query = xmlnode_get_child(iq->node, "query"); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/jabber/si.c --- a/libpurple/protocols/jabber/si.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/jabber/si.c Mon Aug 23 05:22:11 2010 +0000 @@ -1666,12 +1666,8 @@ void jabber_si_xfer_send(PurpleConnection *gc, const char *who, const char *file) { - JabberStream *js; - PurpleXfer *xfer; - js = gc->proto_data; - xfer = jabber_si_new_xfer(gc, who); if (file) diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/msn/contact.c --- a/libpurple/protocols/msn/contact.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/msn/contact.c Mon Aug 23 05:22:11 2010 +0000 @@ -527,16 +527,20 @@ g_return_if_fail(session != NULL); if (resp != NULL) { +#ifdef MSN_PARTIAL_LISTS const char *abLastChange; const char *dynamicItemLastChange; +#endif purple_debug_misc("msn", "Got the contact list!\n"); msn_parse_contact_list(session, resp->xml); +#ifdef MSN_PARTIAL_LISTS abLastChange = purple_account_get_string(session->account, "ablastChange", NULL); dynamicItemLastChange = purple_account_get_string(session->account, "DynamicItemLastChanged", NULL); +#endif if (state->partner_scenario == MSN_PS_INITIAL) { #ifdef MSN_PARTIAL_LISTS @@ -1565,7 +1569,7 @@ if (list == MSN_LIST_PL) { partner_scenario = MSN_PS_CONTACT_API; - if (user && user->networkid != MSN_NETWORK_PASSPORT) + if (user->networkid != MSN_NETWORK_PASSPORT) member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML, "EmailMember", "Email", user->member_id_on_pending_list); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/msn/httpconn.c --- a/libpurple/protocols/msn/httpconn.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/msn/httpconn.c Mon Aug 23 05:22:11 2010 +0000 @@ -239,6 +239,9 @@ } else { + /* I'll be honest, I don't fully understand all this, but this + * causes crashes, Stu. */ +#if 0 MsnServConn *servconn; /* It's going to die. */ @@ -246,10 +249,9 @@ servconn = httpconn->servconn; - /* I'll be honest, I don't fully understand all this, but this - * causes crashes, Stu. */ - /* if (servconn != NULL) - servconn->wasted = TRUE; */ + if (servconn != NULL) + servconn->wasted = TRUE; +#endif g_free(full_session_id); g_free(session_id); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/msn/msn.c --- a/libpurple/protocols/msn/msn.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/msn/msn.c Mon Aug 23 05:22:11 2010 +0000 @@ -622,7 +622,6 @@ { PurpleBuddy *buddy; PurpleConnection *gc; - MsnSession *session; MsnMobileData *data; PurpleAccount *account; const char *name; @@ -634,8 +633,6 @@ gc = purple_account_get_connection(account); name = purple_buddy_get_name(buddy); - session = gc->proto_data; - data = g_new0(MsnMobileData, 1); data->gc = gc; data->passport = name; @@ -2084,11 +2081,9 @@ msn_remove_group(PurpleConnection *gc, PurpleGroup *group) { MsnSession *session; - MsnCmdProc *cmdproc; const char *gname; session = gc->proto_data; - cmdproc = session->notification->cmdproc; gname = purple_group_get_name(group); purple_debug_info("msn", "Remove group %s\n", gname); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/msn/msnutils.c --- a/libpurple/protocols/msn/msnutils.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/msn/msnutils.c Mon Aug 23 05:22:11 2010 +0000 @@ -541,7 +541,7 @@ chlStringParts = (unsigned int *)buf; /* this is magic */ - for (i = 0; i < (strlen(buf) / 4); i += 2) { + for (i = 0; i < (len / 4); i += 2) { long long temp; chlStringParts[i] = GUINT_TO_LE(chlStringParts[i]); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/msn/notification.c --- a/libpurple/protocols/msn/notification.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/msn/notification.c Mon Aug 23 05:22:11 2010 +0000 @@ -92,7 +92,6 @@ { MsnCmdProc *cmdproc; MsnSession *session; - PurpleAccount *account; GString *vers; const char *ver_str; int i; @@ -101,7 +100,6 @@ cmdproc = servconn->cmdproc; session = servconn->session; - account = session->account; vers = g_string_new(""); @@ -178,10 +176,8 @@ usr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) { MsnSession *session; - PurpleAccount *account; session = cmdproc->session; - account = session->account; if (!g_ascii_strcasecmp(cmd->params[1], "OK")) { @@ -1000,7 +996,6 @@ { MsnSession *session; PurpleAccount *account; - PurpleConnection *gc; MsnUser *user; MsnObject *msnobj = NULL; unsigned long clientid; @@ -1010,7 +1005,6 @@ session = cmdproc->session; account = session->account; - gc = purple_account_get_connection(account); state = cmd->params[1]; passport = cmd->params[2]; @@ -1203,7 +1197,6 @@ { MsnSession *session; PurpleAccount *account; - PurpleConnection *gc; MsnUser *user; MsnObject *msnobj; unsigned long clientid; @@ -1212,7 +1205,6 @@ session = cmdproc->session; account = session->account; - gc = purple_account_get_connection(account); state = cmd->params[0]; passport = cmd->params[1]; @@ -1387,11 +1379,13 @@ MsnSession *session; MsnSwitchBoard *swboard; const char *session_id; + const char *auth_key; char *host; int port; session = cmdproc->session; session_id = cmd->params[0]; + auth_key = cmd->params[3]; msn_parse_socket(cmd->params[1], &host, &port); @@ -1401,8 +1395,8 @@ swboard = msn_switchboard_new(session); msn_switchboard_set_invited(swboard, TRUE); - msn_switchboard_set_session_id(swboard, cmd->params[0]); - msn_switchboard_set_auth_key(swboard, cmd->params[3]); + msn_switchboard_set_session_id(swboard, session_id); + msn_switchboard_set_auth_key(swboard, auth_key); swboard->im_user = g_strdup(cmd->params[4]); /* msn_switchboard_add_user(swboard, cmd->params[4]); */ @@ -1571,13 +1565,11 @@ size_t len) { MsnSession *session; - PurpleAccount *account; MsnUser *user; const char *passport; char *str; session = cmdproc->session; - account = session->account; passport = cmd->params[0]; user = msn_userlist_find_user(session->userlist, passport); @@ -1649,7 +1641,9 @@ { MsnSession *session; const char *value; +#ifdef MSN_PARTIAL_LISTS const char *clLastChange; +#endif session = cmdproc->session; @@ -1692,9 +1686,9 @@ if ((value = msn_message_get_attr(msg, "EmailEnabled")) != NULL) session->passport_info.email_enabled = (gboolean)atol(value); +#ifdef MSN_PARTIAL_LISTS /*starting retrieve the contact list*/ clLastChange = purple_account_get_string(session->account, "CLLastChange", NULL); -#ifdef MSN_PARTIAL_LISTS /* msn_userlist_load defeats all attempts at trying to detect blist sync issues */ msn_userlist_load(session); msn_get_contact_list(session, MSN_PS_INITIAL, clLastChange); @@ -1898,7 +1892,7 @@ if ((type_s = g_hash_table_lookup(table, "Type")) != NULL) { int type = atoi(type_s); - char buf[MSN_BUF_LEN]; + char buf[MSN_BUF_LEN] = ""; int minutes; switch (type) diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/msn/slp.c --- a/libpurple/protocols/msn/slp.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/msn/slp.c Mon Aug 23 05:22:11 2010 +0000 @@ -1263,8 +1263,6 @@ if (userlist->buddy_icon_window > 0) { GQueue *queue; - PurpleAccount *account; - const char *username; queue = userlist->buddy_icon_requests; @@ -1273,9 +1271,6 @@ user = g_queue_pop_head(queue); - account = userlist->session->account; - username = user->passport; - userlist->buddy_icon_window--; request_user_display(user); @@ -1347,31 +1342,21 @@ got_user_display(MsnSlpCall *slpcall, const guchar *data, gsize size) { - MsnUserList *userlist; + MsnSlpLink *slplink; const char *info; PurpleAccount *account; g_return_if_fail(slpcall != NULL); + slplink = slpcall->slplink; info = slpcall->data_info; if (purple_debug_is_verbose()) - purple_debug_info("msn", "Got User Display: %s\n", slpcall->slplink->remote_user); - - userlist = slpcall->slplink->session->userlist; - account = slpcall->slplink->session->account; - - purple_buddy_icons_set_for_user(account, slpcall->slplink->remote_user, - g_memdup(data, size), size, info); + purple_debug_info("msn", "Got User Display: %s\n", slplink->remote_user); -#if 0 - /* Free one window slot */ - userlist->buddy_icon_window++; + account = slplink->session->account; - purple_debug_info("msn", "got_user_display(): buddy_icon_window++ yields =%d\n", - userlist->buddy_icon_window); - - msn_release_buddy_icon_request(userlist); -#endif + purple_buddy_icons_set_for_user(account, slplink->remote_user, + g_memdup(data, size), size, info); } static void diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/msn/slplink.c --- a/libpurple/protocols/msn/slplink.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/msn/slplink.c Mon Aug 23 05:22:11 2010 +0000 @@ -632,7 +632,7 @@ slpmsg = msn_slplink_message_find(slplink, header->session_id, header->id); if (slpmsg == NULL) { - /* Probably the transfer was canceled */ + /* Probably the transfer was cancelled */ purple_debug_error("msn", "Couldn't find slpmsg\n"); return; } diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/msn/switchboard.c --- a/libpurple/protocols/msn/switchboard.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/msn/switchboard.c Mon Aug 23 05:22:11 2010 +0000 @@ -761,12 +761,8 @@ static void iro_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) { - PurpleAccount *account; - PurpleConnection *gc; MsnSwitchBoard *swboard; - account = cmdproc->session->account; - gc = account->gc; swboard = cmdproc->data; swboard->total_users = atoi(cmd->params[2]); @@ -778,16 +774,12 @@ joi_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) { MsnSession *session; - PurpleAccount *account; - PurpleConnection *gc; MsnSwitchBoard *swboard; const char *passport; passport = cmd->params[0]; session = cmdproc->session; - account = session->account; - gc = account->gc; swboard = cmdproc->data; msn_switchboard_add_user(swboard, passport); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/oscar/family_icbm.c --- a/libpurple/protocols/oscar/family_icbm.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/oscar/family_icbm.c Mon Aug 23 05:22:11 2010 +0000 @@ -1320,7 +1320,7 @@ /* * Terminate connection/error code. 0x0001 means the other user - * canceled the connection. + * cancelled the connection. */ if (aim_tlv_gettlv(list2, 0x000b, 1)) args.errorcode = aim_tlv_get16(list2, 0x000b, 1); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/oscar/oft.c --- a/libpurple/protocols/oscar/oft.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/oscar/oft.c Mon Aug 23 05:22:11 2010 +0000 @@ -240,7 +240,7 @@ peer_oft_close(PeerConnection *conn) { /* - * If canceled by local user, and we're receiving a file, and + * If cancelled by local user, and we're receiving a file, and * we're not connected/ready then send an ICBM cancel message. */ if ((purple_xfer_get_status(conn->xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL) && diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.c Mon Aug 23 05:22:11 2010 +0000 @@ -1699,7 +1699,7 @@ } else if (args->status == AIM_RENDEZVOUS_CANCEL) { - /* The other user canceled a peer request */ + /* The other user cancelled a peer request */ PeerConnection *conn; conn = peer_connection_find_by_cookie(od, userinfo->bn, args->cookie); @@ -4953,7 +4953,7 @@ peer_connection_destroy(conn, OSCAR_DISCONNECT_LOCAL_CLOSED, NULL); /* OSCAR_DISCONNECT_LOCAL_CLOSED doesn't write anything to the convo - * window. Let the user know that we canceled the Direct IM. */ + * window. Let the user know that we cancelled the Direct IM. */ conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name); purple_conversation_write(conv, NULL, _("You closed the connection."), PURPLE_MESSAGE_SYSTEM, time(NULL)); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/ChangeLog --- a/libpurple/protocols/qq/ChangeLog Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/ChangeLog Mon Aug 23 05:22:11 2010 +0000 @@ -233,7 +233,7 @@ 2008.08.06 - ccpaging * Rename names of variables, Group, to Room * Functions of group_network merged into qq_network and qq_process - * Canceled managing glist of group packet, add sub_cmdd and room_id to transaction + * Cancelled managing glist of group packet, add sub_cmdd and room_id to transaction * Fixed error of demo group: If 'room list' and 'room infor' are not setup, response received from server will emits 'room_id = 0' packet. diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/buddy_info.c --- a/libpurple/protocols/qq/buddy_info.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/buddy_info.c Mon Aug 23 05:22:11 2010 +0000 @@ -224,12 +224,10 @@ void qq_request_buddy_info(PurpleConnection *gc, guint32 uid, guint32 update_class, int action) { - qq_data *qd; gchar raw_data[16] = {0}; g_return_if_fail(uid != 0); - qd = (qq_data *) gc->proto_data; g_snprintf(raw_data, sizeof(raw_data), "%u", uid); qq_send_cmd_mess(gc, QQ_CMD_GET_BUDDY_INFO, (guint8 *) raw_data, strlen(raw_data), update_class, action); @@ -271,7 +269,6 @@ static void info_modify_ok_cb(modify_info_request *info_request, PurpleRequestFields *fields) { PurpleConnection *gc; - qq_data *qd; gchar **segments; int index; const char *utf8_str; @@ -279,8 +276,7 @@ int choice_num; gc = info_request->gc; - g_return_if_fail(gc != NULL && info_request->gc); - qd = (qq_data *) gc->proto_data; + g_return_if_fail(gc != NULL); segments = info_request->segments; g_return_if_fail(segments != NULL); @@ -390,14 +386,12 @@ static void info_modify_dialogue(PurpleConnection *gc, gchar **segments, int iclass) { - qq_data *qd; PurpleRequestFieldGroup *group; PurpleRequestFields *fields; modify_info_request *info_request; gchar *utf8_title, *utf8_prim; int index; - qd = (qq_data *) gc->proto_data; /* Keep one dialog once a time */ purple_request_close_with_handle(gc); @@ -416,9 +410,11 @@ case QQ_FIELD_CONTACT: utf8_title = g_strdup(_("Modify Contact")); utf8_prim = g_strdup_printf("%s for %s", _("Modify Contact"), segments[0]); + break; case QQ_FIELD_ADDR: utf8_title = g_strdup(_("Modify Address")); utf8_prim = g_strdup_printf("%s for %s", _("Modify Address"), segments[0]); + break; case QQ_FIELD_EXT: utf8_title = g_strdup(_("Modify Extended Information")); utf8_prim = g_strdup_printf("%s for %s", _("Modify Extended Information"), segments[0]); @@ -427,6 +423,7 @@ default: utf8_title = g_strdup(_("Modify Information")); utf8_prim = g_strdup_printf("%s for %s", _("Modify Information"), segments[0]); + break; } info_request = g_new0(modify_info_request, 1); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/buddy_list.c --- a/libpurple/protocols/qq/buddy_list.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/buddy_list.c Mon Aug 23 05:22:11 2010 +0000 @@ -55,11 +55,9 @@ /* get a list of online_buddies */ void qq_request_get_buddies_online(PurpleConnection *gc, guint8 position, guint32 update_class) { - qq_data *qd; guint8 *raw_data; gint bytes = 0; - qd = (qq_data *) gc->proto_data; raw_data = g_newa(guint8, 5); /* 000-000 get online friends cmd @@ -360,7 +358,6 @@ guint32 qq_process_get_buddies_and_rooms(guint8 *data, gint data_len, PurpleConnection *gc) { - qq_data *qd; gint i, j; gint bytes; guint8 sub_cmd, reply_code; @@ -371,8 +368,6 @@ g_return_val_if_fail(data != NULL && data_len != 0, -1); - qd = (qq_data *) gc->proto_data; - bytes = 0; bytes += qq_get8(&sub_cmd, data + bytes); g_return_val_if_fail(sub_cmd == 0x01, -1); @@ -468,11 +463,6 @@ guint8 away_cmd; guint32 misc_status; gboolean fake_video; - PurpleAccount *account; - PurplePresence *presence; - - account = purple_connection_get_account(gc); - presence = purple_account_get_presence(account); qd = (qq_data *) gc->proto_data; if (!qd->is_login) @@ -596,14 +586,13 @@ void qq_update_buddy_status(PurpleConnection *gc, guint32 uid, guint8 status, guint8 flag) { gchar *who; - gchar *status_id; + const gchar *status_id; g_return_if_fail(uid != 0); /* purple supports signon and idle time * but it is not much use for QQ, I do not use them */ /* serv_got_update(gc, name, online, 0, q_bud->signon, q_bud->idle, bud->uc); */ - status_id = "available"; switch(status) { case QQ_BUDDY_OFFLINE: status_id = "offline"; @@ -677,13 +666,10 @@ void qq_buddy_data_free_all(PurpleConnection *gc) { - qq_data *qd; PurpleBuddy *buddy; GSList *buddies, *it; gint count = 0; - qd = (qq_data *)purple_connection_get_protocol_data(gc); - buddies = purple_find_buddies(purple_connection_get_account(gc), NULL); for (it = buddies; it; it = it->next) { qq_buddy_data *qbd = NULL; diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/buddy_opt.c --- a/libpurple/protocols/qq/buddy_opt.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/buddy_opt.c Mon Aug 23 05:22:11 2010 +0000 @@ -262,7 +262,6 @@ void qq_process_auth_code(PurpleConnection *gc, guint8 *data, gint data_len, guint32 uid) { - qq_data *qd; gint bytes; guint8 cmd, reply; guint16 sub_cmd; @@ -272,8 +271,6 @@ g_return_if_fail(data != NULL && data_len != 0); g_return_if_fail(uid != 0); - qd = (qq_data *) gc->proto_data; - qq_show_packet("qq_process_auth_code", data, data_len); bytes = 0; bytes += qq_get8(&cmd, data + bytes); @@ -324,7 +321,7 @@ add_req->auth_len = 0; who = uid_to_purple_name(uid); - msg = g_strdup_printf(_("%u requires verification"), uid); + msg = g_strdup_printf(_("%u requires verification: %s"), uid, question); purple_request_input(gc, _("Add buddy question"), msg, _("Enter answer here"), NULL, @@ -400,7 +397,6 @@ void qq_process_question(PurpleConnection *gc, guint8 *data, gint data_len, guint32 uid) { - qq_data *qd; gint bytes; guint8 cmd, reply; gchar *question, *answer; @@ -409,8 +405,6 @@ g_return_if_fail(data != NULL && data_len != 0); - qd = (qq_data *) gc->proto_data; - qq_show_packet("qq_process_question", data, data_len); bytes = 0; bytes += qq_get8(&cmd, data + bytes); @@ -720,13 +714,10 @@ /* process reply to add_buddy_auth request */ void qq_process_add_buddy_auth(guint8 *data, gint data_len, PurpleConnection *gc) { - qq_data *qd; gchar **segments, *msg_utf8; g_return_if_fail(data != NULL && data_len != 0); - qd = (qq_data *) gc->proto_data; - if (data[0] == '0') { purple_debug_info("QQ", "Reply OK for sending authorize\n"); return; @@ -767,11 +758,9 @@ /* process the server reply for my request to remove myself from a buddy */ void qq_process_buddy_remove_me(PurpleConnection *gc, guint8 *data, gint data_len, guint32 uid) { - qq_data *qd; gchar *msg; g_return_if_fail(data != NULL && data_len != 0); - qd = (qq_data *) gc->proto_data; if (data[0] == 0) { purple_debug_info("QQ", "Reply OK for removing me from %u's buddy list\n", uid); @@ -1004,7 +993,6 @@ void qq_process_buddy_check_code(PurpleConnection *gc, guint8 *data, gint data_len) { - qq_data *qd; gint bytes; guint8 cmd; guint8 reply; @@ -1013,8 +1001,6 @@ g_return_if_fail(data != NULL && data_len >= 5); - qd = (qq_data *) gc->proto_data; - qq_show_packet("buddy_check_code", data, data_len); bytes = 0; diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/file_trans.c --- a/libpurple/protocols/qq/file_trans.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/file_trans.c Mon Aug 23 05:22:11 2010 +0000 @@ -238,12 +238,9 @@ gint bytes = 0; guint32 file_key; qq_data *qd; - ft_info *info; qd = (qq_data *) gc->proto_data; - info = (ft_info *) qd->xfer->data; - raw_data = g_newa(guint8, MAX_PACKET_SIZE); file_key = _gen_file_key(); @@ -805,9 +802,6 @@ { gint bytes; guint8 tag; - qq_data *qd; - - qd = (qq_data *) gc->proto_data; bytes = 0; bytes += qq_get8(&tag, data + bytes); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/group.c --- a/libpurple/protocols/qq/group.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/group.c Mon Aug 23 05:22:11 2010 +0000 @@ -119,13 +119,11 @@ /* free roomlist space, I have no idea when this one is called... */ void qq_roomlist_cancel(PurpleRoomlist *list) { - qq_data *qd; PurpleConnection *gc; g_return_if_fail(list != NULL); gc = purple_account_get_connection(list->account); - qd = (qq_data *) gc->proto_data; purple_roomlist_set_in_progress(list, FALSE); purple_roomlist_unref(list); } diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/group_im.c --- a/libpurple/protocols/qq/group_im.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/group_im.c Mon Aug 23 05:22:11 2010 +0000 @@ -48,12 +48,10 @@ PurpleConversation *qq_room_conv_open(PurpleConnection *gc, qq_room_data *rmd) { PurpleConversation *conv; - qq_data *qd; gchar *topic_utf8; g_return_val_if_fail(rmd != NULL, NULL); g_return_val_if_fail(rmd->title_utf8, NULL); - qd = (qq_data *) gc->proto_data; conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, rmd->title_utf8, purple_connection_get_account(gc)); @@ -207,7 +205,6 @@ /* recv an IM from a group chat */ void qq_process_room_im(guint8 *data, gint data_len, guint32 id, PurpleConnection *gc, guint16 msg_type) { - qq_data *qd; gchar *msg_smiley, *msg_fmt, *msg_utf8; gint bytes, tail_len; struct { @@ -229,7 +226,6 @@ /* at least include im_text.msg_len */ g_return_if_fail(data != NULL && data_len > 23); - qd = (qq_data *) gc->proto_data; /* qq_show_packet("ROOM_IM", data, data_len); */ memset(&im_text, 0, sizeof(im_text)); @@ -376,7 +372,6 @@ gint msg_len; const gchar *start_invalid; gboolean is_smiley_none; - guint8 frag_count, frag_index; g_return_val_if_fail(NULL != gc && NULL != gc->proto_data, -1); g_return_val_if_fail(id != 0 && what != NULL, -1); @@ -386,9 +381,6 @@ /* qq_show_packet("chat IM UTF8", (guint8 *)what, strlen(what)); */ - fmt = qq_im_fmt_new_by_purple(what); - is_smiley_none = qq_im_smiley_none(what); - msg_stripped = purple_markup_strip_html(what); g_return_val_if_fail(msg_stripped != NULL, -1); /* qq_show_packet("IM Stripped", (guint8 *)what, strlen(what)); */ @@ -417,26 +409,10 @@ qd->send_im_id++; fmt = qq_im_fmt_new_by_purple(what); - frag_count = g_slist_length(segments); - frag_index = 0; -/* - if (frag_count <= 1) { -*/ - for (it = segments; it; it = it->next) { - request_room_send_im(gc, id, fmt, (gchar *)it->data); - g_free(it->data); - } -/* - } else { - for (it = segments; it; it = it->next) { - request_room_send_im_ex(gc, id, fmt, (gchar *)it->data, - qd->send_im_id, frag_count, frag_index); - g_free(it->data); - frag_index++; - } + for (it = segments; it; it = g_slist_delete_link(it, it)) { + request_room_send_im(gc, id, fmt, (gchar *)it->data); + g_free(it->data); } -*/ qq_im_fmt_free(fmt); - g_slist_free(segments); return 1; } diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/group_join.c --- a/libpurple/protocols/qq/group_join.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/group_join.c Mon Aug 23 05:22:11 2010 +0000 @@ -178,12 +178,10 @@ /* If comes here, cmd is OK already */ void qq_process_group_cmd_exit_group(guint8 *data, gint len, PurpleConnection *gc) { - qq_data *qd; gint bytes; guint32 id; g_return_if_fail(data != NULL && len > 0); - qd = (qq_data *) gc->proto_data; if (len < 4) { purple_debug_error("QQ", "Invalid exit group reply, expect %d bytes, read %d bytes\n", 4, len); @@ -201,12 +199,10 @@ { gint bytes; guint32 id; - qq_data *qd; qq_room_data *rmd; gchar *msg; g_return_if_fail(data != NULL && len > 0); - qd = (qq_data *) gc->proto_data; if (len < 4) { purple_debug_error("QQ", @@ -283,7 +279,6 @@ /* Attempt to join a group without auth */ void qq_group_join(PurpleConnection *gc, GHashTable *data) { - qq_data *qd; gchar *ext_id_str; gchar *id_str; guint32 ext_id; @@ -291,7 +286,6 @@ qq_room_data *rmd; g_return_if_fail(data != NULL); - qd = (qq_data *) gc->proto_data; ext_id_str = g_hash_table_lookup(data, QQ_ROOM_KEY_EXTERNAL_ID); id_str = g_hash_table_lookup(data, QQ_ROOM_KEY_INTERNAL_ID); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/group_opt.c --- a/libpurple/protocols/qq/group_opt.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/group_opt.c Mon Aug 23 05:22:11 2010 +0000 @@ -134,12 +134,10 @@ { guint32 *old_members, *del_members, *add_members; qq_buddy_data *bd; - qq_data *qd; gint i = 0, old = 0, new = 0, del = 0, add = 0; GList *list; g_return_if_fail(rmd != NULL); - qd = (qq_data *) gc->proto_data; if (new_members[0] == 0xffffffff) return; diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/im.c --- a/libpurple/protocols/qq/im.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/im.c Mon Aug 23 05:22:11 2010 +0000 @@ -725,7 +725,6 @@ /* process received normal text IM */ static void process_im_text(PurpleConnection *gc, guint8 *data, gint len, qq_im_header *im_header) { - qq_data *qd; guint16 purple_msg_type; gchar *who; gchar *msg_smiley, *msg_fmt, *msg_utf8; @@ -749,10 +748,9 @@ gchar *msg; /* no fixed length, ends with 0x00 */ } im_text; - g_return_if_fail (data != NULL && len > 0); + g_return_if_fail(data != NULL && len > 0); g_return_if_fail(im_header != NULL); - qd = (qq_data *) gc->proto_data; memset(&im_text, 0, sizeof(im_text)); /* qq_show_packet("IM text", data, len); */ @@ -823,7 +821,6 @@ /* process received extended (2007) text IM */ static void process_extend_im_text(PurpleConnection *gc, guint8 *data, gint len, qq_im_header *im_header) { - qq_data *qd; guint16 purple_msg_type; gchar *who; gchar *msg_smiley, *msg_fmt, *msg_utf8; @@ -848,10 +845,9 @@ guint8 fromMobileQQ; } im_text; - g_return_if_fail (data != NULL && len > 0); + g_return_if_fail(data != NULL && len > 0); g_return_if_fail(im_header != NULL); - qd = (qq_data *) gc->proto_data; memset(&im_text, 0, sizeof(im_text)); /* qq_show_packet("Extend IM text", data, len); */ @@ -1043,12 +1039,10 @@ { qq_data *qd; guint8 raw_data[MAX_PACKET_SIZE - 16]; - guint16 im_type; gint bytes; time_t now; qd = (qq_data *) gc->proto_data; - im_type = QQ_NORMAL_IM_TEXT; /* purple_debug_info("QQ", "Send IM %d-%d\n", frag_count, frag_index); */ bytes = 0; @@ -1118,13 +1112,12 @@ GString *new_string; GString *append_utf8; gchar *start, *p; - gint count, len; + gint len; qq_emoticon *emoticon; g_return_val_if_fail(msg_stripped != NULL, NULL); start = msg_stripped; - count = 0; new_string = g_string_new(""); append_utf8 = g_string_new(""); while (*start) { diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/qq.c --- a/libpurple/protocols/qq/qq.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/qq.c Mon Aug 23 05:22:11 2010 +0000 @@ -89,15 +89,12 @@ { PurpleConnection *gc; qq_data *qd; - PurpleProxyInfo *gpi; const gchar *custom_server; gc = purple_account_get_connection(account); g_return_if_fail(gc != NULL && gc->proto_data != NULL); qd = gc->proto_data; - gpi = purple_proxy_get_setup(account); - qd->use_tcp = purple_account_get_bool(account, "use_tcp", TRUE); custom_server = purple_account_get_string(account, "server", NULL); @@ -381,11 +378,10 @@ static const char *qq_list_emblem(PurpleBuddy *b) { PurpleAccount *account; - PurpleConnection *gc; qq_buddy_data *buddy; if (!b || !(account = purple_buddy_get_account(b)) || - !(gc = purple_account_get_connection(account))) + !purple_account_get_connection(account)) return NULL; buddy = purple_buddy_get_protocol_data(b); @@ -618,12 +614,10 @@ static void action_about_openq(PurplePluginAction *action) { PurpleConnection *gc = (PurpleConnection *) action->context; - qq_data *qd; GString *info; gchar *title; - g_return_if_fail(NULL != gc && NULL != gc->proto_data); - qd = (qq_data *) gc->proto_data; + g_return_if_fail(NULL != gc); info = g_string_new(""); g_string_append(info, _("

Original Author:
\n")); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/qq_base.c --- a/libpurple/protocols/qq/qq_base.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/qq_base.c Mon Aug 23 05:22:11 2010 +0000 @@ -386,7 +386,6 @@ /* process the login reply packet */ guint8 qq_process_login( PurpleConnection *gc, guint8 *data, gint data_len) { - qq_data *qd; guint8 ret = data[0]; gchar *msg, *msg_utf8; gchar *error; @@ -394,8 +393,6 @@ g_return_val_if_fail(data != NULL && data_len != 0, QQ_LOGIN_REPLY_ERR); - qd = (qq_data *) gc->proto_data; - switch (ret) { case QQ_LOGIN_REPLY_OK: purple_debug_info("QQ", "Login OK\n"); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/qq_network.c --- a/libpurple/protocols/qq/qq_network.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/qq_network.c Mon Aug 23 05:22:11 2010 +0000 @@ -482,13 +482,11 @@ static void udp_pending(gpointer data, gint source, PurpleInputCondition cond) { PurpleConnection *gc = NULL; - qq_data *qd; guint8 *buf; gint buf_len; gc = (PurpleConnection *) data; - g_return_if_fail(gc != NULL && gc->proto_data != NULL); - qd = (qq_data *) gc->proto_data; + g_return_if_fail(gc != NULL); if(cond != PURPLE_INPUT_READ) { purple_connection_error_reason(gc, @@ -748,14 +746,12 @@ { PurpleConnection *gc; qq_data *qd; - PurpleAccount *account ; qq_connection *conn; gc = (PurpleConnection *) data; g_return_if_fail(gc != NULL && gc->proto_data != NULL); qd = (qq_data *) gc->proto_data; - account = purple_connection_get_account(gc); /* conn_data will be destoryed */ qd->conn_data = NULL; diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/qq_process.c --- a/libpurple/protocols/qq/qq_process.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/qq_process.c Mon Aug 23 05:22:11 2010 +0000 @@ -58,15 +58,12 @@ /* default process, decrypt and dump */ static void process_unknow_cmd(PurpleConnection *gc,const gchar *title, guint8 *data, gint data_len, guint16 cmd, guint16 seq) { - qq_data *qd; gchar *msg; g_return_if_fail(data != NULL && data_len != 0); qq_show_packet(title, data, data_len); - qd = (qq_data *) gc->proto_data; - qq_hex_dump(PURPLE_DEBUG_WARNING, "QQ", data, data_len, ">>> [%d] %s -> [default] decrypt and dump", @@ -80,12 +77,8 @@ /* parse the reply to send_im */ static void do_im_ack(guint8 *data, gint data_len, PurpleConnection *gc) { - qq_data *qd; - g_return_if_fail(data != NULL && data_len != 0); - qd = gc->proto_data; - if (data[0] != 0) { purple_debug_warning("QQ", "Failed sent IM\n"); purple_notify_error(gc, _("Error"), _("Unable to send message."), NULL); @@ -380,14 +373,11 @@ /* Send ACK if the sys message needs an ACK */ static void request_server_ack(PurpleConnection *gc, gchar *funct_str, gchar *from, guint16 seq) { - qq_data *qd; guint8 *raw_data; gint bytes; guint8 bar; g_return_if_fail(funct_str != NULL && from != NULL); - qd = (qq_data *) gc->proto_data; - bar = 0x1e; raw_data = g_newa(guint8, strlen(funct_str) + strlen(from) + 16); @@ -568,11 +558,9 @@ void qq_update_room(PurpleConnection *gc, guint8 room_cmd, guint32 room_id) { - qq_data *qd; gint ret; - g_return_if_fail (gc != NULL && gc->proto_data != NULL); - qd = (qq_data *) gc->proto_data; + g_return_if_fail (gc != NULL); switch (room_cmd) { case 0: @@ -599,12 +587,10 @@ void qq_update_all_rooms(PurpleConnection *gc, guint8 room_cmd, guint32 room_id) { - qq_data *qd; gboolean is_new_turn = FALSE; guint32 next_id; - g_return_if_fail (gc != NULL && gc->proto_data != NULL); - qd = (qq_data *) gc->proto_data; + g_return_if_fail(gc != NULL); next_id = qq_room_get_next(gc, room_id); purple_debug_info("QQ", "Update rooms, next id %u, prev id %u\n", next_id, room_id); @@ -689,11 +675,9 @@ static void update_all_rooms_online(PurpleConnection *gc, guint8 room_cmd, guint32 room_id) { - qq_data *qd; guint32 next_id; - g_return_if_fail (gc != NULL && gc->proto_data != NULL); - qd = (qq_data *) gc->proto_data; + g_return_if_fail (gc != NULL); next_id = qq_room_get_next_conv(gc, room_id); if (next_id <= 0 && room_id <= 0) { diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/qq_trans.c --- a/libpurple/protocols/qq/qq_trans.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/qq_trans.c Mon Aug 23 05:22:11 2010 +0000 @@ -109,11 +109,9 @@ static qq_transaction *trans_create(PurpleConnection *gc, gint fd, guint16 cmd, guint16 seq, guint8 *data, gint data_len, guint32 update_class, guint32 ship32) { - qq_data *qd; qq_transaction *trans; - g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, NULL); - qd = (qq_data *) gc->proto_data; + g_return_val_if_fail(gc != NULL, NULL); trans = g_new0(qq_transaction, 1); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/qq/send_file.c --- a/libpurple/protocols/qq/send_file.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/qq/send_file.c Mon Aug 23 05:22:11 2010 +0000 @@ -637,10 +637,8 @@ { PurpleConnection *gc; PurpleAccount *account; - guint16 *seq; g_return_if_fail (xfer != NULL); - seq = (guint16 *) xfer->data; account = purple_xfer_get_account(xfer); gc = purple_account_get_connection(account); @@ -670,10 +668,8 @@ { PurpleConnection *gc; PurpleAccount *account; - ft_info *info; - g_return_if_fail (xfer != NULL && xfer->data != NULL); - info = (ft_info *) xfer->data; + g_return_if_fail(xfer != NULL); account = purple_xfer_get_account(xfer); gc = purple_account_get_connection(account); @@ -752,7 +748,7 @@ g_return_if_fail (data != NULL && data_len != 0); qd = (qq_data *) gc->proto_data; xfer = qd->xfer; - info = (ft_info *) qd->xfer->data; + info = (ft_info *) xfer->data; if (data_len <= 30 + QQ_CONN_INFO_LEN) { purple_debug_warning("QQ", "Received file reject message is empty\n"); @@ -761,7 +757,7 @@ bytes = 18 + 12; /* skip 30 bytes */ qq_get_conn_info(info, data + bytes); - _qq_xfer_init_socket(qd->xfer); + _qq_xfer_init_socket(xfer); _qq_xfer_init_udp_channel(info); _qq_send_packet_file_notifyip(gc, sender_uid); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/sametime/sametime.c --- a/libpurple/protocols/sametime/sametime.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/sametime/sametime.c Mon Aug 23 05:22:11 2010 +0000 @@ -2133,7 +2133,7 @@ static void ft_incoming_cancel(PurpleXfer *xfer) { - /* incoming transfer rejected or canceled in-progress */ + /* incoming transfer rejected or cancelled in-progress */ struct mwFileTransfer *ft = xfer->data; if(ft) mwFileTransfer_reject(ft); } diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/silc/chat.c --- a/libpurple/protocols/silc/chat.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/silc/chat.c Mon Aug 23 05:22:11 2010 +0000 @@ -1395,7 +1395,7 @@ if (sg->roomlist) purple_roomlist_unref(sg->roomlist); - sg->roomlist_canceled = FALSE; + sg->roomlist_cancelled = FALSE; sg->roomlist = purple_roomlist_new(purple_connection_get_account(gc)); f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", "channel", TRUE); @@ -1429,6 +1429,6 @@ if (sg->roomlist == list) { purple_roomlist_unref(sg->roomlist); sg->roomlist = NULL; - sg->roomlist_canceled = TRUE; + sg->roomlist_cancelled = TRUE; } } diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/silc/ops.c --- a/libpurple/protocols/silc/ops.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/silc/ops.c Mon Aug 23 05:22:11 2010 +0000 @@ -1455,7 +1455,7 @@ int usercount; PurpleRoomlistRoom *room; - if (sg->roomlist_canceled) + if (sg->roomlist_cancelled) break; if (error != SILC_STATUS_OK) { diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/silc/silcpurple.h --- a/libpurple/protocols/silc/silcpurple.h Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/silc/silcpurple.h Mon Aug 23 05:22:11 2010 +0000 @@ -85,7 +85,7 @@ SilcMimeAssembler mimeass; unsigned int detaching : 1; unsigned int resuming : 1; - unsigned int roomlist_canceled : 1; + unsigned int roomlist_cancelled : 1; unsigned int chpk : 1; } *SilcPurple; diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/silc10/chat.c --- a/libpurple/protocols/silc10/chat.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/silc10/chat.c Mon Aug 23 05:22:11 2010 +0000 @@ -1417,7 +1417,7 @@ if (sg->roomlist) purple_roomlist_unref(sg->roomlist); - sg->roomlist_canceled = FALSE; + sg->roomlist_cancelled = FALSE; sg->roomlist = purple_roomlist_new(purple_connection_get_account(gc)); f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", "channel", TRUE); @@ -1451,6 +1451,6 @@ if (sg->roomlist == list) { purple_roomlist_unref(sg->roomlist); sg->roomlist = NULL; - sg->roomlist_canceled = TRUE; + sg->roomlist_cancelled = TRUE; } } diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/silc10/ops.c --- a/libpurple/protocols/silc10/ops.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/silc10/ops.c Mon Aug 23 05:22:11 2010 +0000 @@ -1444,7 +1444,7 @@ int usercount; PurpleRoomlistRoom *room; - if (sg->roomlist_canceled) + if (sg->roomlist_cancelled) break; if (!success) { diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/silc10/silcpurple.h --- a/libpurple/protocols/silc10/silcpurple.h Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/silc10/silcpurple.h Mon Aug 23 05:22:11 2010 +0000 @@ -80,7 +80,7 @@ #endif unsigned int detaching : 1; unsigned int resuming : 1; - unsigned int roomlist_canceled : 1; + unsigned int roomlist_cancelled : 1; unsigned int chpk : 1; } *SilcPurple; diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/yahoo/libymsg.c --- a/libpurple/protocols/yahoo/libymsg.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/yahoo/libymsg.c Mon Aug 23 05:22:11 2010 +0000 @@ -3906,7 +3906,6 @@ PurpleBuddy *buddy; PurpleConnection *gc; - YahooData *yd; const char *game; char *game2; char *t; @@ -3917,7 +3916,6 @@ buddy = (PurpleBuddy *) node; gc = purple_account_get_connection(purple_buddy_get_account(buddy)); - yd = (YahooData *) gc->proto_data; f = yahoo_friend_find(gc, purple_buddy_get_name(buddy)); if (!f) @@ -4941,7 +4939,6 @@ struct yahoo_packet *pkt; const char *group = NULL; char *group2; - YahooFriend *f; const char *bname; const char *fed_bname; YahooFederation fed = YAHOO_FEDERATION_NONE; @@ -4953,7 +4950,6 @@ if (!purple_privacy_check(purple_connection_get_account(gc), bname)) return; - f = yahoo_friend_find(gc, bname); fed = yahoo_get_federation_from_name(bname); if (fed != YAHOO_FEDERATION_NONE) fed_bname += 4; @@ -5216,15 +5212,11 @@ { GHashTable *comp; PurpleConnection *gc; - YahooData *yd; - int id; if (!args || !args[0]) return PURPLE_CMD_RET_FAILED; gc = purple_conversation_get_gc(conv); - yd = gc->proto_data; - id = yd->conf_id; purple_debug_info("yahoo", "Trying to join %s \n", args[0]); comp = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/yahoo/yahoo_doodle.c --- a/libpurple/protocols/yahoo/yahoo_doodle.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/yahoo/yahoo_doodle.c Mon Aug 23 05:22:11 2010 +0000 @@ -372,7 +372,7 @@ /* TODO Ask if user wants to save picture before the session is closed */ - wb->state = DOODLE_STATE_CANCELED; + wb->state = DOODLE_STATE_CANCELLED; purple_whiteboard_destroy(wb); } @@ -460,7 +460,7 @@ /* g_debug_debug("yahoo", "doodle: yahoo_doodle_end()\n"); */ - if (gc && wb->state != DOODLE_STATE_CANCELED) + if (gc && wb->state != DOODLE_STATE_CANCELLED) yahoo_doodle_command_send_shutdown(gc, wb->who); g_free(ds->imv_key); diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/yahoo/yahoo_doodle.h --- a/libpurple/protocols/yahoo/yahoo_doodle.h Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/yahoo/yahoo_doodle.h Mon Aug 23 05:22:11 2010 +0000 @@ -56,7 +56,7 @@ #define DOODLE_STATE_REQUESTING 0 #define DOODLE_STATE_REQUESTED 1 #define DOODLE_STATE_ESTABLISHED 2 -#define DOODLE_STATE_CANCELED 3 +#define DOODLE_STATE_CANCELLED 3 /* Doodle canvas dimensions */ #define DOODLE_CANVAS_WIDTH 368 diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/yahoo/yahoo_filexfer.c --- a/libpurple/protocols/yahoo/yahoo_filexfer.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/yahoo/yahoo_filexfer.c Mon Aug 23 05:22:11 2010 +0000 @@ -1235,14 +1235,14 @@ PurpleXfer *xfer; struct yahoo_xfer_data *xd; PurpleAccount *account; - YahooData* yd; + PurpleConnection *gc; if (!(xfer = data)) return; if (!(xd = xfer->data)) return; - yd = xd->gc->proto_data; - account = purple_connection_get_account(xd->gc); + gc = xd->gc; + account = purple_connection_get_account(gc); if ((source < 0) || (xd->path == NULL) || (xd->host == NULL)) { purple_xfer_error(PURPLE_XFER_RECEIVE, purple_xfer_get_account(xfer), xfer->who, _("Unable to connect.")); @@ -1253,7 +1253,7 @@ if (xd->txbuflen == 0) { gchar* cookies; - cookies = yahoo_get_cookies(xd->gc); + cookies = yahoo_get_cookies(gc); if(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND && xd->status_15 == ACCEPTED) { if(xd->info_val_249 == 2) diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/protocols/yahoo/yahoochat.c --- a/libpurple/protocols/yahoo/yahoochat.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/protocols/yahoo/yahoochat.c Mon Aug 23 05:22:11 2010 +0000 @@ -617,9 +617,6 @@ char *who = NULL; char *room = NULL; GSList *l; - YahooData *yd; - - yd = gc->proto_data; for (l = pkt->hash; l; l = l->next) { struct yahoo_pair *pair = l->data; @@ -638,8 +635,7 @@ purple_conv_chat_remove_user(PURPLE_CONV_CHAT(c), who, NULL); } - if (room) - g_free(room); + g_free(room); } void yahoo_process_chat_message(PurpleConnection *gc, struct yahoo_packet *pkt) diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/stun.c --- a/libpurple/stun.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/stun.c Mon Aug 23 05:22:11 2010 +0000 @@ -105,11 +105,11 @@ } static void do_callbacks(void) { - while(callbacks) { + while (callbacks) { StunCallback cb = callbacks->data; - if(cb) + if (cb) cb(&nattype); - callbacks = g_slist_remove(callbacks, cb); + callbacks = g_slist_delete_link(callbacks, callbacks); } } @@ -280,7 +280,6 @@ GSList *hosts = data; struct stun_conn *sc; static struct stun_header hdr_data; - int ret; if(fd < 0) { nattype.status = PURPLE_STUN_STATUS_UNKNOWN; @@ -298,15 +297,14 @@ sc->incb = purple_input_add(fd, PURPLE_INPUT_READ, reply_cb, sc); - ret = GPOINTER_TO_INT(hosts->data); - hosts = g_slist_remove(hosts, hosts->data); + hosts = g_slist_delete_link(hosts, hosts); memcpy(&(sc->addr), hosts->data, sizeof(struct sockaddr_in)); g_free(hosts->data); - hosts = g_slist_remove(hosts, hosts->data); - while(hosts) { - hosts = g_slist_remove(hosts, hosts->data); + hosts = g_slist_delete_link(hosts, hosts); + while (hosts) { + hosts = g_slist_delete_link(hosts, hosts); g_free(hosts->data); - hosts = g_slist_remove(hosts, hosts->data); + hosts = g_slist_delete_link(hosts, hosts); } hdr_data.type = htons(MSGTYPE_BINDINGREQUEST); @@ -341,10 +339,10 @@ } if (!purple_network_listen_range(12108, 12208, SOCK_DGRAM, hbn_listen_cb, hosts)) { - while(hosts) { - hosts = g_slist_remove(hosts, hosts->data); + while (hosts) { + hosts = g_slist_delete_link(hosts, hosts); g_free(hosts->data); - hosts = g_slist_remove(hosts, hosts->data); + hosts = g_slist_delete_link(hosts, hosts); } nattype.status = PURPLE_STUN_STATUS_UNKNOWN; diff -r cc75490da0e3 -r d487a2adc3a6 libpurple/util.c --- a/libpurple/util.c Mon Aug 23 01:18:12 2010 +0000 +++ b/libpurple/util.c Mon Aug 23 05:22:11 2010 +0000 @@ -3115,7 +3115,7 @@ if (text[i] != thechar) text[j++] = text[i]; - text[j++] = '\0'; + text[j] = '\0'; } void diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/gtkblist.c --- a/pidgin/gtkblist.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/gtkblist.c Mon Aug 23 05:22:11 2010 +0000 @@ -3965,7 +3965,6 @@ tmp); g_free(tmp); } - count = 0; count = purple_blist_get_group_size(group, FALSE); if (count != 0) { @@ -3976,7 +3975,6 @@ tmp); g_free(tmp); } - count = 0; tmp = purple_notify_user_info_get_text_with_newline(user_info, "\n"); g_string_append(str, tmp); @@ -4023,7 +4021,6 @@ { PurpleBuddy *buddy = NULL; struct _pidgin_blist_node *gtknode = node->ui_data; - struct _pidgin_blist_node *gtkbuddynode = NULL; PurplePlugin *prpl; PurplePluginProtocolInfo *prpl_info; const char *name = NULL; @@ -4034,11 +4031,9 @@ if(PURPLE_BLIST_NODE_IS_CONTACT(node)) { if(!gtknode->contact_expanded) { buddy = purple_contact_get_priority_buddy((PurpleContact*)node); - gtkbuddynode = ((PurpleBlistNode*)buddy)->ui_data; } } else if(PURPLE_BLIST_NODE_IS_BUDDY(node)) { buddy = (PurpleBuddy*)node; - gtkbuddynode = node->ui_data; p = purple_buddy_get_presence(buddy); if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_MOBILE)) { /* This emblem comes from the small emoticon set now, @@ -4131,7 +4126,6 @@ pidgin_blist_get_status_icon(PurpleBlistNode *node, PidginStatusIconSize size) { GdkPixbuf *ret; - const char *protoname = NULL; const char *icon = NULL; struct _pidgin_blist_node *gtknode = node->ui_data; struct _pidgin_blist_node *gtkbuddynode = NULL; @@ -4158,7 +4152,6 @@ if(buddy || chat) { PurpleAccount *account; PurplePlugin *prpl; - PurplePluginProtocolInfo *prpl_info; if(buddy) account = buddy->account; @@ -4168,12 +4161,6 @@ prpl = purple_find_prpl(purple_account_get_protocol_id(account)); if(!prpl) return NULL; - - prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); - - if(prpl_info && prpl_info->list_icon) { - protoname = prpl_info->list_icon(account, buddy); - } } if(buddy) { diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/gtkconv.c Mon Aug 23 05:22:11 2010 +0000 @@ -750,9 +750,9 @@ do_invite(GtkWidget *w, int resp, InviteBuddyInfo *info) { const char *buddy, *message; - PidginConversation *gtkconv; - - gtkconv = PIDGIN_CONVERSATION(info->conv); + PurpleConversation *conv; + + conv = info->conv; if (resp == GTK_RESPONSE_OK) { buddy = gtk_entry_get_text(GTK_ENTRY(info->entry)); @@ -761,8 +761,8 @@ if (!g_ascii_strcasecmp(buddy, "")) return; - serv_chat_invite(purple_conversation_get_gc(info->conv), - purple_conv_chat_get_id(PURPLE_CONV_CHAT(info->conv)), + serv_chat_invite(purple_conversation_get_gc(conv), + purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)), message, buddy); } @@ -856,7 +856,6 @@ InviteBuddyInfo *info = NULL; if (invite_dialog == NULL) { - PurpleConnection *gc; PidginWindow *gtkwin; GtkWidget *label; GtkWidget *vbox, *hbox; @@ -869,7 +868,6 @@ info = g_new0(InviteBuddyInfo, 1); info->conv = conv; - gc = purple_conversation_get_gc(conv); gtkwin = pidgin_conv_get_window(gtkconv); /* Create the new dialog. */ @@ -1200,12 +1198,10 @@ menu_insert_image_cb(gpointer data, guint action, GtkWidget *widget) { PidginWindow *win = data; - PurpleConversation *conv; PidginConversation *gtkconv; GtkIMHtmlToolbar *toolbar; gtkconv = pidgin_conv_window_get_active_gtkconv(win); - conv = gtkconv->active_conv; toolbar = GTK_IMHTMLTOOLBAR(gtkconv->toolbar); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), @@ -1911,10 +1907,8 @@ conv_keypress_common(PidginConversation *gtkconv, GdkEventKey *event) { PidginWindow *win; - PurpleConversation *conv; int curconv; - conv = gtkconv->active_conv; win = gtkconv->win; curconv = gtk_notebook_get_current_page(GTK_NOTEBOOK(win->notebook)); @@ -2009,13 +2003,11 @@ static gboolean entry_key_press_cb(GtkWidget *entry, GdkEventKey *event, gpointer data) { - PidginWindow *win; PurpleConversation *conv; PidginConversation *gtkconv; gtkconv = (PidginConversation *)data; conv = gtkconv->active_conv; - win = gtkconv->win; if (conv_keypress_common(gtkconv, event)) return TRUE; @@ -2350,12 +2342,9 @@ gchar *new_text, gint new_text_length, gpointer user_data) { PidginConversation *gtkconv = (PidginConversation *)user_data; - PurpleConversation *conv; g_return_if_fail(gtkconv != NULL); - conv = gtkconv->active_conv; - if (!purple_prefs_get_bool("/purple/conversations/im/send_typing")) return; @@ -2617,7 +2606,6 @@ PidginConversation *gtkconv = (PidginConversation *)data; PurpleConversation *conv = gtkconv->active_conv; PurpleAccount *account; - PurplePluginProtocolInfo *prpl_info = NULL; GdkPixbuf *buf; GdkPixbuf *scale; @@ -2628,9 +2616,7 @@ gtkconv = PIDGIN_CONVERSATION(conv); account = purple_conversation_get_account(conv); - if(account && account->gc) { - prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl); - } else { + if (!(account && account->gc)) { gtkconv->u.im->icon_timer = 0; return FALSE; } @@ -2702,7 +2688,6 @@ GList *children; GtkWidget *event; PurpleConversation *conv = gtkconv->active_conv; - PidginWindow *gtkwin; g_return_if_fail(conv != NULL); @@ -2730,8 +2715,6 @@ gtkconv->u.im->anim = NULL; gtkconv->u.im->iter = NULL; gtkconv->u.im->show_icon = FALSE; - - gtkwin = gtkconv->win; } static void @@ -3684,13 +3667,10 @@ static void update_typing_icon(PidginConversation *gtkconv) { - PidginWindow *gtkwin; PurpleConvIm *im = NULL; PurpleConversation *conv = gtkconv->active_conv; char *message = NULL; - gtkwin = gtkconv->win; - if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) im = PURPLE_CONV_IM(conv); @@ -5740,10 +5720,8 @@ time_t mtime) { PidginConversation *gtkconv; - PidginWindow *win; PurpleConnection *gc; PurpleAccount *account; - PurplePluginProtocolInfo *prpl_info; int gtk_font_options = 0; int gtk_font_options_all = 0; int max_scrollback_lines; @@ -5830,9 +5808,6 @@ g_free(tmp); } - win = gtkconv->win; - prpl_info = gc ? PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl) : NULL; - line_count = gtk_text_buffer_get_line_count( gtk_text_view_get_buffer(GTK_TEXT_VIEW( gtkconv->imhtml))); @@ -6263,7 +6238,6 @@ pidgin_conv_chat_update_user(PurpleConversation *conv, const char *user) { PurpleConvChat *chat; - PurpleConvChatBuddyFlags flags; PurpleConvChatBuddy *cbuddy; PidginConversation *gtkconv; PidginChatPane *gtkchat; @@ -6306,8 +6280,6 @@ g_return_if_fail(alias != NULL); - flags = purple_conv_chat_user_get_flags(chat, user); - cbuddy = purple_conv_chat_cb_find(chat, user); if (cbuddy) add_chat_buddy_common(conv, cbuddy, NULL); @@ -6729,7 +6701,6 @@ PurpleConvIm *im = NULL; PurpleAccount *account = purple_conversation_get_account(conv); PurpleBuddy *buddy = NULL; - PurplePresence *p = NULL; char *markup = NULL; AtkObject *accessibility_obj; /* I think this is a little longer than it needs to be but I'm lazy. */ @@ -6749,7 +6720,6 @@ if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { buddy = purple_find_buddy(account, conv->name); if (buddy) { - p = purple_buddy_get_presence(buddy); markup = pidgin_blist_get_name_markup(buddy, FALSE, FALSE); } else { markup = title; @@ -6964,7 +6934,6 @@ int size = 0; PurpleAccount *account; - PurplePluginProtocolInfo *prpl_info = NULL; PurpleBuddyIcon *icon; @@ -6981,8 +6950,6 @@ return; account = purple_conversation_get_account(conv); - if(account && account->gc) - prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl); /* Remove the current icon stuff */ children = gtk_container_get_children(GTK_CONTAINER(gtkconv->u.im->icon_container)); @@ -8627,7 +8594,7 @@ static gboolean notebook_press_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win) { - gint nb_x, nb_y, x_rel, y_rel; + gint nb_x, nb_y; int tab_clicked; GtkWidget *page; GtkWidget *tab; @@ -8670,9 +8637,6 @@ */ gdk_window_get_origin(win->notebook->window, &nb_x, &nb_y); - x_rel = e->x_root - nb_x; - y_rel = e->y_root - nb_y; - /* Reset the min/max x/y */ win->drag_min_x = 0; win->drag_min_y = 0; @@ -9239,6 +9203,7 @@ if (win && win->window && !GTK_WIDGET_VISIBLE(win->window) && conv_width != 0) { +#ifdef _WIN32 /* only override window manager placement on Windows */ /* ...check position is on screen... */ if (conv_x >= gdk_screen_width()) conv_x = gdk_screen_width() - 100; @@ -9251,7 +9216,6 @@ conv_y = 100; /* ...and move it back. */ -#ifdef _WIN32 /* only override window manager placement on Windows */ gtk_window_move(GTK_WINDOW(win->window), conv_x, conv_y); #endif gtk_window_resize(GTK_WINDOW(win->window), conv_width, conv_height); @@ -9503,7 +9467,7 @@ gtk_widget_show(gtkconv->menu_tabby); - if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) + if (conv_type == PURPLE_CONV_TYPE_IM) pidgin_conv_update_buddy_icon(conv); /* Build and set conversations tab */ @@ -9630,9 +9594,7 @@ pidgin_conv_window_remove_gtkconv(PidginWindow *win, PidginConversation *gtkconv) { unsigned int index; - PurpleConversationType conv_type; - - conv_type = purple_conversation_get_type(gtkconv->active_conv); + index = gtk_notebook_page_num(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont); g_object_ref(gtkconv->tab_cont); @@ -9965,12 +9927,9 @@ static void conv_placement_by_group(PidginConversation *conv) { - PurpleConversationType type; PurpleGroup *group = NULL; GList *wl, *cl; - type = purple_conversation_get_type(conv->active_conv); - group = conv_get_group(conv); /* Go through the list of IMs and find one with this group. */ @@ -10004,12 +9963,10 @@ static void conv_placement_by_account(PidginConversation *conv) { - PurpleConversationType type; GList *wins, *convs; PurpleAccount *account; account = purple_conversation_get_account(conv->active_conv); - type = purple_conversation_get_type(conv->active_conv); /* Go through the list of IMs and find one with this group. */ for (wins = pidgin_conv_windows_get_list(); wins != NULL; wins = wins->next) { diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/gtkdialogs.c --- a/pidgin/gtkdialogs.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/gtkdialogs.c Mon Aug 23 05:22:11 2010 +0000 @@ -1288,7 +1288,7 @@ purple_debug_info("blist", "Removing '%s' from buddy list.\n", buddy->name); /* TODO - Should remove from blist first... then call purple_account_remove_buddy()? */ - purple_account_remove_buddy(buddy->account, buddy, group); + purple_account_remove_buddy(account, buddy, group); purple_blist_remove_buddy(buddy); g_free(name); diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/gtkft.c --- a/pidgin/gtkft.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/gtkft.c Mon Aug 23 05:22:11 2010 +0000 @@ -112,13 +112,10 @@ get_xfer_info_strings(PurpleXfer *xfer, char **kbsec, char **time_elapsed, char **time_remaining) { - PidginXferUiData *data; double kb_sent, kb_rem; double kbps = 0.0; time_t elapsed, now; - data = PIDGINXFER(xfer); - if (xfer->end_time != 0) now = xfer->end_time; else @@ -159,7 +156,7 @@ *time_remaining = g_strdup(_("Finished")); } else if (purple_xfer_is_canceled(xfer)) { - *time_remaining = g_strdup(_("Canceled")); + *time_remaining = g_strdup(_("Cancelled")); } else if (purple_xfer_get_size(xfer) == 0 || (kb_sent > 0 && kbps == 0)) { *time_remaining = g_strdup(_("Unknown")); @@ -995,7 +992,7 @@ GTK_ICON_SIZE_MENU, NULL); if (purple_xfer_is_canceled(xfer)) - status = _("Canceled"); + status = _("Cancelled"); else status = _("Failed"); @@ -1015,7 +1012,6 @@ { PidginXferUiData *data; char *size_str, *remaining_str; - GtkTreeSelection *selection; time_t current_time; GtkTreeIter iter; gboolean valid; @@ -1066,8 +1062,6 @@ g_object_unref(pixbuf); } - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(xfer_dialog->tree)); - update_title_progress(dialog); if (xfer == dialog->selected_xfer) update_detailed_info(xfer_dialog, xfer); diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/gtkft.h --- a/pidgin/gtkft.h Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/gtkft.h Mon Aug 23 05:22:11 2010 +0000 @@ -88,10 +88,10 @@ PurpleXfer *xfer); /** - * Indicate in a file transfer dialog that a transfer was canceled. + * Indicate in a file transfer dialog that a transfer was cancelled. * * @param dialog The file transfer dialog. - * @param xfer The file transfer that was canceled. + * @param xfer The file transfer that was cancelled. */ void pidgin_xfer_dialog_cancel_xfer(PidginXferDialog *dialog, PurpleXfer *xfer); diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/gtkimhtml.c --- a/pidgin/gtkimhtml.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/gtkimhtml.c Mon Aug 23 05:22:11 2010 +0000 @@ -1476,10 +1476,8 @@ static void gtk_imhtml_class_init (GtkIMHtmlClass *klass) { GtkWidgetClass *widget_class = (GtkWidgetClass *) klass; - GtkObjectClass *object_class; GtkBindingSet *binding_set; GObjectClass *gobject_class; - object_class = (GtkObjectClass*) klass; gobject_class = (GObjectClass*) klass; parent_class = g_type_class_ref(GTK_TYPE_TEXT_VIEW); signals[URL_CLICKED] = g_signal_new("url_clicked", diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/gtkimhtmltoolbar.c --- a/pidgin/gtkimhtmltoolbar.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Mon Aug 23 05:22:11 2010 +0000 @@ -1205,9 +1205,7 @@ /* Boring GTK+ stuff */ static void gtk_imhtmltoolbar_class_init (GtkIMHtmlToolbarClass *class) { - GtkObjectClass *object_class; GObjectClass *gobject_class; - object_class = (GtkObjectClass*) class; gobject_class = (GObjectClass*) class; parent_class = g_type_class_ref(GTK_TYPE_HBOX); gobject_class->finalize = gtk_imhtmltoolbar_finalize; diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/gtkpounce.c --- a/pidgin/gtkpounce.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/gtkpounce.c Mon Aug 23 05:22:11 2010 +0000 @@ -194,7 +194,6 @@ { GtkTreeIter iter; PurpleAccount *account; - PurplePounceEvent events; gboolean recurring; const char *pouncer; const char *pouncee; @@ -202,8 +201,6 @@ account = purple_pounce_get_pouncer(pounce); - events = purple_pounce_get_events(pounce); - pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); pouncer = purple_account_get_username(account); diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/gtkroomlist.c --- a/pidgin/gtkroomlist.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/gtkroomlist.c Mon Aug 23 05:22:11 2010 +0000 @@ -362,8 +362,6 @@ style = grl->tipwindow->style; - max_text_width = 0; - max_text_width = MAX(grl->tip_width, grl->tip_name_width); max_width = TOOLTIP_BORDER + SMALL_SPACE + max_text_width + TOOLTIP_BORDER; diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/gtksession.c --- a/pidgin/gtksession.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/gtksession.c Mon Aug 23 05:22:11 2010 +0000 @@ -166,7 +166,7 @@ ret[j++] = g_strdup("--display"); ret[j++] = g_strdup((gchar *)gdk_display_get_name(gdk_display_get_default())); - ret[j++] = NULL; + ret[j] = NULL; return ret; } diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/gtksmiley.c --- a/pidgin/gtksmiley.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/gtksmiley.c Mon Aug 23 05:22:11 2010 +0000 @@ -520,9 +520,6 @@ GtkTreeIter *iter, gpointer data) { PurpleSmiley *smiley = NULL; - SmileyManager *dialog; - - dialog = (SmileyManager*)data; gtk_tree_model_get(model, iter, SMILEY, &smiley, diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/gtkstatusbox.c --- a/pidgin/gtkstatusbox.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/gtkstatusbox.c Mon Aug 23 05:22:11 2010 +0000 @@ -657,7 +657,6 @@ static void pidgin_status_box_refresh(PidginStatusBox *status_box) { - GtkIconSize icon_size; GtkStyle *style; char aa_color[8]; PurpleSavedStatus *saved_status; @@ -668,8 +667,6 @@ gboolean account_status = FALSE; PurpleAccount *acct = (status_box->account) ? status_box->account : status_box->token_status_account; - icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); - style = gtk_widget_get_style(GTK_WIDGET(status_box)); snprintf(aa_color, sizeof(aa_color), "#%02x%02x%02x", style->text_aa[GTK_STATE_NORMAL].red >> 8, @@ -969,11 +966,7 @@ PurpleSavedStatus *saved = cur->data; const gchar *message; gchar *stripped = NULL; - PurpleStatusPrimitive prim; - PidginStatusBoxItemType type = PIDGIN_STATUS_BOX_TYPE_POPULAR; - - /* Get an appropriate status icon */ - prim = purple_savedstatus_get_type(saved); + PidginStatusBoxItemType type; if (purple_savedstatus_is_transient(saved)) { @@ -982,16 +975,18 @@ * API returns the message when purple_savedstatus_get_title() is * called, so we don't need to get the message a second time. */ + type = PIDGIN_STATUS_BOX_TYPE_POPULAR; } else { + type = PIDGIN_STATUS_BOX_TYPE_SAVED_POPULAR; + message = purple_savedstatus_get_message(saved); if (message != NULL) { stripped = purple_markup_strip_html(message); purple_util_chrreplace(stripped, '\n', ' '); } - type = PIDGIN_STATUS_BOX_TYPE_SAVED_POPULAR; } pidgin_status_box_add(statusbox, type, @@ -1074,17 +1069,13 @@ PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, NULL, purple_status_type_get_name(status_type), NULL, - GINT_TO_POINTER(purple_status_type_get_primitive(status_type))); + GINT_TO_POINTER(prim)); } } static void pidgin_status_box_regenerate(PidginStatusBox *status_box, gboolean status_changed) { - GtkIconSize icon_size; - - icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); - /* Unset the model while clearing it */ gtk_tree_view_set_model(GTK_TREE_VIEW(status_box->tree_view), NULL); gtk_list_store_clear(status_box->dropdown_store); diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/gtkutils.c --- a/pidgin/gtkutils.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/gtkutils.c Mon Aug 23 05:22:11 2010 +0000 @@ -680,7 +680,6 @@ create_protocols_menu(const char *default_proto_id) { AopMenu *aop_menu = NULL; - PurplePluginProtocolInfo *prpl_info; PurplePlugin *plugin; GdkPixbuf *pixbuf = NULL; GtkSizeGroup *sg; @@ -702,7 +701,6 @@ p = p->next, i++) { plugin = (PurplePlugin *)p->data; - prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin); if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) { char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", @@ -784,8 +782,6 @@ sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); for (p = list, i = 0; p != NULL; p = p->next, i++) { - PurplePlugin *plugin; - if (show_all) account = (PurpleAccount *)p->data; else { @@ -799,8 +795,6 @@ continue; } - plugin = purple_find_prpl(purple_account_get_protocol_id(account)); - pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL); if (pixbuf) { @@ -2790,79 +2784,78 @@ gboolean pidgin_gdk_pixbuf_is_opaque(GdkPixbuf *pixbuf) { - int width, height, rowstride, i; - unsigned char *pixels; - unsigned char *row; - - if (!gdk_pixbuf_get_has_alpha(pixbuf)) - return TRUE; - - width = gdk_pixbuf_get_width (pixbuf); - height = gdk_pixbuf_get_height (pixbuf); - rowstride = gdk_pixbuf_get_rowstride (pixbuf); - pixels = gdk_pixbuf_get_pixels (pixbuf); - - row = pixels; - for (i = 3; i < rowstride; i+=4) { - if (row[i] < 0xfe) - return FALSE; - } - - for (i = 1; i < height - 1; i++) { - row = pixels + (i*rowstride); - if (row[3] < 0xfe || row[rowstride-1] < 0xfe) { - return FALSE; - } - } - - row = pixels + ((height-1) * rowstride); - for (i = 3; i < rowstride; i+=4) { - if (row[i] < 0xfe) - return FALSE; - } - - return TRUE; + int height, rowstride, i; + unsigned char *pixels; + unsigned char *row; + + if (!gdk_pixbuf_get_has_alpha(pixbuf)) + return TRUE; + + height = gdk_pixbuf_get_height (pixbuf); + rowstride = gdk_pixbuf_get_rowstride (pixbuf); + pixels = gdk_pixbuf_get_pixels (pixbuf); + + row = pixels; + for (i = 3; i < rowstride; i+=4) { + if (row[i] < 0xfe) + return FALSE; + } + + for (i = 1; i < height - 1; i++) { + row = pixels + (i * rowstride); + if (row[3] < 0xfe || row[rowstride - 1] < 0xfe) { + return FALSE; + } + } + + row = pixels + ((height - 1) * rowstride); + for (i = 3; i < rowstride; i += 4) { + if (row[i] < 0xfe) + return FALSE; + } + + return TRUE; } void pidgin_gdk_pixbuf_make_round(GdkPixbuf *pixbuf) { int width, height, rowstride; - guchar *pixels; - if (!gdk_pixbuf_get_has_alpha(pixbuf)) - return; - width = gdk_pixbuf_get_width(pixbuf); - height = gdk_pixbuf_get_height(pixbuf); - rowstride = gdk_pixbuf_get_rowstride(pixbuf); - pixels = gdk_pixbuf_get_pixels(pixbuf); - - if (width < 6 || height < 6) - return; - /* Top left */ - pixels[3] = 0; - pixels[7] = 0x80; - pixels[11] = 0xC0; - pixels[rowstride + 3] = 0x80; - pixels[rowstride * 2 + 3] = 0xC0; - - /* Top right */ - pixels[width * 4 - 1] = 0; - pixels[width * 4 - 5] = 0x80; - pixels[width * 4 - 9] = 0xC0; - pixels[rowstride + (width * 4) - 1] = 0x80; - pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0; - - /* Bottom left */ - pixels[(height - 1) * rowstride + 3] = 0; - pixels[(height - 1) * rowstride + 7] = 0x80; - pixels[(height - 1) * rowstride + 11] = 0xC0; - pixels[(height - 2) * rowstride + 3] = 0x80; - pixels[(height - 3) * rowstride + 3] = 0xC0; - - /* Bottom right */ - pixels[height * rowstride - 1] = 0; - pixels[(height - 1) * rowstride - 1] = 0x80; - pixels[(height - 2) * rowstride - 1] = 0xC0; - pixels[height * rowstride - 5] = 0x80; - pixels[height * rowstride - 9] = 0xC0; + guchar *pixels; + if (!gdk_pixbuf_get_has_alpha(pixbuf)) + return; + width = gdk_pixbuf_get_width(pixbuf); + height = gdk_pixbuf_get_height(pixbuf); + rowstride = gdk_pixbuf_get_rowstride(pixbuf); + pixels = gdk_pixbuf_get_pixels(pixbuf); + + if (width < 6 || height < 6) + return; + /* Top left */ + pixels[3] = 0; + pixels[7] = 0x80; + pixels[11] = 0xC0; + pixels[rowstride + 3] = 0x80; + pixels[rowstride * 2 + 3] = 0xC0; + + /* Top right */ + pixels[width * 4 - 1] = 0; + pixels[width * 4 - 5] = 0x80; + pixels[width * 4 - 9] = 0xC0; + pixels[rowstride + (width * 4) - 1] = 0x80; + pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0; + + /* Bottom left */ + pixels[(height - 1) * rowstride + 3] = 0; + pixels[(height - 1) * rowstride + 7] = 0x80; + pixels[(height - 1) * rowstride + 11] = 0xC0; + pixels[(height - 2) * rowstride + 3] = 0x80; + pixels[(height - 3) * rowstride + 3] = 0xC0; + + /* Bottom right */ + pixels[height * rowstride - 1] = 0; + pixels[(height - 1) * rowstride - 1] = 0x80; + pixels[(height - 2) * rowstride - 1] = 0xC0; + pixels[height * rowstride - 5] = 0x80; + pixels[height * rowstride - 9] = 0xC0; } const char *pidgin_get_dim_grey_string(GtkWidget *widget) { diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/pidginstock.h --- a/pidgin/pidginstock.h Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/pidginstock.h Mon Aug 23 05:22:11 2010 +0000 @@ -44,7 +44,7 @@ #define PIDGIN_STOCK_DOWNLOAD "pidgin-download" #define PIDGIN_STOCK_EDIT "pidgin-edit" #define PIDGIN_STOCK_FGCOLOR "pidgin-fgcolor" -#define PIDGIN_STOCK_FILE_CANCELED "pidgin-file-canceled" +#define PIDGIN_STOCK_FILE_CANCELED "pidgin-file-cancelled" #define PIDGIN_STOCK_FILE_DONE "pidgin-file-done" #define PIDGIN_STOCK_IGNORE "pidgin-ignore" #define PIDGIN_STOCK_INFO "pidgin-info" diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/plugins/gevolution/add_buddy_dialog.c --- a/pidgin/plugins/gevolution/add_buddy_dialog.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Mon Aug 23 05:22:11 2010 +0000 @@ -289,7 +289,7 @@ { EContact *contact = E_CONTACT(c->data); const char *name; - GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells; + GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs; name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); @@ -299,9 +299,11 @@ msns = e_contact_get(contact, E_CONTACT_IM_MSN); icqs = e_contact_get(contact, E_CONTACT_IM_ICQ); novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE); + ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU); if (aims == NULL && jabbers == NULL && yahoos == NULL && - msns == NULL && icqs == NULL && novells == NULL) + msns == NULL && icqs == NULL && novells == NULL && + ggs == NULL) { GtkTreeIter iter; @@ -320,6 +322,7 @@ add_ims(dialog, contact, name, msns, "prpl-msn"); add_ims(dialog, contact, name, icqs, "prpl-icq"); add_ims(dialog, contact, name, novells, "prpl-novell"); + add_ims(dialog, contact, name, ggs, "prpl-gg"); } } @@ -365,7 +368,7 @@ { EContact *contact = E_CONTACT(l->data); const char *name; - GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells; + GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs; name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); @@ -381,9 +384,11 @@ msns = e_contact_get(contact, E_CONTACT_IM_MSN); icqs = e_contact_get(contact, E_CONTACT_IM_ICQ); novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE); + ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU); if (aims == NULL && jabbers == NULL && yahoos == NULL && - msns == NULL && icqs == NULL && novells == NULL) + msns == NULL && icqs == NULL && novells == NULL && + ggs == NULL) { GtkTreeIter iter; @@ -402,6 +407,7 @@ add_ims(dialog, contact, name, msns, "prpl-msn"); add_ims(dialog, contact, name, icqs, "prpl-icq"); add_ims(dialog, contact, name, novells, "prpl-novell"); + add_ims(dialog, contact, name, ggs, "prpl-gg"); } } } diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/plugins/gevolution/gevo-util.c --- a/pidgin/plugins/gevolution/gevo-util.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/plugins/gevolution/gevo-util.c Mon Aug 23 05:22:11 2010 +0000 @@ -111,6 +111,8 @@ protocol_field = E_CONTACT_IM_JABBER; else if (!strcmp(protocol_id, "prpl-novell")) protocol_field = E_CONTACT_IM_GROUPWISE; + else if (!strcmp(protocol_id, "prpl-gg")) + protocol_field = E_CONTACT_IM_GADUGADU; return protocol_field; } diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/plugins/gevolution/gevolution.c --- a/pidgin/plugins/gevolution/gevolution.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/plugins/gevolution/gevolution.c Mon Aug 23 05:22:11 2010 +0000 @@ -125,6 +125,7 @@ update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN); update_ims_from_contact(contact, name, "prpl-icq", E_CONTACT_IM_ICQ); update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE); + update_ims_from_contact(contact, name, "prpl-gg", E_CONTACT_IM_GADUGADU); } static void diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/plugins/gevolution/new_person_dialog.c --- a/pidgin/plugins/gevolution/new_person_dialog.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/plugins/gevolution/new_person_dialog.c Mon Aug 23 05:22:11 2010 +0000 @@ -153,6 +153,8 @@ field = E_CONTACT_IM_MSN; else if (!strcmp(im_service, "prpl-novell")) field = E_CONTACT_IM_GROUPWISE; + else if (!strcmp(im_service, "prpl-gg")) + field = E_CONTACT_IM_GADUGADU; if (field > 0) { diff -r cc75490da0e3 -r d487a2adc3a6 pidgin/plugins/notify.c --- a/pidgin/plugins/notify.c Mon Aug 23 01:18:12 2010 +0000 +++ b/pidgin/plugins/notify.c Mon Aug 23 05:22:11 2010 +0000 @@ -303,7 +303,6 @@ attach_signals(PurpleConversation *conv) { PidginConversation *gtkconv = NULL; - PidginWindow *gtkwin = NULL; GSList *imhtml_ids = NULL, *entry_ids = NULL; guint id; @@ -313,8 +312,6 @@ return 0; } - gtkwin = gtkconv->win; - if (purple_prefs_get_bool("/plugins/gtk/X11/notify/notify_focus")) { /* TODO should really find a way to make this work no matter * where the focus is inside the conv window, without having @@ -358,13 +355,11 @@ detach_signals(PurpleConversation *conv) { PidginConversation *gtkconv = NULL; - PidginWindow *gtkwin = NULL; GSList *ids = NULL, *l; gtkconv = PIDGIN_CONVERSATION(conv); if (!gtkconv) return; - gtkwin = gtkconv->win; ids = purple_conversation_get_data(conv, "notify-imhtml-signals"); for (l = ids; l != NULL; l = l->next) @@ -650,7 +645,6 @@ apply_method() { GList *convs; - PidginWindow *purplewin = NULL; for (convs = purple_get_conversations(); convs != NULL; convs = convs->next) { @@ -659,7 +653,6 @@ /* remove notifications */ unnotify(conv, FALSE); - purplewin = PIDGIN_CONVERSATION(conv)->win; if (GPOINTER_TO_INT(purple_conversation_get_data(conv, "notify-message-count")) != 0) /* reattach appropriate notifications */ notify(conv, FALSE); diff -r cc75490da0e3 -r d487a2adc3a6 po/af.po --- a/po/af.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/af.po Mon Aug 23 05:22:11 2010 +0000 @@ -802,7 +802,7 @@ msgid "Waiting for transfer to begin" msgstr "Wag vir oordrag om te begin" -msgid "Canceled" +msgid "Cancelled" msgstr "Gekanselleer" msgid "Failed" @@ -15698,13 +15698,13 @@ #~ "afkomstig te wees. Dit kan beteken dat u nie tans aan die diens gekoppel " #~ "is wat u dink nie." -#~ msgid "You canceled the transfer of %s" +#~ msgid "You cancelled the transfer of %s" #~ msgstr "U het die oordrag van %s gekanselleer" -#~ msgid "%s canceled the transfer of %s" +#~ msgid "%s cancelled the transfer of %s" #~ msgstr "%s het die oordrag van %s gekanselleer" -#~ msgid "%s canceled the file transfer" +#~ msgid "%s cancelled the file transfer" #~ msgstr "%s het die lêeroordrag gekanselleer" #~ msgid "Join/Part Hiding Configuration" @@ -16292,7 +16292,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Kon nie %s vir skryf open nie!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "Lêeroordrag het misluk; ander kant het waarskynlik gekanselleer." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/am.po --- a/po/am.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/am.po Mon Aug 23 05:22:11 2010 +0000 @@ -812,7 +812,7 @@ msgstr "" #, fuzzy -msgid "Canceled" +msgid "Cancelled" msgstr "ተወው" #, fuzzy diff -r cc75490da0e3 -r d487a2adc3a6 po/ar.po --- a/po/ar.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ar.po Mon Aug 23 05:22:11 2010 +0000 @@ -791,7 +791,7 @@ msgid "Waiting for transfer to begin" msgstr "في انتظار بدء النقل" -msgid "Canceled" +msgid "Cancelled" msgstr "أُلغِيَ" msgid "Failed" @@ -16584,7 +16584,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "لايمكن فتح %s للكتابة!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "فشل ارسال الملف: من المحتمل أن المستقبِل ألغى العملية." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/as.po --- a/po/as.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/as.po Mon Aug 23 05:22:11 2010 +0000 @@ -789,7 +789,7 @@ msgid "Waiting for transfer to begin" msgstr "বিনিময়ৰ আৰম্ভত অপেক্ষা কৰা হৈছে" -msgid "Canceled" +msgid "Cancelled" msgstr "বাতিল কৰা হৈছে" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/az.po --- a/po/az.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/az.po Mon Aug 23 05:22:11 2010 +0000 @@ -809,7 +809,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "" msgid "Failed" @@ -16008,7 +16008,7 @@ #~ msgid "Invalid Groupname" #~ msgstr "Səhv istifadəçi adı." -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "Fayl transferi bacarılmadı, güman ki digər tərəfdən ləğv edildi." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/be@latin.po --- a/po/be@latin.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/be@latin.po Mon Aug 23 05:22:11 2010 +0000 @@ -801,7 +801,7 @@ msgid "Waiting for transfer to begin" msgstr "Čakańnie pačatku pieradačy" -msgid "Canceled" +msgid "Cancelled" msgstr "Anulavanaja" msgid "Failed" @@ -16704,7 +16704,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Niemahčyma adčynić %s dziela zapisu!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "Pamyłka pieradačy fajłu; aperacyja, mabyć, anulavanaja z taho boku." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/bg.po --- a/po/bg.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/bg.po Mon Aug 23 05:22:11 2010 +0000 @@ -820,7 +820,7 @@ msgid "Waiting for transfer to begin" msgstr "Изчакване пренасянето да започне" -msgid "Canceled" +msgid "Cancelled" msgstr "Отказан" msgid "Failed" @@ -16574,7 +16574,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "%s не може да бъде отворен за запис!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "Неуспешен пренос на файла. Получателят вероятно е отказал получаването." diff -r cc75490da0e3 -r d487a2adc3a6 po/bn.po --- a/po/bn.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/bn.po Mon Aug 23 05:22:11 2010 +0000 @@ -843,7 +843,7 @@ msgid "Waiting for transfer to begin" msgstr "স্থানান্তর শুরু করার জন্য অপেক্ষা করা হচ্ছে" -msgid "Canceled" +msgid "Cancelled" msgstr "বাতিল করা হয়েছে" # mark6 diff -r cc75490da0e3 -r d487a2adc3a6 po/bn_IN.po --- a/po/bn_IN.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/bn_IN.po Mon Aug 23 05:22:11 2010 +0000 @@ -795,7 +795,7 @@ msgid "Waiting for transfer to begin" msgstr "পরিবহণ আরম্ভে অপেক্ষা চলছে" -msgid "Canceled" +msgid "Cancelled" msgstr "বাতিল করা হয়েছে" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/bs.po --- a/po/bs.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/bs.po Mon Aug 23 05:22:11 2010 +0000 @@ -822,7 +822,7 @@ msgid "Waiting for transfer to begin" msgstr "Cekanje na pocetak transfera" -msgid "Canceled" +msgid "Cancelled" msgstr "Otkazano" msgid "Failed" @@ -17049,7 +17049,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Nije bilo moguce otvoriti %s za pisanje!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "Transfer datoteke je neuspio; druga strana je vjerovatno odustala." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/ca.po --- a/po/ca.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ca.po Mon Aug 23 05:22:11 2010 +0000 @@ -834,7 +834,7 @@ msgid "Waiting for transfer to begin" msgstr "S'està esperant a iniciar la transferència" -msgid "Canceled" +msgid "Cancelled" msgstr "S'ha cancel·lat" msgid "Failed" @@ -16326,7 +16326,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "No s'ha pogut obrir %s per a escriure-hi." -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a " #~ "l'altra banda." diff -r cc75490da0e3 -r d487a2adc3a6 po/ca@valencia.po --- a/po/ca@valencia.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ca@valencia.po Mon Aug 23 05:22:11 2010 +0000 @@ -834,7 +834,7 @@ msgid "Waiting for transfer to begin" msgstr "S'està esperant a iniciar la transferència" -msgid "Canceled" +msgid "Cancelled" msgstr "S'ha cancel·lat" msgid "Failed" @@ -16324,7 +16324,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "No s'ha pogut obrir %s per a escriure-hi." -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a " #~ "l'altra banda." diff -r cc75490da0e3 -r d487a2adc3a6 po/cs.po --- a/po/cs.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/cs.po Mon Aug 23 05:22:11 2010 +0000 @@ -793,7 +793,7 @@ msgid "Waiting for transfer to begin" msgstr "Čekám na začátek přenosu" -msgid "Canceled" +msgid "Cancelled" msgstr "Zrušeno" msgid "Failed" @@ -16042,7 +16042,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Nemohu otevřít %s pro zápis!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "Přenos souboru selhal; druhá strana jej pravděpodobně přerušila." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/da.po --- a/po/da.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/da.po Mon Aug 23 05:22:11 2010 +0000 @@ -812,7 +812,7 @@ msgid "Waiting for transfer to begin" msgstr "Venter på at overførsel skal starte" -msgid "Canceled" +msgid "Cancelled" msgstr "Annulleret" msgid "Failed" @@ -16489,7 +16489,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Kunne ikke åbne %s til skrivning!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "Filoverførsel fejlede - den anden side har sikkert afbrudt." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/de.po --- a/po/de.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/de.po Mon Aug 23 05:22:11 2010 +0000 @@ -813,7 +813,7 @@ msgid "Waiting for transfer to begin" msgstr "Warte auf den Beginn der Dateiübertragung" -msgid "Canceled" +msgid "Cancelled" msgstr "Abgebrochen" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/dz.po --- a/po/dz.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/dz.po Mon Aug 23 05:22:11 2010 +0000 @@ -818,7 +818,7 @@ msgid "Waiting for transfer to begin" msgstr "གནས་སོར་འགོ་བཙུགས་ནིའི་དོན་ལུ་བསྒུག་དོ།" -msgid "Canceled" +msgid "Cancelled" msgstr "ཆ་མེད་བཏང་ཡི།" msgid "Failed" @@ -16889,7 +16889,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "བྲིས་ནིའི་དོན་ལུ %s ཁ་ཕྱེ་མ་ཚུགས།" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "ཡིག་སྣོད་གནས་སོར་འཐུས་ཤོར་བྱུང་ནུག ཕྱོགས་གཞན་མི་འདི་ཆ་མེད་བཏང་ཡི།" #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/el.po --- a/po/el.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/el.po Mon Aug 23 05:22:11 2010 +0000 @@ -804,7 +804,7 @@ msgid "Waiting for transfer to begin" msgstr "Αναμονή έναρξης μεταφοράς" -msgid "Canceled" +msgid "Cancelled" msgstr "Ακυρώθηκε" msgid "Failed" @@ -16284,7 +16284,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "Αποτυχία μεταφοράς αρχείου. Πιθανώς να ακυρώθηκε από την άλλη πλευρά." diff -r cc75490da0e3 -r d487a2adc3a6 po/en_AU.po --- a/po/en_AU.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/en_AU.po Mon Aug 23 05:22:11 2010 +0000 @@ -834,8 +834,8 @@ msgid "Waiting for transfer to begin" msgstr "Waiting for transfer to begin" -msgid "Canceled" -msgstr "Canceled" +msgid "Cancelled" +msgstr "Cancelled" msgid "Failed" msgstr "Failed" @@ -2128,14 +2128,14 @@ #, fuzzy, c-format msgid "You cancelled the transfer of %s" -msgstr "You canceled the transfer of %s" +msgstr "You cancelled the transfer of %s" msgid "File transfer cancelled" msgstr "File transfer cancelled" #, fuzzy, c-format msgid "%s cancelled the transfer of %s" -msgstr "%s canceled the transfer of %s" +msgstr "%s cancelled the transfer of %s" #, fuzzy, c-format msgid "%s cancelled the file transfer" @@ -9265,7 +9265,7 @@ #, fuzzy, c-format msgid "%d cancelled the transfer of %s" -msgstr "%s canceled the transfer of %s" +msgstr "%s cancelled the transfer of %s" #, fuzzy, c-format msgid "Group Title: %s
" @@ -9346,7 +9346,7 @@ #, fuzzy msgid "Place Closed" -msgstr "Canceled" +msgstr "Cancelled" msgid "Microphone" msgstr "" @@ -17062,8 +17062,8 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Could not open %s for writing!" -#~ msgid "File transfer failed; other side probably canceled." -#~ msgstr "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." +#~ msgstr "File transfer failed; other side probably cancelled." #~ msgid "Could not connect for transfer." #~ msgstr "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/en_CA.po --- a/po/en_CA.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/en_CA.po Mon Aug 23 05:22:11 2010 +0000 @@ -834,7 +834,7 @@ msgid "Waiting for transfer to begin" msgstr "Waiting for transfer to begin" -msgid "Canceled" +msgid "Cancelled" msgstr "Cancelled" msgid "Failed" @@ -17050,7 +17050,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Could not open %s for writing!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "File transfer failed; other side probably cancelled." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/en_GB.po --- a/po/en_GB.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/en_GB.po Mon Aug 23 05:22:11 2010 +0000 @@ -793,7 +793,7 @@ msgid "Waiting for transfer to begin" msgstr "Waiting for transfer to begin" -msgid "Canceled" +msgid "Cancelled" msgstr "Cancelled" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/eo.po --- a/po/eo.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/eo.po Mon Aug 23 05:22:11 2010 +0000 @@ -766,7 +766,7 @@ msgid "Waiting for transfer to begin" msgstr "Atendante la alŝutoeko" -msgid "Canceled" +msgid "Cancelled" msgstr "Rezignita" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/es.po --- a/po/es.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/es.po Mon Aug 23 05:22:11 2010 +0000 @@ -916,7 +916,7 @@ msgid "Waiting for transfer to begin" msgstr "Esperando el comienzo de la transferencia" -msgid "Canceled" +msgid "Cancelled" msgstr "Cancelado" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/et.po --- a/po/et.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/et.po Mon Aug 23 05:22:11 2010 +0000 @@ -795,7 +795,7 @@ msgid "Waiting for transfer to begin" msgstr "Oodatakse ülekande algust" -msgid "Canceled" +msgid "Cancelled" msgstr "Tühistatud" msgid "Failed" @@ -16081,7 +16081,7 @@ #~ msgid "Password Change Successful" #~ msgstr "Paroolimuutmine õnnestus" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "Tõrge ülekandmisel, ilmselt tühistas teine pool ülekande." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/eu.po --- a/po/eu.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/eu.po Mon Aug 23 05:22:11 2010 +0000 @@ -801,7 +801,7 @@ msgid "Waiting for transfer to begin" msgstr "Transferentzia hasteko zain" -msgid "Canceled" +msgid "Cancelled" msgstr "Bertan behera utzi da" msgid "Failed" @@ -16340,7 +16340,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Ezin izan da %s ireki idazteko!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "Fitxategi-transferentziak huts egin du; beste aldekoak beharbada bertan " #~ "behera utziko zuen." diff -r cc75490da0e3 -r d487a2adc3a6 po/fa.po --- a/po/fa.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/fa.po Mon Aug 23 05:22:11 2010 +0000 @@ -808,7 +808,7 @@ msgid "Waiting for transfer to begin" msgstr "در حال انتظار برای آغاز انتقال" -msgid "Canceled" +msgid "Cancelled" msgstr "صرف نظر شد" msgid "Failed" @@ -16683,7 +16683,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "نمی‌توان %s را برای نوشتن باز کرد!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "انتقال پرونده شکست خورد؛ احتمالاً طرف دیگر انصراف داده است." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/fi.po --- a/po/fi.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/fi.po Mon Aug 23 05:22:11 2010 +0000 @@ -802,7 +802,7 @@ msgid "Waiting for transfer to begin" msgstr "Odotetaan lähetyksen alkamista" -msgid "Canceled" +msgid "Cancelled" msgstr "Peruutettu" msgid "Failed" @@ -16262,7 +16262,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "%s:n avaaminen kirjoitusta varten epäonnistui!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "Tiedostonsiirto epäonnistui. Toinen osapuoli luultavasti katkaisi siirron." @@ -17459,7 +17459,7 @@ #~ msgid "Your request to send file[%s] has been rejected by buddy[%d]" #~ msgstr "Pyyntösi lähettää tiedosto (%s) one evätty tuttavan (%d) toimesta" -#~ msgid "The sending process of file[%s] has been canceled by buddy[%d]" +#~ msgid "The sending process of file[%s] has been cancelled by buddy[%d]" #~ msgstr "Tiedoston (%s) lähetys on peruutettu tuttavan (%d) toimesta" #~ msgid "Blink tray icon for unread..." diff -r cc75490da0e3 -r d487a2adc3a6 po/fr.po --- a/po/fr.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/fr.po Mon Aug 23 05:22:11 2010 +0000 @@ -821,7 +821,7 @@ msgid "Waiting for transfer to begin" msgstr "En attente de début de transfert" -msgid "Canceled" +msgid "Cancelled" msgstr "Annulé" msgid "Failed" @@ -16009,7 +16009,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Impossible d'ouvrir %s pour l'écriture" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "Échec du transfert de fichier. Annulation probable du correspondant." diff -r cc75490da0e3 -r d487a2adc3a6 po/ga.po --- a/po/ga.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ga.po Mon Aug 23 05:22:11 2010 +0000 @@ -750,7 +750,7 @@ msgstr "" #, fuzzy -msgid "Canceled" +msgid "Cancelled" msgstr "Cealaithe" #, fuzzy diff -r cc75490da0e3 -r d487a2adc3a6 po/gl.po --- a/po/gl.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/gl.po Mon Aug 23 05:22:11 2010 +0000 @@ -807,7 +807,7 @@ msgid "Waiting for transfer to begin" msgstr "Agardando o comezo da transferencia" -msgid "Canceled" +msgid "Cancelled" msgstr "Cancelado" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/gu.po --- a/po/gu.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/gu.po Mon Aug 23 05:22:11 2010 +0000 @@ -789,7 +789,7 @@ msgid "Waiting for transfer to begin" msgstr "પરિવહન શરૂ થવા માટે રાહ જોઈ રહ્યા છીએ" -msgid "Canceled" +msgid "Cancelled" msgstr "રદ થયેલ" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/he.po --- a/po/he.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/he.po Mon Aug 23 05:22:11 2010 +0000 @@ -781,7 +781,7 @@ msgid "Waiting for transfer to begin" msgstr "ממתין להעברה להתחיל" -msgid "Canceled" +msgid "Cancelled" msgstr "בוטל" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/hi.po --- a/po/hi.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/hi.po Mon Aug 23 05:22:11 2010 +0000 @@ -780,7 +780,7 @@ msgid "Waiting for transfer to begin" msgstr "हस्तांतरण के शुरु होने की प्रतीक्षा करता है." -msgid "Canceled" +msgid "Cancelled" msgstr "रद्द" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/hu.po --- a/po/hu.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/hu.po Mon Aug 23 05:22:11 2010 +0000 @@ -804,7 +804,7 @@ msgid "Waiting for transfer to begin" msgstr "Várakozás az átvitel indulására" -msgid "Canceled" +msgid "Cancelled" msgstr "Megszakítva" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/hy.po --- a/po/hy.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/hy.po Mon Aug 23 05:22:11 2010 +0000 @@ -755,7 +755,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/id.po --- a/po/id.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/id.po Mon Aug 23 05:22:11 2010 +0000 @@ -815,7 +815,7 @@ msgid "Waiting for transfer to begin" msgstr "Menunggu transfer untuk mulai" -msgid "Canceled" +msgid "Cancelled" msgstr "Dibatalkan" msgid "Failed" @@ -16769,7 +16769,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "%s tidak dapat dibuka untuk penulisan!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "Transfer file gagal; sisi lainnya kemungkinan membatalkan." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/it.po --- a/po/it.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/it.po Mon Aug 23 05:22:11 2010 +0000 @@ -808,7 +808,7 @@ msgid "Waiting for transfer to begin" msgstr "In attesa dell'inizio del trasferimento" -msgid "Canceled" +msgid "Cancelled" msgstr "Annullato" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/ja.po --- a/po/ja.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ja.po Mon Aug 23 05:22:11 2010 +0000 @@ -808,7 +808,7 @@ msgid "Waiting for transfer to begin" msgstr "転送開始を待っています" -msgid "Canceled" +msgid "Cancelled" msgstr "キャンセルしました" msgid "Failed" @@ -16759,7 +16759,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "書き込みモードで %s を開けません！" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "ファイル転送が失敗しました。おそらく向こう側がキャンセルしたのでしょう。" diff -r cc75490da0e3 -r d487a2adc3a6 po/ka.po --- a/po/ka.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ka.po Mon Aug 23 05:22:11 2010 +0000 @@ -807,7 +807,7 @@ msgid "Waiting for transfer to begin" msgstr "ველოდები გადატანის დაწყებას" -msgid "Canceled" +msgid "Cancelled" msgstr "გაუქმებულია" #, fuzzy diff -r cc75490da0e3 -r d487a2adc3a6 po/km.po --- a/po/km.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/km.po Mon Aug 23 05:22:11 2010 +0000 @@ -777,7 +777,7 @@ msgid "Waiting for transfer to begin" msgstr "រង់ចាំ​ការ​ផ្ទេរ​ចាប់ផ្ដើម" -msgid "Canceled" +msgid "Cancelled" msgstr "បានបោះបង់" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/kn.po --- a/po/kn.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/kn.po Mon Aug 23 05:22:11 2010 +0000 @@ -802,7 +802,7 @@ msgid "Waiting for transfer to begin" msgstr "ವರ್ಗಾವಣೆಯ ಪ್ರಾರಂಭಕ್ಕಾಗಿ ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ" -msgid "Canceled" +msgid "Cancelled" msgstr "ರದ್ದಾಗಿದೆ" msgid "Failed" @@ -15930,7 +15930,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "ಬರೆಯುವದಕ್ಕಾಗಿ %s ತೆರೆಯಲು ಆಗಲಿಲ್ಲ" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "ಕಡತ ವರ್ಗಾವಣೆ ವಿಫಲ ; ಬಹುಶ: ಆಚೆಯವರು ರದ್ದು ಮಾಡಿದರು" #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/ko.po --- a/po/ko.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ko.po Mon Aug 23 05:22:11 2010 +0000 @@ -816,7 +816,7 @@ msgid "Waiting for transfer to begin" msgstr "전송 시작을 기다리고 있습니다." -msgid "Canceled" +msgid "Cancelled" msgstr "취소되었습니다." msgid "Failed" @@ -16691,7 +16691,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "쓰기 모드에서 %s 을(를) 열 수 없습니다!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "파일 전송에 실패했습니다. 아마도 상대측에서 취소한 것 같습니다." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/ku.po --- a/po/ku.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ku.po Mon Aug 23 05:22:11 2010 +0000 @@ -828,7 +828,7 @@ msgid "Waiting for transfer to begin" msgstr "Li benda destpêkirina transferê ye" -msgid "Canceled" +msgid "Cancelled" msgstr "Hate Betalkirin" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/lo.po --- a/po/lo.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/lo.po Mon Aug 23 05:22:11 2010 +0000 @@ -744,7 +744,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/lt.po --- a/po/lt.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/lt.po Mon Aug 23 05:22:11 2010 +0000 @@ -826,7 +826,7 @@ msgid "Waiting for transfer to begin" msgstr "Laukiama perdavimo pradžios" -msgid "Canceled" +msgid "Cancelled" msgstr "Atšaukta" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/mk.po --- a/po/mk.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/mk.po Mon Aug 23 05:22:11 2010 +0000 @@ -806,7 +806,7 @@ msgid "Waiting for transfer to begin" msgstr "Чекам да започне преносот" -msgid "Canceled" +msgid "Cancelled" msgstr "Откажано" msgid "Failed" @@ -16667,7 +16667,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Не можам да ја отворам %s за запишување!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "Размената на датотека не успеа. Другата страна веројатно откажа." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/ml.po --- a/po/ml.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ml.po Mon Aug 23 05:22:11 2010 +0000 @@ -788,7 +788,7 @@ msgid "Waiting for transfer to begin" msgstr "ഇടപാടു് ആരംഭിക്കുന്നതിനായി കാത്തിരിക്കുന്നു" -msgid "Canceled" +msgid "Cancelled" msgstr "റദ്ദാക്കിയിരിക്കുന്നു" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/mn.po --- a/po/mn.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/mn.po Mon Aug 23 05:22:11 2010 +0000 @@ -774,7 +774,7 @@ msgid "Waiting for transfer to begin" msgstr "Файл шилжүүлэлт эхлүүлэхийг хүлээж байна" -msgid "Canceled" +msgid "Cancelled" msgstr "Цуцлагдсан" msgid "Failed" @@ -15602,7 +15602,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Завсар хийхээр %sийг нээж чадсангүй!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "Файл дамжуулалт амжилттгүй боллоо." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/mr.po --- a/po/mr.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/mr.po Mon Aug 23 05:22:11 2010 +0000 @@ -779,7 +779,7 @@ msgid "Waiting for transfer to begin" msgstr "स्थानांतर सुरू करण्याची प्रतिक्षा करत आहे" -msgid "Canceled" +msgid "Cancelled" msgstr "रद्द केले" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/ms_MY.po --- a/po/ms_MY.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ms_MY.po Mon Aug 23 05:22:11 2010 +0000 @@ -741,7 +741,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/my_MM.po --- a/po/my_MM.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/my_MM.po Mon Aug 23 05:22:11 2010 +0000 @@ -834,7 +834,7 @@ msgid "Waiting for transfer to begin" msgstr "Waiting for transfer to begin" -msgid "Canceled" +msgid "Cancelled" msgstr "Cancelled" msgid "Failed" @@ -17057,7 +17057,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Could not open %s for writing!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "File transfer failed; other side probably cancelled." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/nb.po --- a/po/nb.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/nb.po Mon Aug 23 05:22:11 2010 +0000 @@ -803,7 +803,7 @@ msgid "Waiting for transfer to begin" msgstr "Venter på at overføringen skal starte" -msgid "Canceled" +msgid "Cancelled" msgstr "Avbrutt" msgid "Failed" @@ -16208,7 +16208,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Klarte ikke åpne %s for skriving!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "Filoverføringen mislyktes - sannsynligvis avbrutt på den andre siden." diff -r cc75490da0e3 -r d487a2adc3a6 po/ne.po --- a/po/ne.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ne.po Mon Aug 23 05:22:11 2010 +0000 @@ -824,7 +824,7 @@ msgid "Waiting for transfer to begin" msgstr "स्थानान्तरण सुरू गर्नकोलागि पर्खिरहेको" -msgid "Canceled" +msgid "Cancelled" msgstr "रद्द गरियो" msgid "Failed" @@ -17025,7 +17025,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "लेख्नका लागि %s खोल्न सकिदैन!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "फाइल स्थान्तरणमा असफल; अन्य साइड सम्भवत: रद्द गरियो ।" #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/nl.po --- a/po/nl.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/nl.po Mon Aug 23 05:22:11 2010 +0000 @@ -804,7 +804,7 @@ msgid "Waiting for transfer to begin" msgstr "Wacht op starten van overdracht" -msgid "Canceled" +msgid "Cancelled" msgstr "Geannuleerd" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/nn.po --- a/po/nn.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/nn.po Mon Aug 23 05:22:11 2010 +0000 @@ -797,7 +797,7 @@ msgid "Waiting for transfer to begin" msgstr "Ventar på at overføringa skal begynna" -msgid "Canceled" +msgid "Cancelled" msgstr "Avbroten" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/oc.po --- a/po/oc.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/oc.po Mon Aug 23 05:22:11 2010 +0000 @@ -754,7 +754,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "Anullat" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/or.po --- a/po/or.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/or.po Mon Aug 23 05:22:11 2010 +0000 @@ -799,7 +799,7 @@ msgid "Waiting for transfer to begin" msgstr "ସ୍ଥାନାନ୍ତରଣ ଆରମ୍ଭ ହେବାକୁ ଅପେକ୍ଷା କରୁଛି" -msgid "Canceled" +msgid "Cancelled" msgstr "ବାତିଲ କରାଗଲା" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/pa.po --- a/po/pa.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/pa.po Mon Aug 23 05:22:11 2010 +0000 @@ -784,7 +784,7 @@ msgid "Waiting for transfer to begin" msgstr "ਭੇਜਣ ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਉਡੀਕ ਜਾਰੀ" -msgid "Canceled" +msgid "Cancelled" msgstr "ਰੱਦ ਹੈ" msgid "Failed" @@ -15891,7 +15891,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "%s ਨੂੰ ਲਿਖਣ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "ਫਾਇਲ ਸੰਚਾਰ ਅਸਫਲ ਹੈ; ਦੂਜੇ ਪਾਸੇ ਤੋਂ ਰੱਦ ਕੀਤਾ ਗਿਆ ਹੈ।" #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/pl.po --- a/po/pl.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/pl.po Mon Aug 23 05:22:11 2010 +0000 @@ -818,7 +818,7 @@ msgid "Waiting for transfer to begin" msgstr "Oczekiwanie na rozpoczęcie przesyłu" -msgid "Canceled" +msgid "Cancelled" msgstr "Anulowano" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/ps.po --- a/po/ps.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ps.po Mon Aug 23 05:22:11 2010 +0000 @@ -779,7 +779,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "فسخ شوه" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/pt.po --- a/po/pt.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/pt.po Mon Aug 23 05:22:11 2010 +0000 @@ -843,7 +843,7 @@ msgid "Waiting for transfer to begin" msgstr "Esperando que a transferência comece" -msgid "Canceled" +msgid "Cancelled" msgstr "Cancelado" msgid "Failed" @@ -17029,7 +17029,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Não foi possível abrir %s para escrita!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "Tranferência de ficheiro falhou; o outro lado provavelmente cancelou-a." diff -r cc75490da0e3 -r d487a2adc3a6 po/pt_BR.po --- a/po/pt_BR.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/pt_BR.po Mon Aug 23 05:22:11 2010 +0000 @@ -804,7 +804,7 @@ msgid "Waiting for transfer to begin" msgstr "Esperando o começo da transferência" -msgid "Canceled" +msgid "Cancelled" msgstr "Cancelada" msgid "Failed" @@ -16432,7 +16432,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Não foi possível abrir %s para escrita!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "Transferência de arquivo falhou; o outro lado provavelmente cancelou-a." diff -r cc75490da0e3 -r d487a2adc3a6 po/ro.po --- a/po/ro.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ro.po Mon Aug 23 05:22:11 2010 +0000 @@ -807,7 +807,7 @@ msgid "Waiting for transfer to begin" msgstr "Se așteaptă începerea transferului" -msgid "Canceled" +msgid "Cancelled" msgstr "Oprit" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/ru.po --- a/po/ru.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ru.po Mon Aug 23 05:22:11 2010 +0000 @@ -807,7 +807,7 @@ msgid "Waiting for transfer to begin" msgstr "Ожидание начала передачи" -msgid "Canceled" +msgid "Cancelled" msgstr "Отменено" msgid "Failed" @@ -16446,7 +16446,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Не удалось открыть %s для записи!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "Не удалось произвести передачу файлов; вероятно, отменили на той стороне." diff -r cc75490da0e3 -r d487a2adc3a6 po/si.po --- a/po/si.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/si.po Mon Aug 23 05:22:11 2010 +0000 @@ -757,7 +757,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "අහෝසි කරන්න" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/sk.po --- a/po/sk.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/sk.po Mon Aug 23 05:22:11 2010 +0000 @@ -803,7 +803,7 @@ msgid "Waiting for transfer to begin" msgstr "Čaká sa na začiatok prenosu" -msgid "Canceled" +msgid "Cancelled" msgstr "Zrušené" msgid "Failed" @@ -16124,7 +16124,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Nepodarilo sa otvoriť %s pre zápis!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "Prenos súboru zlyhal; druhá strana ho asi zrušila." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/sl.po --- a/po/sl.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/sl.po Mon Aug 23 05:22:11 2010 +0000 @@ -812,7 +812,7 @@ msgid "Waiting for transfer to begin" msgstr "Čakanje na začetek prenosa" -msgid "Canceled" +msgid "Cancelled" msgstr "Preklicano" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/sq.po --- a/po/sq.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/sq.po Mon Aug 23 05:22:11 2010 +0000 @@ -814,7 +814,7 @@ msgid "Waiting for transfer to begin" msgstr "Po pritet të fillojë shpërngulja" -msgid "Canceled" +msgid "Cancelled" msgstr "Anuluar" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/sr.po --- a/po/sr.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/sr.po Mon Aug 23 05:22:11 2010 +0000 @@ -791,7 +791,7 @@ msgid "Waiting for transfer to begin" msgstr "Чекам да пренос почне" -msgid "Canceled" +msgid "Cancelled" msgstr "Откажи" msgid "Failed" @@ -16453,7 +16453,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Не могу да отворим %s за упис!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "Неуспешан пренос датотеке; друга страна је вероватно отказала." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/sr@latin.po --- a/po/sr@latin.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/sr@latin.po Mon Aug 23 05:22:11 2010 +0000 @@ -792,7 +792,7 @@ msgid "Waiting for transfer to begin" msgstr "Čekam da prenos počne" -msgid "Canceled" +msgid "Cancelled" msgstr "Otkaži" msgid "Failed" @@ -16471,7 +16471,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Ne mogu da otvorim %s za upis!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "Neuspešan prenos datoteke; druga strana je verovatno otkazala." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/sv.po --- a/po/sv.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/sv.po Mon Aug 23 05:22:11 2010 +0000 @@ -797,7 +797,7 @@ msgid "Waiting for transfer to begin" msgstr "Väntar på att överföringen ska inledas" -msgid "Canceled" +msgid "Cancelled" msgstr "Avbruten" msgid "Failed" @@ -16135,7 +16135,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Kunde inte öppna %s för läsning!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "Filöverföringen misslyckades, antagligen eftersom andra sidan avbröt." diff -r cc75490da0e3 -r d487a2adc3a6 po/sw.po --- a/po/sw.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/sw.po Mon Aug 23 05:22:11 2010 +0000 @@ -784,7 +784,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "Imeghairishwa" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/ta.po --- a/po/ta.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ta.po Mon Aug 23 05:22:11 2010 +0000 @@ -795,7 +795,7 @@ msgid "Waiting for transfer to begin" msgstr "பரிமாற்றம் ஆரம்பமாவதற்காக காத்திருக்கிறது" -msgid "Canceled" +msgid "Cancelled" msgstr "தவிர்க்கப்பட்டது" msgid "Failed" @@ -16101,7 +16101,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "%s யை எழுதுவதற்காக திறக்கமுடியவில்லை!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "கோப்பு அனுப்புதலில் பிழை; ஒருவேளை மறுபக்கத்தில் தவிர்த்திருக்கலாம்." #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/te.po --- a/po/te.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/te.po Mon Aug 23 05:22:11 2010 +0000 @@ -787,7 +787,7 @@ msgid "Waiting for transfer to begin" msgstr "ప్రారంభించడానికి బదిలీ కోసం నిరీక్షణ " -msgid "Canceled" +msgid "Cancelled" msgstr "రద్దుచేయి" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/th.po --- a/po/th.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/th.po Mon Aug 23 05:22:11 2010 +0000 @@ -804,7 +804,7 @@ msgid "Waiting for transfer to begin" msgstr "กำลังรอการรับส่งแฟ้ม" -msgid "Canceled" +msgid "Cancelled" msgstr "ยกเลิก" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/tr.po --- a/po/tr.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/tr.po Mon Aug 23 05:22:11 2010 +0000 @@ -805,7 +805,7 @@ msgid "Waiting for transfer to begin" msgstr "Aktarımın başlaması bekleniyor" -msgid "Canceled" +msgid "Cancelled" msgstr "İptal Edildi" msgid "Failed" @@ -16367,7 +16367,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "%s yazma için açılamıyor!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "Dosya transferi gerçekleştirilemedi; karşı taraf iptal etmiş olabilir." diff -r cc75490da0e3 -r d487a2adc3a6 po/uk.po --- a/po/uk.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/uk.po Mon Aug 23 05:22:11 2010 +0000 @@ -809,7 +809,7 @@ msgid "Waiting for transfer to begin" msgstr "Очікування початку передачі" -msgid "Canceled" +msgid "Cancelled" msgstr "Скасовано" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/ur.po --- a/po/ur.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/ur.po Mon Aug 23 05:22:11 2010 +0000 @@ -815,7 +815,7 @@ msgid "Waiting for transfer to begin" msgstr "ٹرانسفر ہونے کے لئے انتظار کررہا ہے" -msgid "Canceled" +msgid "Cancelled" msgstr " منسوخ کیا گیا" msgid "Failed" @@ -16800,7 +16800,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "لکھنے کے لئے %s کھول نہیں سکا!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "فائل ٹرانسفر ناکام ہوا؛یا ممکن ہے دوسری حانب منسوخ ہوا ہے۔" #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/vi.po --- a/po/vi.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/vi.po Mon Aug 23 05:22:11 2010 +0000 @@ -805,7 +805,7 @@ msgid "Waiting for transfer to begin" msgstr "Đợi bắt đầu truyền" -msgid "Canceled" +msgid "Cancelled" msgstr "Bị thôi" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/xh.po --- a/po/xh.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/xh.po Mon Aug 23 05:22:11 2010 +0000 @@ -843,7 +843,7 @@ msgid "Waiting for transfer to begin" msgstr "Ulindele ukuba ukudlulisa kuqalise" -msgid "Canceled" +msgid "Cancelled" msgstr "IRhoxisiwe" msgid "Failed" @@ -17192,7 +17192,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "Akukwazekanga ukuvula i-%s malunga nokubhala!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "" #~ "Ukudluliswa kwefayili akuphumelelanga; mhlawumbi elinye icala licinyiwe." diff -r cc75490da0e3 -r d487a2adc3a6 po/zh_CN.po --- a/po/zh_CN.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/zh_CN.po Mon Aug 23 05:22:11 2010 +0000 @@ -777,7 +777,7 @@ msgid "Waiting for transfer to begin" msgstr "正在等待传送开始" -msgid "Canceled" +msgid "Cancelled" msgstr "已取消" msgid "Failed" @@ -15530,7 +15530,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "无法打开 %s 写入！" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "文件传送失败；可能其中一端取消了传送。" #~ msgid "Could not connect for transfer." diff -r cc75490da0e3 -r d487a2adc3a6 po/zh_HK.po --- a/po/zh_HK.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/zh_HK.po Mon Aug 23 05:22:11 2010 +0000 @@ -868,7 +868,7 @@ msgid "Waiting for transfer to begin" msgstr "等待開始傳輸檔案中..." -msgid "Canceled" +msgid "Cancelled" msgstr "已取消" msgid "Failed" diff -r cc75490da0e3 -r d487a2adc3a6 po/zh_TW.po --- a/po/zh_TW.po Mon Aug 23 01:18:12 2010 +0000 +++ b/po/zh_TW.po Mon Aug 23 05:22:11 2010 +0000 @@ -866,7 +866,7 @@ msgid "Waiting for transfer to begin" msgstr "等待開始傳輸檔案中..." -msgid "Canceled" +msgid "Cancelled" msgstr "已取消" msgid "Failed"