diff options
| author | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-16 09:40:22 +0000 |
|---|---|---|
| committer | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-16 09:40:22 +0000 |
| commit | acb1af85d744f644f80316d74d4332dbd34295e0 (patch) | |
| tree | 862c3f537f99fbf9015c37a332aa4da304389935 /channels | |
| parent | f7c7e2e31b35be15c8e45cf78c921dfa707d5f36 (diff) | |
Merged revisions 175952 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r175952 | mvanbaak | 2009-02-16 01:26:59 +0100 (Mon, 16 Feb 2009) | 10 lines
Merged revisions 175921 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r175921 | mvanbaak | 2009-02-16 00:37:03 +0100 (Mon, 16 Feb 2009) | 3 lines
fix mis-spelling of the word registered.
Reported by De_Mon on #asterisk-dev.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@176022 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 4 | ||||
| -rw-r--r-- | channels/chan_unistim.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 053942b78..36c14fd5e 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -363,7 +363,7 @@ enum check_auth_result { /*! \brief States for outbound registrations (with register= lines in sip.conf */ enum sipregistrystate { - REG_STATE_UNREGISTERED = 0, /*!< We are not registred + REG_STATE_UNREGISTERED = 0, /*!< We are not registered * \note Initial state. We should have a timeout scheduled for the initial * (or next) registration transmission, calling sip_reregister */ @@ -20047,7 +20047,7 @@ static struct ast_channel *sip_request_call(const char *type, int format, void * */ if (create_addr(p, host)) { *cause = AST_CAUSE_UNREGISTERED; - ast_debug(3, "Cant create SIP call - target device not registred\n"); + ast_debug(3, "Cant create SIP call - target device not registered\n"); sip_destroy(p); return NULL; } diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 83fd936dc..b743159a7 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -1111,7 +1111,7 @@ static void close_client(struct unistimsession *s) cur = cur->next; } if (cur) { /* Session found ? */ - if (cur->device) { /* This session was registred ? */ + if (cur->device) { /* This session was registered ? */ s->state = STATE_CLEANING; if (unistimdebug) ast_verb(0, "close_client session %p device %p lines %p sub %p\n", @@ -3318,7 +3318,7 @@ static void init_phone_step2(struct unistimsession *pte) for (i = 1; i < 6; i++) send_favorite(i, 0, pte, ""); send_text(TEXT_LINE0, TEXT_NORMAL, pte, "Sorry, this phone is not"); - send_text(TEXT_LINE1, TEXT_NORMAL, pte, "registred in unistim.cfg"); + send_text(TEXT_LINE1, TEXT_NORMAL, pte, "registered in unistim.cfg"); strcpy(tmp, "MAC = "); strcat(tmp, pte->macaddr); send_text(TEXT_LINE2, TEXT_NORMAL, pte, tmp); @@ -3413,7 +3413,7 @@ static void process_request(int size, unsigned char *buf, struct unistimsession if (memcmp(buf + SIZE_HEADER, packet_recv_pick_up, sizeof(packet_recv_pick_up)) == 0) { if (unistimdebug) ast_verb(0, "Handset off hook\n"); - if (!pte->device) /* We are not yet registred (asking for a TN in AUTOPROVISIONING_TN) */ + if (!pte->device) /* We are not yet registered (asking for a TN in AUTOPROVISIONING_TN) */ return; pte->device->receiver_state = STATE_OFFHOOK; if (pte->device->output == OUTPUT_HEADPHONE) |