From 1231f4a4f2b6eba4a86b1ff900852e676716a7ec Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
Date: Mon, 9 Sep 2013 14:27:10 -0400
Subject: [PATCH] * #29736: presence: Rename signals
---
daemon/src/client/dbus/presencemanager-introspec.xml | 5 +++--
daemon/src/client/presencemanager.h | 4 ++--
daemon/src/sip/pres_sub_server.cpp | 2 +-
daemon/src/sip/sippresence.cpp | 6 +++---
daemon/src/sip/sippresence.h | 2 +-
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/daemon/src/client/dbus/presencemanager-introspec.xml b/daemon/src/client/dbus/presencemanager-introspec.xml
index 1e3d8b6824..8e10ef8063 100644
--- a/daemon/src/client/dbus/presencemanager-introspec.xml
+++ b/daemon/src/client/dbus/presencemanager-introspec.xml
@@ -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>
diff --git a/daemon/src/client/presencemanager.h b/daemon/src/client/presencemanager.h
index b3377a599a..349b63dde9 100644
--- a/daemon/src/client/presencemanager.h
+++ b/daemon/src/client/presencemanager.h
@@ -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. */
diff --git a/daemon/src/sip/pres_sub_server.cpp b/daemon/src/sip/pres_sub_server.cpp
index efc8ebd412..9d239a54d1 100644
--- a/daemon/src/sip/pres_sub_server.cpp
+++ b/daemon/src/sip/pres_sub_server.cpp
@@ -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. */
diff --git a/daemon/src/sip/sippresence.cpp b/daemon/src/sip/sippresence.cpp
index 6d9b6236a6..c8ae2b07d8 100644
--- a/daemon/src/sip/sippresence.cpp
+++ b/daemon/src/sip/sippresence.cpp
@@ -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){
diff --git a/daemon/src/sip/sippresence.h b/daemon/src/sip/sippresence.h
index 2a5d170e47..af8e565428 100644
--- a/daemon/src/sip/sippresence.h
+++ b/daemon/src/sip/sippresence.h
@@ -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.
--
GitLab