Skip to content
Snippets Groups Projects
Commit 2ebc78ae authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #24789: dbus: hangupCall/Conference returns a boolean

parent 60c143f6
No related branches found
No related tags found
No related merge requests found
...@@ -81,6 +81,11 @@ ...@@ -81,6 +81,11 @@
The callID. The callID.
</tp:docstring> </tp:docstring>
</arg> </arg>
<arg type="b" name="isHungUp" direction="out">
<tp:docstring>
Returns true is the call has been hungup. False otherwise.
</tp:docstring>
</arg>
</method> </method>
<method name="hangUpConference" tp:name-for-bindings="hangUpConference"> <method name="hangUpConference" tp:name-for-bindings="hangUpConference">
...@@ -93,6 +98,11 @@ ...@@ -93,6 +98,11 @@
The unique conference ID. The unique conference ID.
</tp:docstring> </tp:docstring>
</arg> </arg>
<arg type="b" name="isHungUp" direction="out">
<tp:docstring>
Returns true is the conference has been hungup. False otherwise.
</tp:docstring>
</arg>
</method> </method>
<method name="hold" tp:name-for-bindings="hold"> <method name="hold" tp:name-for-bindings="hold">
......
...@@ -96,16 +96,16 @@ CallManager::accept(const std::string& callID) ...@@ -96,16 +96,16 @@ CallManager::accept(const std::string& callID)
Manager::instance().answerCall(callID); Manager::instance().answerCall(callID);
} }
void bool
CallManager::hangUp(const std::string& callID) CallManager::hangUp(const std::string& callID)
{ {
Manager::instance().hangupCall(callID); return Manager::instance().hangupCall(callID);
} }
void bool
CallManager::hangUpConference(const std::string& confID) CallManager::hangUpConference(const std::string& confID)
{ {
Manager::instance().hangupConference(confID); return Manager::instance().hangupConference(confID);
} }
void void
......
...@@ -78,7 +78,7 @@ class CallManager ...@@ -78,7 +78,7 @@ class CallManager
void refuse(const std::string& callID); void refuse(const std::string& callID);
void accept(const std::string& callID); void accept(const std::string& callID);
void hangUp(const std::string& callID); bool hangUp(const std::string& callID);
void hold(const std::string& callID); void hold(const std::string& callID);
void unhold(const std::string& callID); void unhold(const std::string& callID);
void transfer(const std::string& callID, const std::string& to); void transfer(const std::string& callID, const std::string& to);
...@@ -94,7 +94,7 @@ class CallManager ...@@ -94,7 +94,7 @@ class CallManager
void addMainParticipant(const std::string& confID); void addMainParticipant(const std::string& confID);
void detachParticipant(const std::string& callID); void detachParticipant(const std::string& callID);
void joinConference(const std::string& sel_confID, const std::string& drag_confID); void joinConference(const std::string& sel_confID, const std::string& drag_confID);
void hangUpConference(const std::string& confID); bool hangUpConference(const std::string& confID);
void holdConference(const std::string& confID); void holdConference(const std::string& confID);
void unholdConference(const std::string& confID); void unholdConference(const std::string& confID);
std::vector<std::string> getConferenceList(); std::vector<std::string> getConferenceList();
......
...@@ -81,6 +81,11 @@ ...@@ -81,6 +81,11 @@
The callID. The callID.
</tp:docstring> </tp:docstring>
</arg> </arg>
<arg type="b" name="isHungUp" direction="out">
<tp:docstring>
Returns true is the call has been hungup. False otherwise.
</tp:docstring>
</arg>
</method> </method>
<method name="hangUpConference" tp:name-for-bindings="hangUpConference"> <method name="hangUpConference" tp:name-for-bindings="hangUpConference">
...@@ -93,6 +98,11 @@ ...@@ -93,6 +98,11 @@
The unique conference ID. The unique conference ID.
</tp:docstring> </tp:docstring>
</arg> </arg>
<arg type="b" name="isHungUp" direction="out">
<tp:docstring>
Returns true is the conference has been hungup. False otherwise.
</tp:docstring>
</arg>
</method> </method>
<method name="hold" tp:name-for-bindings="hold"> <method name="hold" tp:name-for-bindings="hold">
......
...@@ -972,8 +972,10 @@ dbus_stop_recorded_file_playback(const gchar *filepath) ...@@ -972,8 +972,10 @@ dbus_stop_recorded_file_playback(const gchar *filepath)
} }
static void static void
hang_up_reply_cb(G_GNUC_UNUSED DBusGProxy *proxy, GError *error, G_GNUC_UNUSED gpointer userdata) hang_up_reply_cb(G_GNUC_UNUSED DBusGProxy *proxy, gboolean is_hung_up, GError *error, G_GNUC_UNUSED gpointer userdata)
{ {
if (!is_hung_up)
g_warning("Did not hang up properly");
check_error(error); check_error(error);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment