From e5fdf578cdb1c1dc185505bc6ec39de9339a188b Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Mon, 28 Jun 2010 11:15:21 -0400
Subject: [PATCH] [#960] Add missing line in configure.ac
---
sflphone-common/configure.ac | 1 +
sflphone-common/src/sip/im/InstantMessaging.cpp | 6 ++++++
sflphone-common/src/sip/im/InstantMessaging.h | 5 +++++
sflphone-common/src/sip/sipvoiplink.cpp | 8 +++++++-
4 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index 1149007f87..c7a0bcb4c2 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -52,6 +52,7 @@ AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([src/Makefile \
src/sip/Makefile \
+ src/sip/im/Makefile \
src/iax/Makefile \
src/audio/Makefile \
src/audio/audiortp/Makefile \
diff --git a/sflphone-common/src/sip/im/InstantMessaging.cpp b/sflphone-common/src/sip/im/InstantMessaging.cpp
index d3d75d8c96..1a5a0a723e 100644
--- a/sflphone-common/src/sip/im/InstantMessaging.cpp
+++ b/sflphone-common/src/sip/im/InstantMessaging.cpp
@@ -10,6 +10,12 @@ namespace sfl {
delete _current_dlg; _current_dlg = 0;
}
+ pj_status_t InstantMessaging::init () {
+
+
+
+ }
+
void InstantMessaging::set_text( std::string message ){
_message = pj_str((char*)message.c_str());
diff --git a/sflphone-common/src/sip/im/InstantMessaging.h b/sflphone-common/src/sip/im/InstantMessaging.h
index 9266dc588c..e4df00bdc7 100644
--- a/sflphone-common/src/sip/im/InstantMessaging.h
+++ b/sflphone-common/src/sip/im/InstantMessaging.h
@@ -31,6 +31,11 @@ namespace sfl {
*/
~InstantMessaging();
+ /*
+ * Register and initialize instant messaging support
+ */
+ pj_status_t init ();
+
/*
* Attach the instant messaging module to an existing SIP dialog
*
diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index 6629447a0f..7a0cf23dbe 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -2010,13 +2010,19 @@ bool SIPVoIPLink::pjsip_init()
_debug ("UserAgent: VOIP callbacks initialized");
// Add endpoint capabilities (INFO, OPTIONS, etc) for this UA
- pj_str_t allowed[] = { { (char*) "INFO", 4}, { (char*) "REGISTER", 8}, { (char*) "OPTIONS", 7} }; // //{"INVITE", 6}, {"ACK",3}, {"BYE",3}, {"CANCEL",6}
+ pj_str_t allowed[] = { { (char*) "INFO", 4}, { (char*) "REGISTER", 8}, { (char*) "OPTIONS", 7}, { (char*) "MESSAGE", 7 } }; // //{"INVITE", 6}, {"ACK",3}, {"BYE",3}, {"CANCEL",6}
accepted = pj_str ( (char*) "application/sdp");
// Register supported methods
pjsip_endpt_add_capability (_endpt, &_mod_ua, PJSIP_H_ALLOW, NULL, PJ_ARRAY_SIZE (allowed), allowed);
+ const pj_str_t STR_MIME_TEXT_PLAIN = { (char*) "text/plain", 10 };
+ pjsip_endpt_add_capability (_endpt, &_mod_ua, PJSIP_H_ACCEPT, NULL, 1, &STR_MIME_TEXT_PLAIN);
+
+ // Registering and initializing IM module
+ // imModule->init ();
+
// Register "application/sdp" in ACCEPT header
pjsip_endpt_add_capability (_endpt, &_mod_ua, PJSIP_H_ACCEPT, NULL, 1, &accepted);
--
GitLab