Mercurial > pidgin
changeset 8910:26c9b8761707
[gaim-migrate @ 9680]
a patch from wing to fix some grammer and puctuation (but not my spelling),
and some white space
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sun, 09 May 2004 04:06:58 +0000 |
| parents | 87e171358001 |
| children | 35b68d76cb4c |
| files | src/protocols/silc/buddy.c src/protocols/silc/ft.c src/protocols/silc/ops.c src/protocols/silc/util.c src/sha.c |
| diffstat | 5 files changed, 14 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/silc/buddy.c Sun May 09 01:39:42 2004 +0000 +++ b/src/protocols/silc/buddy.c Sun May 09 04:06:58 2004 +0000 @@ -145,7 +145,7 @@ SilcGaim sg = gc->proto_data; SilcClientEntry *clients; SilcUInt32 clients_count; - char *local_ip = NULL, *remote_ip = NULL;; + char *local_ip = NULL, *remote_ip = NULL; gboolean local = TRUE; char *nickname; SilcGaimKeyAgr a; @@ -684,8 +684,8 @@ g_snprintf(tmp, sizeof(tmp), _("The %s buddy is not trusted"), r->b->name); gaim_notify_error(r->client->application, _("Add Buddy"), tmp, - _("You cannot receive buddy notifications untill you " - "import its public key. You can use the Get Public Key " + _("You cannot receive buddy notifications until you " + "import his/her public key. You can use the Get Public Key " "command to get the public key.")); gaim_blist_update_buddy_presence(r->b, GAIM_BUDDY_OFFLINE); } @@ -987,7 +987,7 @@ g_snprintf(tmp, sizeof(tmp), _("The %s buddy is not present in the network"), r->b->name); gaim_request_action(NULL, _("Add Buddy"), tmp, - _("To add the buddy you must import its public key. " + _("To add the buddy you must import his/her public key. " "Press Import to import a public key."), 0, r, 2, _("Cancel"), G_CALLBACK(silcgaim_add_buddy_ask_pk_cb), _("Import..."), G_CALLBACK(silcgaim_add_buddy_ask_pk_cb));
--- a/src/protocols/silc/ft.c Sun May 09 01:39:42 2004 +0000 +++ b/src/protocols/silc/ft.c Sun May 09 04:06:58 2004 +0000 @@ -289,7 +289,7 @@ { SilcGaimXfer xfer = x->data; const char *name; - char *local_ip = NULL, *remote_ip = NULL;; + char *local_ip = NULL, *remote_ip = NULL; gboolean local = TRUE; name = gaim_xfer_get_local_filename(x);
--- a/src/protocols/silc/ops.c Sun May 09 01:39:42 2004 +0000 +++ b/src/protocols/silc/ops.c Sun May 09 04:06:58 2004 +0000 @@ -1200,7 +1200,7 @@ case SILC_CLIENT_CONN_ERROR_RESUME: gaim_connection_error(gc, - _("Resuming detached session failed." + _("Resuming detached session failed. " "Press Reconnect to create new connection.")); unlink(silcgaim_session_file(gaim_account_get_username(sg->account))); break;
--- a/src/protocols/silc/util.c Sun May 09 01:39:42 2004 +0000 +++ b/src/protocols/silc/util.c Sun May 09 04:06:58 2004 +0000 @@ -48,9 +48,10 @@ return TRUE; } else if (!strncmp(ip, "172.", 4) && strlen(ip) > 6) { char tmp[3]; + int s; memset(tmp, 0, sizeof(tmp)); strncpy(tmp, ip + 4, 2); - int s = atoi(tmp); + s = atoi(tmp); if (s >= 16 && s <= 31) return TRUE; } else if (!strncmp(ip, "192.168.", 8)) {
--- a/src/sha.c Sun May 09 01:39:42 2004 +0000 +++ b/src/sha.c Sun May 09 04:06:58 2004 +0000 @@ -1,21 +1,21 @@ -/* +/* * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.mozilla.org/MPL/ - * + * * Software distributed under the License is distributed on an "AS * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. - * + * * The Original Code is SHA 180-1 Reference Implementation (Compact version) - * + * * The Initial Developer of the Original Code is Paul Kocher of - * Cryptography Research. Portions created by Paul Kocher are + * Cryptography Research. Portions created by Paul Kocher are * Copyright (C) 1995-9 by Cryptography Research, Inc. All * Rights Reserved. - * + * * Contributor(s): * */