Mercurial > pidgin.yaz
view libpurple/protocols/simple/simple.h @ 30865: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 | 5295c7f113da |
children | 08dcd2d4f0b7 |
line wrap: on
line source
/** * @file simple.h * * purple * * Copyright (C) 2005, Thomas Butter <butter@uni-mannheim.de> * * 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 _PURPLE_SIMPLE_H #define _PURPLE_SIMPLE_H #include <glib.h> #include <time.h> #include "cipher.h" #include "circbuffer.h" #include "dnsquery.h" #include "dnssrv.h" #include "network.h" #include "proxy.h" #include "prpl.h" #include "sipmsg.h" #define SIMPLE_BUF_INC 1024 #define SIMPLE_REGISTER_RETRY_MAX 2 #define SIMPLE_REGISTER_SENT 1 #define SIMPLE_REGISTER_RETRY 2 #define SIMPLE_REGISTER_COMPLETE 3 #define PUBLISH_EXPIRATION 600 #define SUBSCRIBE_EXPIRATION 1200 struct sip_dialog { gchar *ourtag; gchar *theirtag; gchar *callid; }; struct simple_watcher { gchar *name; time_t expire; struct sip_dialog dialog; gboolean needsxpidf; }; struct simple_buddy { gchar *name; time_t resubscribe; struct sip_dialog *dialog; }; struct sip_auth { int type; /* 1 = Digest / 2 = NTLM */ gchar *nonce; gchar *opaque; gchar *realm; gchar *target; guint32 flags; int nc; gchar *digest_session_key; int retries; }; struct simple_account_data { PurpleConnection *gc; gchar *servername; gchar *username; gchar *password; PurpleDnsQueryData *query_data; PurpleSrvQueryData *srv_query_data; PurpleNetworkListenData *listen_data; int fd; int cseq; time_t reregister; time_t republish; int registerstatus; /* 0 nothing, 1 first registration send, 2 auth received, 3 registered */ struct sip_auth registrar; struct sip_auth proxy; int listenfd; int listenport; int listenpa; gchar *status; GHashTable *buddies; guint registertimeout; guint resendtimeout; gboolean connecting; PurpleAccount *account; PurpleCircBuffer *txbuf; guint tx_handler; gchar *regcallid; GSList *transactions; GSList *watcher; GSList *openconns; gboolean udp; struct sockaddr_in serveraddr; int registerexpire; gchar *realhostname; int realport; /* port and hostname from SRV record */ gchar *publish_etag; }; struct sip_connection { int fd; gchar *inbuf; int inbuflen; int inbufused; int inputhandler; }; struct transaction; typedef gboolean (*TransCallback) (struct simple_account_data *, struct sipmsg *, struct transaction *); struct transaction { time_t time; int retries; int transport; /* 0 = tcp, 1 = udp */ int fd; const gchar *cseq; struct sipmsg *msg; TransCallback callback; }; #endif /* _PURPLE_SIMPLE_H */