* #29736: presence: Rename signals

parent 7f8dacd4
......@@ -71,6 +71,7 @@
</annotation>
<arg type="s" name="accountID" direction="in">
</arg>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
<arg type="aa{ss}" name="credentialInformation" direction="out" tp:type="String_String_Map">
<tp:docstring>
List of hashes map with the following key-value pairs:
......@@ -102,7 +103,7 @@
<!-- SIGNALS !-->
<signal name="newPresSubClientNotification" tp:name-for-bindings="newPresSubClientNotification">
<signal name="newClientSubscription" tp:name-for-bindings="newClientSubscription">
<tp:added version="1.3.0"/>
<tp:docstring>
Notify when a registered presence uri presence informations changes
......@@ -124,7 +125,7 @@
</arg>
</signal>
<signal name="newPresSubServerRequest" tp:name-for-bindings="newPresSubServerRequest">
<signal name="newServerSubscriptionRequest" tp:name-for-bindings="newServerSubscriptionRequest">
<tp:added version="1.3.0"/>
<arg type="s" name="buddyUri">
<tp:docstring>
......
......@@ -77,8 +77,8 @@ class PresenceManager
#endif
#ifdef __ANDROID__
void newPresSubClientNotification(const std::string& uri, const std::string& basic, const std::string& note);
void newPresSubServerRequest(const std::string& remote);
void newClientSubscription(const std::string& uri, const std::string& basic, const std::string& note);
void newServerSubscriptionRequest(const std::string& remote);
#endif //__ANDROID__
/* Presence subscription/Notification. */
......
......@@ -154,7 +154,7 @@ pj_bool_t pres_on_rx_subscribe_request(pjsip_rx_data *rdata) {
/* Create a new PresSubServer server and wait for client approve */
PresSubServer *presSubServer = new PresSubServer(pres, sub, remote, dlg);
pjsip_evsub_set_mod_data(sub, pres->getModId(), presSubServer);
pres->reportNewPresSubServerRequest(presSubServer); // Notify the client.
pres->reportnewServerSubscriptionRequest(presSubServer); // Notify the client.
pres->addPresSubServer(presSubServer);
/* Capture the value of Expires header. */
......
......@@ -141,7 +141,7 @@ void SIPPresence::reportPresSubClientNotification(const std::string& uri, pjsip_
const std::string note(status->info[0].rpid.note.ptr,status->info[0].rpid.note.slen);
DEBUG(" Received status of PresSubClient %s: status=%s note=%s",uri.c_str(),(status->info[0].basic_open?"open":"closed"),note.c_str());
/* report status to client signal */
Manager::instance().getClient()->getPresenceManager()->newPresSubClientNotification(uri, status->info[0].basic_open, note);
Manager::instance().getClient()->getPresenceManager()->newClientSubscription(uri, status->info[0].basic_open, note);
}
void SIPPresence::subscribeClient(const std::string& uri, const bool& flag){
......@@ -186,8 +186,8 @@ void SIPPresence::removePresSubClient(PresSubClient *c){
}
void SIPPresence::reportNewPresSubServerRequest(PresSubServer *s){
Manager::instance().getClient()->getPresenceManager()->newPresSubServerRequest(s->remote);
void SIPPresence::reportnewServerSubscriptionRequest(PresSubServer *s){
Manager::instance().getClient()->getPresenceManager()->newServerSubscriptionRequest(s->remote);
}
void SIPPresence::approvePresSubServer(const std::string& uri, const bool& flag){
......
......@@ -175,7 +175,7 @@ public:
* Report new Subscription to the client, waiting for approval.
* @param s PresenceSubcription pointer.
*/
void reportNewPresSubServerRequest(PresSubServer *s);
void reportnewServerSubscriptionRequest(PresSubServer *s);
/**
* IP2IP context.
* Process new subscription based on client decision.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment