Mercurial > pidgin
view libpurple/protocols/msn/slpmsg.h @ 30432:1cdae196aac8
Standardize on "cancelled".
QuLogic: so, canceled or cancelled? that patch on #12130 is pretty thorough...
wabz: cancelled :D
wabz: that cancelled thing actually bothered me in the past
wabz: never quite enough to do such a patch :p
elb: that's an en_US vs en_GB thing
elb: both are correct, but canceled is more common in en_{US,CA} and cancelled in en_{GB,AU,NZ,etc.}
elb: personally, I use cancelled
QuLogic: yea, that's what I went for before, but I think I couldn't change any strings because we were frozen
QuLogic: you all had to pick the spelling that was opposite from the guy's patch, didn't you...
rekkanoryo: well, considering we're generally en_US in our strings, it should be canceled in our source
elb: considering they're both correct, and while I'm anal retentive, I'm not anal retentive about that, I have no preference ;-)
rekkanoryo: I don't really care either way, I just think that we should be consistently en_US or en_GB throughout
elb: right
elb: my point is, they're both correct for en_US
elb: one 'l' is simply more common
rekkanoryo: ah
rekkanoryo: if they're both technically correct for en_US, then "cancelled" is my vote
rekkanoryo: one 'l' always looks wrong to me
elb: the dictionary claims they are
Sorry, dwc.
Closes #12130.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 23 Aug 2010 01:41:31 +0000 |
parents | 69077f3993f6 |
children | b98d1ca8422d |
line wrap: on
line source
/** * @file slpmsg.h SLP Message functions * * purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_SLPMSG_H_ #define _MSN_SLPMSG_H_ typedef struct _MsnSlpMessage MsnSlpMessage; #include "imgstore.h" #include "slpcall.h" #include "slplink.h" #include "session.h" #include "msg.h" #include "slp.h" /** * A SLP Message This contains everything that we will need to send a SLP * Message even if has to be sent in several parts. */ struct _MsnSlpMessage { MsnSlpCall *slpcall; /**< The slpcall to which this slp message belongs (if applicable). */ MsnSlpLink *slplink; /**< The slplink through which this slp message is being sent. */ MsnSession *session; long session_id; long id; long ack_id; long ack_sub_id; long long ack_size; gboolean sip; /**< A flag that states if this is a SIP slp message. */ long flags; gboolean ft; PurpleStoredImage *img; guchar *buffer; /** * For outgoing messages this is the number of bytes from buffer that * have already been sent out. For incoming messages this is the * number of bytes that have been written to buffer. */ long long offset; /** * This is the size of buffer, unless this is an outgoing file transfer, * in which case this is the size of the file. */ long long size; GList *msgs; /**< The real messages. */ #if 1 MsnMessage *msg; /**< The temporary real message that will be sent. */ #endif const char *info; gboolean text_body; }; /** * Creates a new slp message * * @param slplink The slplink through which this slp message will be sent. * @return The created slp message. */ MsnSlpMessage *msn_slpmsg_new(MsnSlpLink *slplink); /** * Destroys a slp message * * @param slpmsg The slp message to destory. */ void msn_slpmsg_destroy(MsnSlpMessage *slpmsg); void msn_slpmsg_set_body(MsnSlpMessage *slpmsg, const char *body, long long size); void msn_slpmsg_set_image(MsnSlpMessage *slpmsg, PurpleStoredImage *img); void msn_slpmsg_open_file(MsnSlpMessage *slpmsg, const char *file_name); MsnSlpMessage * msn_slpmsg_sip_new(MsnSlpCall *slpcall, int cseq, const char *header, const char *branch, const char *content_type, const char *content); void msn_slpmsg_show(MsnMessage *msg); #endif /* _MSN_SLPMSG_H_ */