diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-02-19 02:24:27 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-02-19 02:24:27 +0000 |
| commit | f5ca7cbda0e310413076dd3323a66da803e2b32c (patch) | |
| tree | eed67de9f2021dfb2e7aa31464bd7870ce7459b7 /pjsip/src/pjsip-simple | |
| parent | 49a3b60593925562cbeb836a5885e034d2f78997 (diff) | |
Fixing Makefiles for the new pjmedia-codec and pjsip-simple libraries
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@198 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsip-simple')
| -rw-r--r-- | pjsip/src/pjsip-simple/errno.c | 20 | ||||
| -rw-r--r-- | pjsip/src/pjsip-simple/evsub.c | 7 | ||||
| -rw-r--r-- | pjsip/src/pjsip-simple/presence.c | 2 |
3 files changed, 23 insertions, 6 deletions
diff --git a/pjsip/src/pjsip-simple/errno.c b/pjsip/src/pjsip-simple/errno.c new file mode 100644 index 00000000..374178e2 --- /dev/null +++ b/pjsip/src/pjsip-simple/errno.c @@ -0,0 +1,20 @@ +/* $Id$ */ +/* + * Copyright (C) 2003-2006 Benny Prijono <benny@prijono.org> + * + * 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 + */ +#include <pjsip-simple/errno.h> + diff --git a/pjsip/src/pjsip-simple/evsub.c b/pjsip/src/pjsip-simple/evsub.c index 30bd8525..c1b8db83 100644 --- a/pjsip/src/pjsip-simple/evsub.c +++ b/pjsip/src/pjsip-simple/evsub.c @@ -568,13 +568,9 @@ static void on_timer( pj_timer_heap_t *timer_heap, case TIMER_TYPE_UAC_TERMINATE: { - pjsip_event event; - pj_str_t reason = { "unsubscribing", 13}; - - PJSIP_EVENT_INIT_TIMER(event, entry); PJ_LOG(5,(sub->obj_name, "Timeout waiting for final NOTIFY. " "Terminating..")); - set_state(sub, PJSIP_EVSUB_STATE_TERMINATED, NULL, &event); + set_state(sub, PJSIP_EVSUB_STATE_TERMINATED, NULL, NULL); } break; @@ -964,6 +960,7 @@ static pjsip_sub_state_hdr* sub_state_create( pj_pool_t *pool, /* Fill up the header */ switch (state) { + case PJSIP_EVSUB_STATE_NULL: case PJSIP_EVSUB_STATE_SENT: case PJSIP_EVSUB_STATE_ACCEPTED: pj_assert(!"Invalid state!"); diff --git a/pjsip/src/pjsip-simple/presence.c b/pjsip/src/pjsip-simple/presence.c index ca033f5b..e87cd451 100644 --- a/pjsip/src/pjsip-simple/presence.c +++ b/pjsip/src/pjsip-simple/presence.c @@ -832,7 +832,7 @@ static void pres_on_evsub_rx_notify( pjsip_evsub *sub, if (pj_stricmp(&ctype_hdr->media.type, &STR_APPLICATION)==0 && pj_stricmp(&ctype_hdr->media.subtype, &STR_XPIDF_XML)==0) { - status = pres_parse_pidf( pres, rdata, &pres->tmp_status); + status = pres_parse_xpidf( pres, rdata, &pres->tmp_status); } else { |