Changeset 198 for pjproject/trunk/pjsip/src

Timestamp:

Feb 19, 2006 2:24:27 AM (19 years ago)

Author:

bennylp

Message:

Fixing Makefiles for the new pjmedia-codec and pjsip-simple libraries

Location:

pjproject/trunk/pjsip/src/pjsip-simple

Files:

• errno.c (added)
• evsub.c (modified) (2 diffs)
• presence.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

@@ -569 +569 @@
     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;
@@ -965 +961 @@
     /* Fill up the header */
     switch (state) {
+    case PJSIP_EVSUB_STATE_NULL:
     case PJSIP_EVSUB_STATE_SENT:
     case PJSIP_EVSUB_STATE_ACCEPTED:

pjproject/trunk/pjsip/src/pjsip-simple/presence.c

@@ -833 +833 @@
         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