Mercurial > pidgin
view src/protocols/simple/simple.h @ 13545:cfc2f7fcb3dd
[gaim-migrate @ 15922]
Way more changes that I initially thought I was going to make. I apologize
for the commit message spam. These changes bring a lot of consistency to
our capitalization and punctuation, especially of words like "e-mail".
For reference, I've used these rules (after discussing in #gaim):
e-mail, a case of two words joined:
"e-mail" - in the middle of a sentence caps context
"E-mail" - start of text in a sentence caps context
"E-Mail" - in a header (title) caps context
re-enable, a single word, would be:
"re-enable", "Re-enable", and "Re-enable" (respectively)
The reason this changeset exploded is that, as I went through and verified
these changes, I realized we were using improper capitalization (e.g. header
instead of sentence) in a number of dialogs. I fixed a number of these
cases before, and this corrects another pile.
This looks like I've made a LOT of work for the translators, but the impact
is significantly mitigated by three factors: 1) Many of these changes use
strings that already exist, or change one string in many places. 2) I've
used sed to correct the .po files where possible. 3) The actual changes
are extremely trivial.
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Tue, 21 Mar 2006 04:32:45 +0000 |
| parents | 33bef17125c2 |
| children | 614c56622453 |
line wrap: on
line source
/** * @file simple.h * * gaim * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _GAIM_SIMPLE_H #define _GAIM_SIMPLE_H #include <glib.h> #include <time.h> #include <cipher.h> #include <gaim_buffer.h> #include <prpl.h> #include "sipmsg.h" #define SIMPLE_BUF_INC 1024 struct sip_dialog { gchar *ourtag; gchar *theirtag; gchar *callid; }; struct simple_watcher { gchar *name; time_t expire; struct sip_dialog dialog; int needsxpidf; }; struct simple_buddy { gchar *name; time_t resubscribe; }; 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 { GaimConnection *gc; gchar *servername; gchar *username; gchar *password; 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; GaimAccount *account; GaimCircBuffer *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 */ }; 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; gchar *cseq; struct sipmsg *msg; TransCallback callback; }; #endif /* _GAIM_SIMPLE_H */
