diff --git a/daemon/src/dbus/callmanager-introspec.xml b/daemon/src/dbus/callmanager-introspec.xml
index 62535f06029b78689ae8629ff981f3f0ef8dcbae..645a776d00cdb23af14f9d4dca3fae42835df746 100644
--- a/daemon/src/dbus/callmanager-introspec.xml
+++ b/daemon/src/dbus/callmanager-introspec.xml
@@ -671,7 +671,7 @@
</arg>
</signal>
- <signal name="transferSucceded" tp:name-for-bindings="transferSucceded">
+ <signal name="transferSucceeded" tp:name-for-bindings="transferSucceeded">
<tp:docstring>
<p>Transfer has been successfully
processed. Client should remove transfered
@@ -682,7 +682,7 @@
<signal name="transferFailed" tp:name-for-bindings="transferFailed">
<tp:docstring>
- <p>Transfer operation failed. Corespondin
+ <p>Transfer operation failed. Corresponding
call is no longer accessible in
SFLphone-daemon.</p>
</tp:docstring>
diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp
index a6040f111d648dbadd6ede0ab21433cfd13b2d9e..ea4e0027a3b3632f99877ac9d37cd33a1dd4ee7f 100644
--- a/daemon/src/managerimpl.cpp
+++ b/daemon/src/managerimpl.cpp
@@ -559,9 +559,9 @@ void ManagerImpl::transferFailed()
dbus_.getCallManager()->transferFailed();
}
-void ManagerImpl::transferSucceded()
+void ManagerImpl::transferSucceeded()
{
- dbus_.getCallManager()->transferSucceded();
+ dbus_.getCallManager()->transferSucceeded();
}
bool ManagerImpl::attendedTransfer(const std::string& transferID, const std::string& targetID)
diff --git a/daemon/src/managerimpl.h b/daemon/src/managerimpl.h
index a4004250b73d8f5fd2c9356242f14bcffbc8b82e..2c9dc2ebf372b05fee0d59124b4058d25b796a7e 100644
--- a/daemon/src/managerimpl.h
+++ b/daemon/src/managerimpl.h
@@ -213,7 +213,7 @@ class ManagerImpl {
/**
* Notify the client the transfer is successful
*/
- void transferSucceded();
+ void transferSucceeded();
/**
* Notify the client that the transfer failed
diff --git a/gnome/src/dbus/dbus.c b/gnome/src/dbus/dbus.c
index ff9fd6797e978129770a6138f8803f4288817388..8c2d591625a8c108595f8d6022a996418f55ccc8 100644
--- a/gnome/src/dbus/dbus.c
+++ b/gnome/src/dbus/dbus.c
@@ -55,11 +55,23 @@
static DBusGProxy *callManagerProxy, *configurationManagerProxy, *instanceProxy;
+/* Returns TRUE if there was an error, FALSE otherwise */
+static gboolean check_error(GError *error)
+{
+ if (error) {
+ DEBUG("DBUS: Error: %s", error->message);
+ g_error_free(error);
+ return TRUE;
+ }
+ return FALSE;
+}
+
static void
new_call_created_cb(DBusGProxy *proxy UNUSED, const gchar *accountID,
const gchar *callID, const gchar *to, void *foo UNUSED)
{
- callable_obj_t *c = create_new_call(CALL, CALL_STATE_RINGING, callID, accountID, to, to);
+ callable_obj_t *c = create_new_call(CALL, CALL_STATE_RINGING, callID,
+ accountID, to, to);
calllist_add_call(current_calls_tab, c);
calltree_add_call(current_calls_tab, c, NULL);
@@ -69,8 +81,8 @@ new_call_created_cb(DBusGProxy *proxy UNUSED, const gchar *accountID,
}
static void
-incoming_call_cb(DBusGProxy *proxy UNUSED, const gchar* accountID,
- const gchar* callID, const gchar* from, void * foo UNUSED)
+incoming_call_cb(DBusGProxy *proxy UNUSED, const gchar *accountID,
+ const gchar *callID, const gchar *from, void *foo UNUSED)
{
// We receive the from field under a formatted way. We want to extract the number and the name of the caller
gchar *display_name = call_get_display_name(from);
@@ -89,8 +101,9 @@ incoming_call_cb(DBusGProxy *proxy UNUSED, const gchar* accountID,
}
static void
-zrtp_negotiation_failed_cb(DBusGProxy *proxy UNUSED, const gchar* callID,
- const gchar* reason, const gchar* severity, void * foo UNUSED)
+zrtp_negotiation_failed_cb(DBusGProxy *proxy UNUSED, const gchar *callID,
+ const gchar *reason, const gchar *severity,
+ void *foo UNUSED)
{
main_window_zrtp_negotiation_failed(callID, reason, severity);
callable_obj_t *c = calllist_get_call(current_calls_tab, callID);
@@ -100,24 +113,26 @@ zrtp_negotiation_failed_cb(DBusGProxy *proxy UNUSED, const gchar* callID,
}
static void
-volume_changed_cb(DBusGProxy *proxy UNUSED, const gchar* device, const gdouble value,
- void * foo UNUSED)
+volume_changed_cb(DBusGProxy *proxy UNUSED, const gchar *device, gdouble value,
+ void *foo UNUSED)
{
set_slider(device, value);
}
static void
-voice_mail_cb(DBusGProxy *proxy UNUSED, const gchar* accountID, const guint nb,
- void * foo UNUSED)
+voice_mail_cb(DBusGProxy *proxy UNUSED, const gchar *accountID, guint nb,
+ void *foo UNUSED)
{
sflphone_notify_voice_mail(accountID, nb);
}
static void
-incoming_message_cb(DBusGProxy *proxy UNUSED, const gchar* callID UNUSED, const gchar *from, const gchar* msg, void * foo UNUSED)
+incoming_message_cb(DBusGProxy *proxy UNUSED, const gchar *callID UNUSED, const gchar *from,
+ const gchar *msg, void *foo UNUSED)
{
// do not display message if instant messaging is disabled
- if (eel_gconf_key_exists(INSTANT_MESSAGING_ENABLED) && !eel_gconf_get_integer(INSTANT_MESSAGING_ENABLED))
+ if (eel_gconf_key_exists(INSTANT_MESSAGING_ENABLED) &&
+ !eel_gconf_get_integer(INSTANT_MESSAGING_ENABLED))
return;
GtkWidget **widget;
@@ -148,14 +163,12 @@ incoming_message_cb(DBusGProxy *proxy UNUSED, const gchar* callID UNUSED, const
/**
* Perform the right sflphone action based on the requested state
*/
-static void process_existant_call_state_change(callable_obj_t *c, const gchar *state)
+static void process_existing_call_state_change(callable_obj_t *c, const gchar *state)
{
- if(c == NULL) {
+ if (c == NULL) {
ERROR("Pointer to call is NULL in %s\n", __func__);
return;
- }
-
- if(state == NULL) {
+ } else if (state == NULL) {
ERROR("Pointer to state is NULL in %s\n", __func__);
return;
}
@@ -169,54 +182,50 @@ static void process_existant_call_state_change(callable_obj_t *c, const gchar *s
calltree_update_call(history_tab, c);
status_bar_display_account();
sflphone_hung_up(c);
- } else if (g_strcmp0(state, "UNHOLD_CURRENT") == 0) {
+ } else if (g_strcmp0(state, "UNHOLD_CURRENT") == 0)
sflphone_current(c);
- } else if (g_strcmp0(state, "UNHOLD_RECORD") == 0) {
+ else if (g_strcmp0(state, "UNHOLD_RECORD") == 0)
sflphone_record(c);
- } else if (g_strcmp0(state, "HOLD") == 0) {
+ else if (g_strcmp0(state, "HOLD") == 0)
sflphone_hold(c);
- } else if (g_strcmp0(state, "RINGING") == 0) {
+ else if (g_strcmp0(state, "RINGING") == 0)
sflphone_ringing(c);
- } else if (g_strcmp0(state, "CURRENT") == 0) {
+ else if (g_strcmp0(state, "CURRENT") == 0)
sflphone_current(c);
- } else if (g_strcmp0(state, "RECORD") == 0) {
+ else if (g_strcmp0(state, "RECORD") == 0)
sflphone_record(c);
- } else if (g_strcmp0(state, "FAILURE") == 0) {
+ else if (g_strcmp0(state, "FAILURE") == 0)
sflphone_fail(c);
- } else if (g_strcmp0(state, "BUSY") == 0) {
+ else if (g_strcmp0(state, "BUSY") == 0)
sflphone_busy(c);
- }
-
- return;
}
/**
- * This function process call state changes in case the call have not been created yet.
+ * This function process call state changes in case the call have not been created yet.
* This mainly occurs when anotehr SFLphone client takes actions.
*/
-static void process_inexistant_call_state_change(const gchar *callID, const gchar *state)
+static void process_nonexisting_call_state_change(const gchar *callID, const gchar *state)
{
- if(callID == NULL) {
+ if (callID == NULL) {
ERROR("Pointer to call id is NULL in %s\n", __func__);
return;
}
- if(state == NULL) {
+ if (state == NULL) {
ERROR("Pointer to state is NULL in %s\n", __func__);
return;
}
- // Could occur if a user picked up the phone and hung up without making a call
- if(g_strcmp0(state, "HUNGUP") == 0)
+ // Could occur if a user picked up the phone and hung up without making a call
+ if (g_strcmp0(state, "HUNGUP") == 0)
return;
// The callID is unknow, threat it like a new call
// If it were an incoming call, we won't be here
// It means that a new call has been initiated with an other client (cli for instance)
- if ((g_strcmp0(state, "RINGING")) == 0 ||
- (g_strcmp0(state, "CURRENT")) == 0 ||
- (g_strcmp0(state, "RECORD"))) {
+ if ((g_strcmp0(state, "RINGING")) == 0 || (g_strcmp0(state, "CURRENT")) == 0 ||
+ g_strcmp0(state, "RECORD")) {
DEBUG("DBUS: New ringing call! accountID: %s", callID);
@@ -232,31 +241,25 @@ static void process_inexistant_call_state_change(const gchar *callID, const gcha
update_actions();
calltree_display(current_calls_tab);
}
-
}
-/**
- * Callback called when a
- */
static void
-call_state_cb(DBusGProxy *proxy UNUSED, const gchar* callID, const gchar* state,
- void * foo UNUSED)
+call_state_cb(DBusGProxy *proxy UNUSED, const gchar *callID, const gchar *state, void *foo UNUSED)
{
callable_obj_t *c = calllist_get_call(current_calls_tab, callID);
- if (c) {
- process_existant_call_state_change(c, state);
- } else {
+ if (c)
+ process_existing_call_state_change(c, state);
+ else {
WARN("DBUS: Call does not exist in %s", __func__);
-
- process_inexistant_call_state_change(callID, state);
+ process_nonexisting_call_state_change(callID, state);
}
}
static void toggle_im(conference_obj_t *conf, gboolean activate)
{
- for (GSList *part = conf->participant_list; part; part = g_slist_next(part)) {
- callable_obj_t *call = calllist_get_call(current_calls_tab, part->data);
+ for (GSList *p = conf->participant_list; p; p = g_slist_next(p)) {
+ callable_obj_t *call = calllist_get_call(current_calls_tab, p->data);
if (call)
im_widget_update_state(IM_WIDGET(call->_im_widget), activate);
@@ -264,8 +267,8 @@ static void toggle_im(conference_obj_t *conf, gboolean activate)
}
static void
-conference_changed_cb(DBusGProxy *proxy UNUSED, const gchar* confID,
- const gchar* state, void * foo UNUSED)
+conference_changed_cb(DBusGProxy *proxy UNUSED, const gchar *confID, const gchar *state,
+ void *foo UNUSED)
{
DEBUG("DBUS: Conference state changed: %s\n", state);
@@ -308,7 +311,7 @@ conference_changed_cb(DBusGProxy *proxy UNUSED, const gchar* confID,
}
static void
-conference_created_cb(DBusGProxy *proxy UNUSED, const gchar* confID, void * foo UNUSED)
+conference_created_cb(DBusGProxy *proxy UNUSED, const gchar *confID, void *foo UNUSED)
{
DEBUG("DBUS: Conference %s added", confID);
@@ -325,7 +328,7 @@ conference_created_cb(DBusGProxy *proxy UNUSED, const gchar* confID, void * foo
im_widget_update_state(IM_WIDGET(call->_im_widget), FALSE);
- // if one of these participant is currently recording, the whole conference will be recorded
+ // if one of these participants is currently recording, the whole conference will be recorded
if (call->_state == CALL_STATE_RECORD)
new_conf->_state = CONFERENCE_STATE_ACTIVE_ATTACHED_RECORD;
@@ -342,11 +345,11 @@ conference_created_cb(DBusGProxy *proxy UNUSED, const gchar* confID, void * foo
}
static void
-conference_removed_cb(DBusGProxy *proxy UNUSED, const gchar* confID, void * foo UNUSED)
+conference_removed_cb(DBusGProxy *proxy UNUSED, const gchar *confID, void *foo UNUSED)
{
DEBUG("DBUS: Conference removed %s", confID);
- conference_obj_t * c = conferencelist_get(current_calls_tab, confID);
+ conference_obj_t *c = conferencelist_get(current_calls_tab, confID);
calltree_remove_conference(current_calls_tab, c);
im_widget_update_state(IM_WIDGET(c->_im_widget), FALSE);
@@ -393,7 +396,6 @@ static void
record_playback_stopped_cb(DBusGProxy *proxy UNUSED, const gchar *filepath)
{
DEBUG("DBUS: Playback stopped for %s", filepath);
-
const gint calllist_size = calllist_get_size(history_tab);
for (gint i = 0; i < calllist_size; i++) {
@@ -402,9 +404,9 @@ record_playback_stopped_cb(DBusGProxy *proxy UNUSED, const gchar *filepath)
if (element == NULL) {
ERROR("DBUS: ERROR: Could not find %dth call", i);
break;
- } else if (element->type == HIST_CALL &&
- g_strcmp0(element->elem.call->_recordfile, filepath) == 0) {
- element->elem.call->_record_is_playing = FALSE;
+ } else if (element->type == HIST_CALL) {
+ if (g_strcmp0(element->elem.call->_recordfile, filepath) == 0)
+ element->elem.call->_record_is_playing = FALSE;
}
}
@@ -412,9 +414,8 @@ record_playback_stopped_cb(DBusGProxy *proxy UNUSED, const gchar *filepath)
}
static void
-accounts_changed_cb(DBusGProxy *proxy UNUSED, void * foo UNUSED)
+accounts_changed_cb(DBusGProxy *proxy UNUSED, void *foo UNUSED)
{
- DEBUG("DBUS: Accounts changed");
sflphone_fill_account_list();
sflphone_fill_ip2ip_profile();
account_list_config_dialog_fill();
@@ -423,14 +424,13 @@ accounts_changed_cb(DBusGProxy *proxy UNUSED, void * foo UNUSED)
}
static void
-transfer_succeded_cb(DBusGProxy *proxy UNUSED, void * foo UNUSED)
+transfer_succeeded_cb(DBusGProxy *proxy UNUSED, void *foo UNUSED)
{
- DEBUG("DBUS: Transfer succeded");
- sflphone_display_transfer_status("Transfer successfull");
+ sflphone_display_transfer_status("Transfer successful");
}
static void
-transfer_failed_cb(DBusGProxy *proxy UNUSED, void * foo UNUSED)
+transfer_failed_cb(DBusGProxy *proxy UNUSED, void *foo UNUSED)
{
DEBUG("DBUS: Transfer failed");
sflphone_display_transfer_status("Transfer failed");
@@ -446,7 +446,6 @@ secure_sdes_on_cb(DBusGProxy *proxy UNUSED, const gchar *callID, void *foo UNUSE
sflphone_srtp_sdes_on(c);
notify_secure_on(c);
}
-
}
static void
@@ -462,8 +461,8 @@ secure_sdes_off_cb(DBusGProxy *proxy UNUSED, const gchar *callID, void *foo UNUS
}
static void
-secure_zrtp_on_cb(DBusGProxy *proxy UNUSED, const gchar* callID, const gchar* cipher,
- void * foo UNUSED)
+secure_zrtp_on_cb(DBusGProxy *proxy UNUSED, const gchar *callID,
+ const gchar *cipher, void *foo UNUSED)
{
DEBUG("DBUS: SRTP using ZRTP is ON secure_on_cb");
callable_obj_t *c = calllist_get_call(current_calls_tab, callID);
@@ -476,7 +475,7 @@ secure_zrtp_on_cb(DBusGProxy *proxy UNUSED, const gchar* callID, const gchar* ci
}
static void
-secure_zrtp_off_cb(DBusGProxy *proxy UNUSED, const gchar* callID, void * foo UNUSED)
+secure_zrtp_off_cb(DBusGProxy *proxy UNUSED, const gchar *callID, void *foo UNUSED)
{
DEBUG("DBUS: SRTP using ZRTP is OFF");
callable_obj_t *c = calllist_get_call(current_calls_tab, callID);
@@ -488,31 +487,31 @@ secure_zrtp_off_cb(DBusGProxy *proxy UNUSED, const gchar* callID, void * foo UN
}
static void
-show_zrtp_sas_cb(DBusGProxy *proxy UNUSED, const gchar* callID, const gchar* sas,
- const gboolean verified, void * foo UNUSED)
+show_zrtp_sas_cb(DBusGProxy *proxy UNUSED, const gchar *callID, const gchar *sas,
+ gboolean verified, void *foo UNUSED)
{
DEBUG("DBUS: Showing SAS");
- callable_obj_t * c = calllist_get_call(current_calls_tab, callID);
+ callable_obj_t *c = calllist_get_call(current_calls_tab, callID);
if (c)
sflphone_srtp_zrtp_show_sas(c, sas, verified);
}
static void
-confirm_go_clear_cb(DBusGProxy *proxy UNUSED, const gchar* callID, void * foo UNUSED)
+confirm_go_clear_cb(DBusGProxy *proxy UNUSED, const gchar *callID, void *foo UNUSED)
{
DEBUG("DBUS: Confirm Go Clear request");
- callable_obj_t * c = calllist_get_call(current_calls_tab, callID);
+ callable_obj_t *c = calllist_get_call(current_calls_tab, callID);
if (c)
main_window_confirm_go_clear(c);
}
static void
-zrtp_not_supported_cb(DBusGProxy *proxy UNUSED, const gchar* callID, void * foo UNUSED)
+zrtp_not_supported_cb(DBusGProxy *proxy UNUSED, const gchar *callID, void *foo UNUSED)
{
DEBUG("ZRTP not supported on the other end");
- callable_obj_t * c = calllist_get_call(current_calls_tab, callID);
+ callable_obj_t *c = calllist_get_call(current_calls_tab, callID);
if (c) {
main_window_zrtp_not_supported(c);
@@ -521,8 +520,8 @@ zrtp_not_supported_cb(DBusGProxy *proxy UNUSED, const gchar* callID, void * foo
}
static void
-sip_call_state_cb(DBusGProxy *proxy UNUSED, const gchar* callID,
- const gchar* description, const guint code, void * foo UNUSED)
+sip_call_state_cb(DBusGProxy *proxy UNUSED, const gchar *callID,
+ const gchar *description, guint code, void *foo UNUSED)
{
DEBUG("DBUS: Sip call state changed %s", callID);
callable_obj_t *c = calllist_get_call(current_calls_tab, callID);
@@ -532,7 +531,7 @@ sip_call_state_cb(DBusGProxy *proxy UNUSED, const gchar* callID,
}
static void
-error_alert(DBusGProxy *proxy UNUSED, int err, void * foo UNUSED)
+error_alert(DBusGProxy *proxy UNUSED, int err, void *foo UNUSED)
{
const gchar *msg;
@@ -553,10 +552,9 @@ error_alert(DBusGProxy *proxy UNUSED, int err, void * foo UNUSED)
return;
}
- GtkWidget * dialog = gtk_message_dialog_new(
- GTK_WINDOW(get_main_window()),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE, "%s", msg);
+ GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(get_main_window()),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", msg);
gtk_window_set_title(GTK_WINDOW(dialog), _("SFLphone Error"));
@@ -564,8 +562,7 @@ error_alert(DBusGProxy *proxy UNUSED, int err, void * foo UNUSED)
gtk_widget_show(dialog);
}
-gboolean
-dbus_connect(GError **error)
+gboolean dbus_connect(GError **error)
{
g_type_init();
@@ -588,7 +585,8 @@ dbus_connect(GError **error)
DEBUG("DBus connected to Instance");
callManagerProxy = dbus_g_proxy_new_for_name(connection,
- "org.sflphone.SFLphone", "/org/sflphone/SFLphone/CallManager",
+ "org.sflphone.SFLphone",
+ "/org/sflphone/SFLphone/CallManager",
"org.sflphone.SFLphone.CallManager");
g_assert(callManagerProxy != NULL);
@@ -641,9 +639,9 @@ dbus_connect(GError **error)
dbus_g_proxy_connect_signal(callManagerProxy, "volumeChanged",
G_CALLBACK(volume_changed_cb), NULL, NULL);
- dbus_g_proxy_add_signal(callManagerProxy, "transferSucceded", G_TYPE_INVALID);
- dbus_g_proxy_connect_signal(callManagerProxy, "transferSucceded",
- G_CALLBACK(transfer_succeded_cb), NULL, NULL);
+ dbus_g_proxy_add_signal(callManagerProxy, "transferSucceeded", G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal(callManagerProxy, "transferSucceeded",
+ G_CALLBACK(transfer_succeeded_cb), NULL, NULL);
dbus_g_proxy_add_signal(callManagerProxy, "transferFailed", G_TYPE_INVALID);
dbus_g_proxy_connect_signal(callManagerProxy, "transferFailed",
@@ -725,12 +723,14 @@ dbus_connect(GError **error)
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID);
dbus_g_proxy_add_signal(callManagerProxy, "sipCallStateChanged",
- G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID);
+ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT,
+ G_TYPE_INVALID);
dbus_g_proxy_connect_signal(callManagerProxy, "sipCallStateChanged",
G_CALLBACK(sip_call_state_cb), NULL, NULL);
configurationManagerProxy = dbus_g_proxy_new_for_name(connection,
- "org.sflphone.SFLphone", "/org/sflphone/SFLphone/ConfigurationManager",
+ "org.sflphone.SFLphone",
+ "/org/sflphone/SFLphone/ConfigurationManager",
"org.sflphone.SFLphone.ConfigurationManager");
g_assert(configurationManagerProxy != NULL);
@@ -758,60 +758,46 @@ dbus_connect(GError **error)
return TRUE;
}
-void
-dbus_clean()
+void dbus_clean()
{
g_object_unref(callManagerProxy);
g_object_unref(configurationManagerProxy);
g_object_unref(instanceProxy);
}
-void
-dbus_hold(const callable_obj_t * c)
+void dbus_hold(const callable_obj_t *c)
{
GError *error = NULL;
- org_sflphone_SFLphone_CallManager_hold(callManagerProxy, c->_callID, &error);
-
- if (error) {
- ERROR("Failed to call hold() on CallManager: %s", error->message);
- g_error_free(error);
- }
+ org_sflphone_SFLphone_CallManager_hold(callManagerProxy, c->_callID,
+ &error);
+ check_error(error);
}
void
-dbus_unhold(const callable_obj_t * c)
+dbus_unhold(const callable_obj_t *c)
{
GError *error = NULL;
- org_sflphone_SFLphone_CallManager_unhold(callManagerProxy, c->_callID, &error);
-
- if (error) {
- ERROR("Failed to call unhold() on CallManager: %s", error->message);
- g_error_free(error);
- }
+ org_sflphone_SFLphone_CallManager_unhold(callManagerProxy, c->_callID,
+ &error);
+ check_error(error);
}
void
-dbus_hold_conference(const conference_obj_t * c)
+dbus_hold_conference(const conference_obj_t *c)
{
GError *error = NULL;
- org_sflphone_SFLphone_CallManager_hold_conference(callManagerProxy, c->_confID, &error);
-
- if (error) {
- ERROR("Failed to call hold() on CallManager: %s", error->message);
- g_error_free(error);
- }
+ org_sflphone_SFLphone_CallManager_hold_conference(callManagerProxy,
+ c->_confID, &error);
+ check_error(error);
}
void
-dbus_unhold_conference(const conference_obj_t * c)
+dbus_unhold_conference(const conference_obj_t *c)
{
GError *error = NULL;
- org_sflphone_SFLphone_CallManager_unhold_conference(callManagerProxy, c->_confID, &error);
-
- if (error) {
- ERROR("Failed to call unhold() on CallManager: %s", error->message);
- g_error_free(error);
- }
+ org_sflphone_SFLphone_CallManager_unhold_conference(callManagerProxy,
+ c->_confID, &error);
+ check_error(error);
}
gboolean
@@ -822,12 +808,7 @@ dbus_start_recorded_file_playback(const gchar *filepath)
org_sflphone_SFLphone_CallManager_start_recorded_file_playback(callManagerProxy,
filepath, &result, &error);
-
- if (error) {
- ERROR("Failed to call recorded file playback: %s", error->message);
- g_error_free(error);
- }
-
+ check_error(error);
return result;
}
@@ -836,114 +817,91 @@ dbus_stop_recorded_file_playback(const gchar *filepath)
{
GError *error = NULL;
org_sflphone_SFLphone_CallManager_stop_recorded_file_playback(callManagerProxy,
- filepath, &error);
-
- if (error) {
- ERROR("Failed to call stop recorded file playback: %s", error->message);
- g_error_free(error);
- }
+ filepath, &error);
+ check_error(error);
}
void
-dbus_hang_up(const callable_obj_t * c)
+dbus_hang_up(const callable_obj_t *c)
{
GError *error = NULL;
org_sflphone_SFLphone_CallManager_hang_up(callManagerProxy, c->_callID, &error);
-
- if (error) {
- ERROR("Failed to call hang_up() on CallManager: %s", error->message);
- g_error_free(error);
- }
+ check_error(error);
}
void
-dbus_hang_up_conference(const conference_obj_t * c)
+dbus_hang_up_conference(const conference_obj_t *c)
{
GError *error = NULL;
- org_sflphone_SFLphone_CallManager_hang_up_conference(callManagerProxy, c->_confID, &error);
-
- if (error) {
- ERROR("Failed to call hang_up() on CallManager: %s", error->message);
- g_error_free(error);
- }
+ org_sflphone_SFLphone_CallManager_hang_up_conference(callManagerProxy,
+ c->_confID, &error);
+ check_error(error);
}
void
-dbus_transfer(const callable_obj_t * c)
+dbus_transfer(const callable_obj_t *c)
{
GError *error = NULL;
- org_sflphone_SFLphone_CallManager_transfer(callManagerProxy, c->_callID, c->_trsft_to, &error);
-
- if (error) {
- ERROR("Failed to call transfer() on CallManager: %s", error->message);
- g_error_free(error);
- }
+ org_sflphone_SFLphone_CallManager_transfer(callManagerProxy, c->_callID,
+ c->_trsft_to, &error);
+ check_error(error);
}
void
dbus_attended_transfer(const callable_obj_t *transfer, const callable_obj_t *target)
{
GError *error = NULL;
- org_sflphone_SFLphone_CallManager_attended_transfer(callManagerProxy, transfer->_callID, target->_callID, &error);
-
- if (error) {
- ERROR("Failed to call transfer() on CallManager: %s", error->message);
- g_error_free(error);
- }
+ org_sflphone_SFLphone_CallManager_attended_transfer(callManagerProxy,
+ transfer->_callID,
+ target->_callID,
+ &error);
+ check_error(error);
}
void
-dbus_accept(const callable_obj_t * c)
+dbus_accept(const callable_obj_t *c)
{
status_tray_icon_blink(FALSE);
GError *error = NULL;
- org_sflphone_SFLphone_CallManager_accept(callManagerProxy, c->_callID, &error);
-
- if (error) {
- ERROR("Failed to call accept(%s) on CallManager: %s", c->_callID, error->message);
- g_error_free(error);
- }
+ org_sflphone_SFLphone_CallManager_accept(callManagerProxy, c->_callID,
+ &error);
+ check_error(error);
}
void
-dbus_refuse(const callable_obj_t * c)
+dbus_refuse(const callable_obj_t *c)
{
status_tray_icon_blink(FALSE);
GError *error = NULL;
- org_sflphone_SFLphone_CallManager_refuse(callManagerProxy, c->_callID, &error);
-
- if (error) {
- ERROR("Failed to call refuse() on CallManager: %s", error->message);
- g_error_free(error);
- }
+ org_sflphone_SFLphone_CallManager_refuse(callManagerProxy, c->_callID,
+ &error);
+ check_error(error);
}
void
-dbus_place_call(const callable_obj_t * c)
+dbus_place_call(const callable_obj_t *c)
{
GError *error = NULL;
- org_sflphone_SFLphone_CallManager_place_call(callManagerProxy, c->_accountID,
- c->_callID, c->_peer_number, &error);
-
- if (error) {
- ERROR("Failed to call placeCall() on CallManager: %s", error->message);
- g_error_free(error);
- }
+ org_sflphone_SFLphone_CallManager_place_call(callManagerProxy,
+ c->_accountID, c->_callID,
+ c->_peer_number, &error);
+ check_error(error);
}
-gchar**
+gchar **
dbus_account_list()
{
GError *error = NULL;
- char ** array = NULL;
+ char **array = NULL;
- if (!org_sflphone_SFLphone_ConfigurationManager_get_account_list(
- configurationManagerProxy, &array, &error)) {
+ if (!org_sflphone_SFLphone_ConfigurationManager_get_account_list(configurationManagerProxy,
+ &array, &error)) {
if (error->domain == DBUS_GERROR &&
error->code == DBUS_GERROR_REMOTE_EXCEPTION)
- ERROR("Caught remote method (get_account_list) exception %s: %s", dbus_g_error_get_name(error), error->message);
+ ERROR("Caught remote method (get_account_list) exception %s: %s",
+ dbus_g_error_get_name(error), error->message);
else
ERROR("Error while calling get_account_list: %s", error->message);
@@ -954,20 +912,21 @@ dbus_account_list()
return array;
}
-GHashTable*
-dbus_get_account_details(gchar * accountID)
+GHashTable *
+dbus_get_account_details(const gchar *accountID)
{
GError *error = NULL;
- GHashTable * details = NULL;
+ GHashTable *details = NULL;
if (!org_sflphone_SFLphone_ConfigurationManager_get_account_details(
configurationManagerProxy, accountID, &details, &error)) {
- if (error->domain == DBUS_GERROR && error->code
- == DBUS_GERROR_REMOTE_EXCEPTION) {
- ERROR("Caught remote method (get_account_details) exception %s: %s", dbus_g_error_get_name(error), error->message);
- } else {
- ERROR("Error while calling get_account_details: %s", error->message);
- }
+ if (error->domain == DBUS_GERROR &&
+ error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+ ERROR("Caught remote method exception %s: %s",
+ dbus_g_error_get_name(error), error->message);
+ else
+ ERROR("Error while calling get_account_details: %s",
+ error->message);
g_error_free(error);
}
@@ -978,22 +937,19 @@ dbus_get_account_details(gchar * accountID)
void
dbus_set_credentials(account_t *a)
{
+ g_assert(a);
DEBUG("DBUS: Sending credentials to server");
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_credentials(
configurationManagerProxy, a->accountID, a->credential_information, &error);
-
- if (error) {
- ERROR("Failed to call set_credential() on ConfigurationManager: %s",
- error->message);
- g_error_free(error);
- }
+ check_error(error);
}
void
dbus_get_credentials(account_t *a)
{
+ g_assert(a);
GError *error = NULL;
if (org_sflphone_SFLphone_ConfigurationManager_get_credentials(
@@ -1001,25 +957,27 @@ dbus_get_credentials(account_t *a)
return;
if (error->domain == DBUS_GERROR &&
- error->code == DBUS_GERROR_REMOTE_EXCEPTION)
- ERROR("Caught remote method (get_account_details) exception %s: %s", dbus_g_error_get_name(error), error->message);
+ error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+ ERROR("Caught remote method (get_account_details) exception %s: %s",
+ dbus_g_error_get_name(error), error->message);
else
ERROR("Error while calling get_account_details: %s", error->message);
g_error_free(error);
}
-GHashTable*
+GHashTable *
dbus_get_ip2_ip_details(void)
{
GError *error = NULL;
- GHashTable * details = NULL;
+ GHashTable *details = NULL;
if (!org_sflphone_SFLphone_ConfigurationManager_get_ip2_ip_details(
configurationManagerProxy, &details, &error)) {
if (error->domain == DBUS_GERROR &&
- error->code == DBUS_GERROR_REMOTE_EXCEPTION)
- ERROR("Caught remote method (get_ip2_ip_details) exception %s: %s", dbus_g_error_get_name(error), error->message);
+ error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+ ERROR("Caught remote method (get_ip2_ip_details) exception %s: %s",
+ dbus_g_error_get_name(error), error->message);
else
ERROR("Error while calling get_ip2_ip_details: %s", error->message);
@@ -1030,124 +988,84 @@ dbus_get_ip2_ip_details(void)
}
void
-dbus_send_register(gchar* accountID, gboolean enable)
+dbus_send_register(const gchar *accountID, gboolean enable)
{
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_send_register(
configurationManagerProxy, accountID, enable, &error);
-
- if (error) {
- ERROR("Failed to call send_register() on ConfigurationManager: %s",
- error->message);
- g_error_free(error);
- }
+ check_error(error);
}
void
-dbus_remove_account(gchar * accountID)
+dbus_remove_account(const gchar *accountID)
{
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_remove_account(
configurationManagerProxy, accountID, &error);
-
- if (error) {
- ERROR("Failed to call remove_account() on ConfigurationManager: %s",
- error->message);
- g_error_free(error);
- }
+ check_error(error);
}
void
dbus_set_account_details(account_t *a)
{
+ g_assert(a);
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_account_details(
configurationManagerProxy, a->accountID, a->properties, &error);
-
- if (error) {
- ERROR("Failed to call set_account_details() on ConfigurationManager: %s",
- error->message);
- g_error_free(error);
- }
+ check_error(error);
}
+
void
dbus_add_account(account_t *a)
{
+ g_assert(a);
GError *error = NULL;
g_free(a->accountID);
org_sflphone_SFLphone_ConfigurationManager_add_account(
configurationManagerProxy, a->properties, &a->accountID, &error);
-
- if (error) {
- ERROR("Failed to call add_account() on ConfigurationManager: %s",
- error->message);
- g_error_free(error);
- }
+ check_error(error);
}
void
-dbus_set_volume(const gchar * device, gdouble value)
+dbus_set_volume(const gchar *device, gdouble value)
{
GError *error = NULL;
- org_sflphone_SFLphone_CallManager_set_volume(callManagerProxy, device, value,
- &error);
-
- if (error) {
- ERROR("Failed to call set_volume() on callManagerProxy: %s",
- error->message);
- g_error_free(error);
- }
+ org_sflphone_SFLphone_CallManager_set_volume(callManagerProxy, device,
+ value, &error);
+ check_error(error);
}
gdouble
-dbus_get_volume(const gchar * device)
+dbus_get_volume(const gchar *device)
{
gdouble value;
GError *error = NULL;
org_sflphone_SFLphone_CallManager_get_volume(callManagerProxy, device,
- &value, &error);
-
- if (error) {
- ERROR("Failed to call get_volume() on callManagerProxy: %s",
- error->message);
- g_error_free(error);
- }
-
+ &value, &error);
+ check_error(error);
return value;
}
void
-dbus_play_dtmf(const gchar * key)
+dbus_play_dtmf(const gchar *key)
{
GError *error = NULL;
-
org_sflphone_SFLphone_CallManager_play_dt_mf(callManagerProxy, key, &error);
-
- if (error) {
- ERROR("Failed to call playDTMF() on callManagerProxy: %s",
- error->message);
- g_error_free(error);
- }
+ check_error(error);
}
void
-dbus_start_tone(const int start, const guint type)
+dbus_start_tone(int start, guint type)
{
GError *error = NULL;
-
org_sflphone_SFLphone_CallManager_start_tone(callManagerProxy, start, type,
- &error);
-
- if (error) {
- ERROR("Failed to call startTone() on callManagerProxy: %s",
- error->message);
- g_error_free(error);
- }
+ &error);
+ check_error(error);
}
gboolean
-dbus_register(int pid, gchar *name, GError **error)
+dbus_register(int pid, const gchar *name, GError **error)
{
return org_sflphone_SFLphone_Instance_register(instanceProxy, pid, name, error);
}
@@ -1156,116 +1074,79 @@ void
dbus_unregister(int pid)
{
GError *error = NULL;
-
org_sflphone_SFLphone_Instance_unregister(instanceProxy, pid, &error);
-
- if (error) {
- ERROR("Failed to call unregister() on instanceProxy: %s",
- error->message);
- g_error_free(error);
- }
+ check_error(error);
}
GArray *
dbus_audio_codec_list()
{
GError *error = NULL;
- GArray * array = NULL;
+ GArray *array = NULL;
org_sflphone_SFLphone_ConfigurationManager_get_audio_codec_list(
configurationManagerProxy, &array, &error);
-
- if (error) {
- ERROR("Failed to call get_audio_codec_list() on ConfigurationManager: %s",
- error->message);
- g_error_free(error);
- }
-
+ check_error(error);
return array;
}
-gchar**
+gchar **
dbus_audio_codec_details(int payload)
{
GError *error = NULL;
- gchar ** array;
+ gchar **array;
org_sflphone_SFLphone_ConfigurationManager_get_audio_codec_details(
configurationManagerProxy, payload, &array, &error);
-
- if (error) {
- ERROR("Failed to call get_audio_codec_details() on ConfigurationManager: %s",
- error->message);
- g_error_free(error);
- }
-
+ check_error(error);
return array;
}
-gchar*
-dbus_get_current_audio_codec_name(const callable_obj_t * c)
+gchar *
+dbus_get_current_audio_codec_name(const callable_obj_t *c)
{
- gchar* codecName = NULL;
- GError* error = NULL;
+ gchar *codecName = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_CallManager_get_current_audio_codec_name(callManagerProxy,
c->_callID, &codecName, &error);
-
- if (error) {
- g_error_free(error);
- g_free(codecName);
- codecName = g_strdup("");
- }
-
+ check_error(error);
DEBUG("%s: codecName : %s", __PRETTY_FUNCTION__, codecName);
-
return codecName;
}
GArray *
-dbus_get_active_audio_codec_list(gchar *accountID)
+dbus_get_active_audio_codec_list(const gchar *accountID)
{
-
- GArray * array = NULL;
+ GArray *array = NULL;
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_get_active_audio_codec_list(
configurationManagerProxy, accountID, &array, &error);
-
- if (error) {
- ERROR("Failed to call get_active_audio_codec_list() on ConfigurationManager: %s",
- error->message);
- g_error_free(error);
- }
+ check_error(error);
return array;
}
void
-dbus_set_active_audio_codec_list(const gchar** list, const gchar *accountID)
+dbus_set_active_audio_codec_list(const gchar **list, const gchar *accountID)
{
-
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_active_audio_codec_list(
configurationManagerProxy, list, accountID, &error);
-
- if (error) {
- ERROR("Failed to call set_active_audio_codec_list() on ConfigurationManager: %s",
- error->message);
- g_error_free(error);
- }
+ check_error(error);
}
/**
* Get a list of output supported audio plugins
*/
-gchar**
+gchar **
dbus_get_audio_plugin_list()
{
- gchar** array = NULL;
- GError* error = NULL;
+ gchar **array = NULL;
+ GError *error = NULL;
if (!org_sflphone_SFLphone_ConfigurationManager_get_audio_plugin_list(
configurationManagerProxy, &array, &error)) {
if (error->domain == DBUS_GERROR &&
- error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+ error->code == DBUS_GERROR_REMOTE_EXCEPTION)
ERROR("Caught remote method (get_output_plugin_list) exception %s: %s", dbus_g_error_get_name(error), error->message);
else
ERROR("Error while calling get_out_plugin_list: %s", error->message);
@@ -1277,34 +1158,25 @@ dbus_get_audio_plugin_list()
}
void
-dbus_set_audio_plugin(gchar* audioPlugin)
+dbus_set_audio_plugin(const gchar *audioPlugin)
{
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_audio_plugin(
configurationManagerProxy, audioPlugin, &error);
-
- if (error) {
- ERROR("Failed to call set_audio_plugin() on ConfigurationManager: %s", error->message);
- g_error_free(error);
- }
+ check_error(error);
}
/**
* Get all output devices index supported by current audio manager
*/
-gchar**
+gchar **
dbus_get_audio_output_device_list()
{
- gchar** array = NULL;
- GError* error = NULL;
+ gchar **array = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_get_audio_output_device_list(
configurationManagerProxy, &array, &error);
-
- if (error) {
- ERROR("Failed to call get_audio_output_device_list() on ConfigurationManager: %s", error->message);
- g_error_free(error);
- }
-
+ check_error(error);
return array;
}
@@ -1312,65 +1184,49 @@ dbus_get_audio_output_device_list()
* Set audio output device from its index
*/
void
-dbus_set_audio_output_device(const int device)
+dbus_set_audio_output_device(int device)
{
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_audio_output_device(
configurationManagerProxy, device, &error);
-
- if (error) {
- ERROR("Failed to call set_audio_output_device() on ConfigurationManager: %s", error->message);
- g_error_free(error);
- }
+ check_error(error);
}
/**
* Set audio input device from its index
*/
void
-dbus_set_audio_input_device(const int device)
+dbus_set_audio_input_device(int device)
{
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_audio_input_device(
configurationManagerProxy, device, &error);
-
- if (error) {
- ERROR("Failed to call set_audio_input_device() on ConfigurationManager: %s", error->message);
- g_error_free(error);
- }
+ check_error(error);
}
/**
* Set adio ringtone device from its index
*/
void
-dbus_set_audio_ringtone_device(const int device)
+dbus_set_audio_ringtone_device(int device)
{
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_audio_ringtone_device(
configurationManagerProxy, device, &error);
-
- if (error) {
- ERROR("Failed to call set_audio_ringtone_device() on ConfigurationManager: %s", error->message);
- g_error_free(error);
- }
+ check_error(error);
}
/**
* Get all input devices index supported by current audio manager
*/
-gchar**
+gchar **
dbus_get_audio_input_device_list()
{
- gchar** array = NULL;
- GError* error = NULL;
+ gchar **array = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_get_audio_input_device_list(
configurationManagerProxy, &array, &error);
-
- if (error) {
- ERROR("Failed to call get_audio_input_device_list() on ConfigurationManager: %s", error->message);
- g_error_free(error);
- }
+ check_error(error);
return array;
}
@@ -1378,18 +1234,14 @@ dbus_get_audio_input_device_list()
/**
* Get output device index and input device index
*/
-gchar**
+gchar **
dbus_get_current_audio_devices_index()
{
- gchar** array = NULL;
- GError* error = NULL;
+ gchar **array = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_get_current_audio_devices_index(
configurationManagerProxy, &array, &error);
-
- if (error) {
- ERROR("Failed to call get_current_audio_devices_index() on ConfigurationManager: %s", error->message);
- g_error_free(error);
- }
+ check_error(error);
return array;
}
@@ -1401,14 +1253,10 @@ int
dbus_get_audio_device_index(const gchar *name)
{
int device_index = 0;
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_get_audio_device_index(
configurationManagerProxy, name, &device_index, &error);
-
- if (error) {
- ERROR("Failed to call get_audio_device_index() on ConfigurationManager: %s", error->message);
- g_error_free(error);
- }
+ check_error(error);
return device_index;
}
@@ -1416,19 +1264,15 @@ dbus_get_audio_device_index(const gchar *name)
/**
* Get audio plugin
*/
-gchar*
+gchar *
dbus_get_current_audio_output_plugin()
{
- gchar* plugin;
- GError* error = NULL;
+ gchar *plugin;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_get_current_audio_output_plugin(
configurationManagerProxy, &plugin, &error);
-
- if (error) {
- ERROR("Failed to call get_current_audio_output_plugin() on ConfigurationManager: %s", error->message);
- g_error_free(error);
+ if (check_error(error))
plugin = g_strdup("");
- }
return plugin;
}
@@ -1437,18 +1281,15 @@ dbus_get_current_audio_output_plugin()
/**
* Get noise reduction state
*/
-gchar*
+gchar *
dbus_get_noise_suppress_state()
{
- gchar* state;
- GError* error = NULL;
+ gchar *state;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_get_noise_suppress_state(configurationManagerProxy, &state, &error);
- if (error) {
- ERROR("DBus: Failed to call get_noise_suppress_state() on ConfigurationManager: %s", error->message);
- g_error_free(error);
+ if (check_error(error))
state = g_strdup("");
- }
return state;
}
@@ -1457,9 +1298,9 @@ dbus_get_noise_suppress_state()
* Set noise reduction state
*/
void
-dbus_set_noise_suppress_state(gchar* state)
+dbus_set_noise_suppress_state(const gchar *state)
{
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_noise_suppress_state(
configurationManagerProxy, state, &error);
@@ -1476,25 +1317,18 @@ dbus_get_echo_cancel_state(void)
gchar *state;
org_sflphone_SFLphone_ConfigurationManager_get_echo_cancel_state(configurationManagerProxy, &state, &error);
- if (error) {
- ERROR("DBus: Failed to call get_echo_cancel_state() on ConfigurationManager: %s", error->message);
- g_error_free(error);
+ if (check_error(error))
state = g_strdup("");
- }
return state;
}
void
-dbus_set_echo_cancel_state(gchar *state)
+dbus_set_echo_cancel_state(const gchar *state)
{
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_echo_cancel_state(configurationManagerProxy, state, &error);
-
- if (error) {
- ERROR("DBus: Failed to call set_echo_cancel_state() on ConfigurationManager: %s", error->message);
- g_error_free(error);
- }
+ check_error(error);
}
int
@@ -1504,12 +1338,7 @@ dbus_get_echo_cancel_tail_length(void)
int length = 0;
org_sflphone_SFLphone_ConfigurationManager_get_echo_cancel_tail_length(configurationManagerProxy, &length, &error);
-
- if (error) {
- ERROR("DBus: Failed to call get_echo_cancel_tail_length() on ConfigurationManager: %s", error->message);
- g_error_free(error);
- }
-
+ check_error(error);
return length;
}
@@ -1518,11 +1347,7 @@ dbus_set_echo_cancel_tail_length(int length)
{
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_echo_cancel_tail_length(configurationManagerProxy, length, &error);
-
- if (error) {
- ERROR("DBus: Failed to call get_echo_cancel_state() on ConfigurationManager: %s", error->message);
- g_error_free(error);
- }
+ check_error(error);
}
int
@@ -1530,13 +1355,8 @@ dbus_get_echo_cancel_delay(void)
{
GError *error = NULL;
int delay = 0;
-
org_sflphone_SFLphone_ConfigurationManager_get_echo_cancel_delay(configurationManagerProxy, &delay, &error);
-
- if (error) {
- ERROR("DBus: Failed to call get_echo_cancel_tail_length() on ConfigurationManager: %s", error->message);
- g_error_free(error);
- }
+ check_error(error);
return delay;
}
@@ -1547,11 +1367,7 @@ dbus_set_echo_cancel_delay(int delay)
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_echo_cancel_delay(configurationManagerProxy, delay, &error);
-
- if (error) {
- ERROR("DBus: Failed to call get_echo_cancel_delay() on ConfigurationManager: %s", error->message);
- g_error_free(error);
- }
+ check_error(error);
}
@@ -1559,155 +1375,113 @@ int
dbus_is_iax2_enabled()
{
int res = 0;
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_is_iax2_enabled(
configurationManagerProxy, &res, &error);
-
- if (error)
- g_error_free(error);
+ check_error(error);
return res;
}
void
-dbus_join_participant(const gchar* sel_callID, const gchar* drag_callID)
+dbus_join_participant(const gchar *sel_callID, const gchar *drag_callID)
{
-
DEBUG("DBUS: Join participant %s and %s\n", sel_callID, drag_callID);
-
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_CallManager_join_participant(callManagerProxy,
sel_callID, drag_callID, &error);
-
- if (error)
- g_error_free(error);
-
+ check_error(error);
}
void
dbus_create_conf_from_participant_list(const gchar **list)
{
-
GError *error = NULL;
-
- DEBUG("DBUS: Create conference from participant list");
-
org_sflphone_SFLphone_CallManager_create_conf_from_participant_list(callManagerProxy,
list, &error);
-
- if (error) {
- DEBUG("DBUS: Error: %s", error->message);
- g_error_free(error);
- }
+ check_error(error);
}
void
-dbus_add_participant(const gchar* callID, const gchar* confID)
+dbus_add_participant(const gchar *callID, const gchar *confID)
{
DEBUG("DBUS: Add participant %s to %s\n", callID, confID);
-
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_CallManager_add_participant(callManagerProxy, callID,
- confID, &error);
-
- if (error)
- g_error_free(error);
+ confID, &error);
+ check_error(error);
}
void
-dbus_add_main_participant(const gchar* confID)
+dbus_add_main_participant(const gchar *confID)
{
- DEBUG("DBUS: Add main participant %s\n", confID);
-
- GError* error = NULL;
-
+ GError *error = NULL;
org_sflphone_SFLphone_CallManager_add_main_participant(callManagerProxy,
- confID, &error);
-
- if (error)
- g_error_free(error);
+ confID, &error);
+ check_error(error);
}
void
-dbus_detach_participant(const gchar* callID)
+dbus_detach_participant(const gchar *callID)
{
-
- DEBUG("DBUS: Detach participant %s\n", callID);
-
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_CallManager_detach_participant(callManagerProxy,
- callID, &error);
-
- if (error)
- g_error_free(error);
+ callID, &error);
+ check_error(error);
}
void
-dbus_join_conference(const gchar* sel_confID, const gchar* drag_confID)
+dbus_join_conference(const gchar *sel_confID, const gchar *drag_confID)
{
-
DEBUG("dbus_join_conference %s and %s\n", sel_confID, drag_confID);
-
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_CallManager_join_conference(callManagerProxy,
- sel_confID, drag_confID, &error);
-
- if (error)
- g_error_free(error);
+ sel_confID, drag_confID,
+ &error);
+ check_error(error);
}
void
-dbus_set_record(const gchar* id)
+dbus_set_record(const gchar *id)
{
- DEBUG("Dbus: dbus_set_record %s", id);
-
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_CallManager_set_recording(callManagerProxy, id, &error);
-
- if (error)
- g_error_free(error);
+ check_error(error);
}
gboolean
-dbus_get_is_recording(const callable_obj_t * c)
+dbus_get_is_recording(const callable_obj_t *c)
{
- DEBUG("Dbus: dbus_get_is_recording %s", c->_callID);
- GError* error = NULL;
+ GError *error = NULL;
gboolean isRecording;
org_sflphone_SFLphone_CallManager_get_is_recording(callManagerProxy,
c->_callID, &isRecording, &error);
+ check_error(error);
- if (error)
- g_error_free(error);
-
- //DEBUG("RECORDING: %i",isRecording);
return isRecording;
}
void
-dbus_set_record_path(const gchar* path)
+dbus_set_record_path(const gchar *path)
{
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_record_path(
configurationManagerProxy, path, &error);
- if (error)
- g_error_free(error);
+ check_error(error);
}
-gchar*
+gchar *
dbus_get_record_path(void)
{
- GError* error = NULL;
+ GError *error = NULL;
gchar *path;
org_sflphone_SFLphone_ConfigurationManager_get_record_path(
configurationManagerProxy, &path, &error);
-
- if (error)
- g_error_free(error);
+ check_error(error);
return path;
}
@@ -1717,11 +1491,7 @@ void dbus_set_is_always_recording(const gboolean alwaysRec)
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_is_always_recording(
configurationManagerProxy, alwaysRec, &error);
-
- if (error) {
- ERROR("DBUS: Could not set isAlwaysRecording");
- g_error_free(error);
- }
+ check_error(error);
}
gboolean dbus_get_is_always_recording(void)
@@ -1730,80 +1500,64 @@ gboolean dbus_get_is_always_recording(void)
int alwaysRec;
org_sflphone_SFLphone_ConfigurationManager_get_is_always_recording(
configurationManagerProxy, &alwaysRec, &error);
-
- if (error) {
- ERROR("DBUS: Could not get isAlwaysRecording");
- g_error_free(error);
- }
+ check_error(error);
return alwaysRec;
}
void
-dbus_set_history_limit(const guint days)
+dbus_set_history_limit(guint days)
{
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_history_limit(
configurationManagerProxy, days, &error);
-
- if (error)
- g_error_free(error);
+ check_error(error);
}
guint
dbus_get_history_limit(void)
{
- GError* error = NULL;
+ GError *error = NULL;
gint days = 30;
org_sflphone_SFLphone_ConfigurationManager_get_history_limit(
configurationManagerProxy, &days, &error);
-
- if (error)
- g_error_free(error);
+ check_error(error);
return (guint) days;
}
-void
+void
dbus_clear_history(void)
{
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_clear_history(
configurationManagerProxy, &error);
-
- if (error)
- g_error_free(error);
+ check_error(error);
}
void
dbus_set_audio_manager(const gchar *api)
{
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_audio_manager(
configurationManagerProxy, api, &error);
-
- if (error)
- g_error_free(error);
+ check_error(error);
}
gchar *
dbus_get_audio_manager(void)
{
gchar *api;
- GError* error = NULL;
+ GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_get_audio_manager(
configurationManagerProxy, &api, &error);
-
- if (error) {
- ERROR("Error calling dbus_get_audio_manager");
- g_error_free(error);
- }
+ check_error(error);
return api;
}
-GHashTable*
+GHashTable *
dbus_get_addressbook_settings(void)
{
GError *error = NULL;
@@ -1811,64 +1565,47 @@ dbus_get_addressbook_settings(void)
org_sflphone_SFLphone_ConfigurationManager_get_addressbook_settings(
configurationManagerProxy, &results, &error);
-
- if (error) {
- ERROR("Error calling org_sflphone_SFLphone_ConfigurationManager_get_addressbook_settings");
- g_error_free(error);
- }
+ check_error(error);
return results;
}
void
-dbus_set_addressbook_settings(GHashTable * settings)
+dbus_set_addressbook_settings(GHashTable *settings)
{
-
GError *error = NULL;
-
DEBUG("Calling org_sflphone_SFLphone_ConfigurationManager_set_addressbook_settings");
org_sflphone_SFLphone_ConfigurationManager_set_addressbook_settings(
configurationManagerProxy, settings, &error);
-
- if (error) {
- ERROR("Error calling org_sflphone_SFLphone_ConfigurationManager_set_addressbook_settings");
- g_error_free(error);
- }
+ check_error(error);
}
-gchar**
+gchar **
dbus_get_addressbook_list(void)
{
GError *error = NULL;
- gchar** array = NULL;
+ gchar **array = NULL;
org_sflphone_SFLphone_ConfigurationManager_get_addressbook_list(
configurationManagerProxy, &array, &error);
-
- if (error) {
- ERROR("Error calling org_sflphone_SFLphone_ConfigurationManager_get_addressbook_list");
- g_error_free(error);
- }
+ check_error(error);
return array;
}
void
-dbus_set_addressbook_list(const gchar** list)
+dbus_set_addressbook_list(const gchar **list)
{
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_addressbook_list(
configurationManagerProxy, list, &error);
- if (error) {
- ERROR("Error calling org_sflphone_SFLphone_ConfigurationManager_set_addressbook_list");
- g_error_free(error);
- }
+ check_error(error);
}
-GHashTable*
+GHashTable *
dbus_get_hook_settings(void)
{
GError *error = NULL;
@@ -1876,81 +1613,60 @@ dbus_get_hook_settings(void)
org_sflphone_SFLphone_ConfigurationManager_get_hook_settings(
configurationManagerProxy, &results, &error);
-
- if (error) {
- ERROR("Error calling org_sflphone_SFLphone_ConfigurationManager_get_hook_settings");
- g_error_free(error);
- }
+ check_error(error);
return results;
}
void
-dbus_set_hook_settings(GHashTable * settings)
+dbus_set_hook_settings(GHashTable *settings)
{
GError *error = NULL;
-
org_sflphone_SFLphone_ConfigurationManager_set_hook_settings(
configurationManagerProxy, settings, &error);
-
- if (error) {
- ERROR("Error calling org_sflphone_SFLphone_ConfigurationManager_set_hook_settings");
- g_error_free(error);
- }
+ check_error(error);
}
-GHashTable*
+GHashTable *
dbus_get_call_details(const gchar *callID)
{
GError *error = NULL;
GHashTable *details = NULL;
org_sflphone_SFLphone_CallManager_get_call_details(callManagerProxy, callID,
- &details, &error);
-
- if (error) {
- ERROR("Error calling org_sflphone_SFLphone_CallManager_get_call_details");
- g_error_free(error);
- }
+ &details, &error);
+ check_error(error);
return details;
}
-gchar**
+gchar **
dbus_get_call_list(void)
{
GError *error = NULL;
gchar **list = NULL;
org_sflphone_SFLphone_CallManager_get_call_list(callManagerProxy, &list,
- &error);
-
- if (error) {
- ERROR("Error calling org_sflphone_SFLphone_CallManager_get_call_list");
- g_error_free(error);
- }
+ &error);
+ check_error(error);
return list;
}
-gchar**
+gchar **
dbus_get_conference_list(void)
{
GError *error = NULL;
gchar **list = NULL;
org_sflphone_SFLphone_CallManager_get_conference_list(callManagerProxy,
- &list, &error);
-
- if (error) {
- ERROR("Error calling org_sflphone_SFLphone_CallManager_get_conference_list");
- g_error_free(error);
- }
+ &list, &error);
+ check_error(error);
return list;
}
-gchar**
+gchar **
dbus_get_participant_list(const gchar *confID)
{
GError *error = NULL;
@@ -1959,45 +1675,35 @@ dbus_get_participant_list(const gchar *confID)
DEBUG("DBUS: Get conference %s participant list", confID);
org_sflphone_SFLphone_CallManager_get_participant_list(callManagerProxy,
- confID, &list, &error);
-
- if (error) {
- ERROR("Error calling org_sflphone_SFLphone_CallManager_get_participant_list");
- g_error_free(error);
- }
+ confID, &list,
+ &error);
+ check_error(error);
return list;
}
-GHashTable*
+GHashTable *
dbus_get_conference_details(const gchar *confID)
{
GError *error = NULL;
GHashTable *details = NULL;
org_sflphone_SFLphone_CallManager_get_conference_details(callManagerProxy,
- confID, &details, &error);
-
- if (error) {
- ERROR("Error calling org_sflphone_SFLphone_CallManager_get_conference_details");
- g_error_free(error);
- }
+ confID, &details,
+ &error);
+ check_error(error);
return details;
}
void
-dbus_set_accounts_order(const gchar* order)
+dbus_set_accounts_order(const gchar *order)
{
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_accounts_order(
configurationManagerProxy, order, &error);
-
- if (error) {
- ERROR("Error calling org_sflphone_SFLphone_ConfigurationManager_set_accounts_order");
- g_error_free(error);
- }
+ check_error(error);
}
GPtrArray *
@@ -2008,89 +1714,60 @@ dbus_get_history(void)
org_sflphone_SFLphone_ConfigurationManager_get_history(
configurationManagerProxy, &entries, &error);
-
- if (error) {
- ERROR("Error calling get history simple: %s", error->message);
- g_error_free(error);
- }
+ check_error(error);
return entries;
}
void
-dbus_confirm_sas(const callable_obj_t * c)
+dbus_confirm_sas(const callable_obj_t *c)
{
GError *error = NULL;
org_sflphone_SFLphone_CallManager_set_sa_sverified(callManagerProxy,
- c->_callID, &error);
-
- if (error) {
- ERROR("Failed to call setSASVerified() on CallManager: %s",
- error->message);
- g_error_free(error);
- }
+ c->_callID, &error);
+ check_error(error);
}
void
-dbus_reset_sas(const callable_obj_t * c)
+dbus_reset_sas(const callable_obj_t *c)
{
GError *error = NULL;
org_sflphone_SFLphone_CallManager_reset_sa_sverified(callManagerProxy,
- c->_callID, &error);
-
- if (error) {
- ERROR("Failed to call resetSASVerified on CallManager: %s",
- error->message);
- g_error_free(error);
- }
+ c->_callID, &error);
+ check_error(error);
}
void
-dbus_set_confirm_go_clear(const callable_obj_t * c)
+dbus_set_confirm_go_clear(const callable_obj_t *c)
{
GError *error = NULL;
org_sflphone_SFLphone_CallManager_set_confirm_go_clear(callManagerProxy,
- c->_callID, &error);
-
- if (error) {
- ERROR("Failed to call set_confirm_go_clear on CallManager: %s",
- error->message);
- g_error_free(error);
- }
+ c->_callID, &error);
+ check_error(error);
}
void
-dbus_request_go_clear(const callable_obj_t * c)
+dbus_request_go_clear(const callable_obj_t *c)
{
GError *error = NULL;
org_sflphone_SFLphone_CallManager_request_go_clear(callManagerProxy,
- c->_callID, &error);
-
- if (error) {
- ERROR("Failed to call request_go_clear on CallManager: %s",
- error->message);
- g_error_free(error);
- }
+ c->_callID, &error);
+ check_error(error);
}
-gchar**
+gchar **
dbus_get_supported_tls_method()
{
GError *error = NULL;
- gchar** array = NULL;
+ gchar **array = NULL;
org_sflphone_SFLphone_ConfigurationManager_get_supported_tls_method(
configurationManagerProxy, &array, &error);
-
- if (error) {
- ERROR("Failed to call get_supported_tls_method() on ConfigurationManager: %s",
- error->message);
- g_error_free(error);
- }
+ check_error(error);
return array;
}
-GHashTable*
+GHashTable *
dbus_get_tls_settings_default(void)
{
GError *error = NULL;
@@ -2098,28 +1775,20 @@ dbus_get_tls_settings_default(void)
org_sflphone_SFLphone_ConfigurationManager_get_tls_settings_default(
configurationManagerProxy, &results, &error);
-
- if (error) {
- ERROR("Error calling org_sflphone_SFLphone_ConfigurationManager_get_tls_settings_default");
- g_error_free(error);
- }
+ check_error(error);
return results;
}
gchar *
-dbus_get_address_from_interface_name(gchar* interface)
+dbus_get_address_from_interface_name(const gchar *interface)
{
GError *error = NULL;
- gchar * address = NULL;
+ gchar *address = NULL;
org_sflphone_SFLphone_ConfigurationManager_get_addr_from_interface_name(
configurationManagerProxy, interface, &address, &error);
-
- if (error != NULL) {
- ERROR("Error calling org_sflphone_SFLphone_ConfigurationManager_get_addr_from_interface_name\n");
- g_error_free(error);
- }
+ check_error(error);
return address;
}
@@ -2128,7 +1797,7 @@ gchar **
dbus_get_all_ip_interface(void)
{
GError *error = NULL;
- gchar ** array = NULL;
+ gchar **array = NULL;
if (!org_sflphone_SFLphone_ConfigurationManager_get_all_ip_interface(
configurationManagerProxy, &array, &error)) {
@@ -2149,7 +1818,7 @@ gchar **
dbus_get_all_ip_interface_by_name(void)
{
GError *error = NULL;
- gchar ** array = NULL;
+ gchar **array = NULL;
if (!org_sflphone_SFLphone_ConfigurationManager_get_all_ip_interface_by_name(
configurationManagerProxy, &array, &error)) {
@@ -2160,22 +1829,21 @@ dbus_get_all_ip_interface_by_name(void)
ERROR("Error while calling get_all_ip_interface: %s", error->message);
g_error_free(error);
- } else
- DEBUG("DBus called get_all_ip_interface() on ConfigurationManager");
+ }
return array;
}
-GHashTable*
+GHashTable *
dbus_get_shortcuts(void)
{
GError *error = NULL;
- GHashTable * shortcuts = NULL;
+ GHashTable *shortcuts = NULL;
if (!org_sflphone_SFLphone_ConfigurationManager_get_shortcuts(
configurationManagerProxy, &shortcuts, &error)) {
if (error->domain == DBUS_GERROR &&
- error->code == DBUS_GERROR_REMOTE_EXCEPTION)
+ error->code == DBUS_GERROR_REMOTE_EXCEPTION)
ERROR("Caught remote method (get_shortcuts) exception %s: %s",
dbus_g_error_get_name(error), error->message);
else
@@ -2188,29 +1856,21 @@ dbus_get_shortcuts(void)
}
void
-dbus_set_shortcuts(GHashTable * shortcuts)
+dbus_set_shortcuts(GHashTable *shortcuts)
{
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_shortcuts(
configurationManagerProxy, shortcuts, &error);
- if (error) {
- ERROR("Failed to call set_shortcuts() on ConfigurationManager: %s",
- error->message);
- g_error_free(error);
- }
+ check_error(error);
}
void
-dbus_send_text_message(const gchar* callID, const gchar *message)
+dbus_send_text_message(const gchar *callID, const gchar *message)
{
GError *error = NULL;
- org_sflphone_SFLphone_CallManager_send_text_message(
- callManagerProxy, callID, message, &error);
-
- if (error) {
- ERROR("Failed to call send_text_message() on CallManager: %s",
- error->message);
- g_error_free(error);
- }
+ org_sflphone_SFLphone_CallManager_send_text_message(callManagerProxy,
+ callID, message,
+ &error);
+ check_error(error);
}
diff --git a/gnome/src/dbus/dbus.h b/gnome/src/dbus/dbus.h
index bd4fef7daa644869e13bf415b0735a3bdaedb572..be49560a39944ad2b23acabc28c93b5772c1649c 100644
--- a/gnome/src/dbus/dbus.h
+++ b/gnome/src/dbus/dbus.h
@@ -49,36 +49,36 @@
* Try to connect to DBus services
* @return TRUE if connection succeeded, FALSE otherwise
*/
-gboolean dbus_connect (GError **error);
+gboolean dbus_connect(GError **error);
/**
* Unreferences the proxies
*/
-void dbus_clean ();
+void dbus_clean();
/**
* CallManager - Hold a call
* @param c The call to hold
*/
-void dbus_hold (const callable_obj_t * c);
+void dbus_hold(const callable_obj_t *c);
/**
* CallManager - Unhold a call
* @param c The call to unhold
*/
-void dbus_unhold (const callable_obj_t * c);
+void dbus_unhold(const callable_obj_t *c);
/**
* CallManager - Hang up a call
* @param c The call to hang up
*/
-void dbus_hang_up (const callable_obj_t * c);
+void dbus_hang_up(const callable_obj_t *c);
/**
* CallManager - Transfer a call
* @param c The call to transfer
*/
-void dbus_transfer (const callable_obj_t * c);
+void dbus_transfer(const callable_obj_t *c);
/**
* CallManager - Perform an attended transfer on two calls
@@ -91,39 +91,39 @@ void dbus_attended_transfer(const callable_obj_t *, const callable_obj_t *);
* CallManager - Accept a call
* @param c The call to accept
*/
-void dbus_accept (const callable_obj_t * c);
+void dbus_accept(const callable_obj_t *c);
/**
* CallManager - Refuse a call
* @param c The call to refuse
*/
-void dbus_refuse (const callable_obj_t * c);
+void dbus_refuse(const callable_obj_t *c);
/**
* CallManager - Place a call
* @param c The call to place
*/
-void dbus_place_call (const callable_obj_t * c);
+void dbus_place_call(const callable_obj_t *c);
/**
* ConfigurationManager - Get the list of the setup accounts
* @return gchar** The list of accounts
*/
-gchar ** dbus_account_list();
+gchar **dbus_account_list();
/**
* ConfigurationManager - Get the details of a specific account
* @param accountID The unique of the account
* @return GHashTable* The details of the account
*/
-GHashTable * dbus_get_account_details (gchar * accountID);
+GHashTable *dbus_get_account_details(const gchar *accountID);
/**
* ConfigurationManager - Set the details of a specific account
* @param a The account to update
*/
-void dbus_set_account_details (account_t *a);
+void dbus_set_account_details(account_t *a);
/**
* ConfigurationManager - Set the additional credential information
@@ -132,7 +132,7 @@ void dbus_set_account_details (account_t *a);
* if it cannot be found.
* @param a The account to update
*/
-void dbus_set_credentials (account_t *a);
+void dbus_set_credentials(account_t *a);
/**
* ConfigurationManager - Set the additional credential information
@@ -141,12 +141,12 @@ void dbus_set_credentials (account_t *a);
* if it cannot be found.
* @param a The account to update
*/
-void dbus_get_credentials (account_t *a);
+void dbus_get_credentials(account_t *a);
/**
* ConfigurationManager - Get the details for the ip2ip profile
*/
-GHashTable * dbus_get_ip2_ip_details (void);
+GHashTable *dbus_get_ip2_ip_details(void);
/**
* ConfigurationManager - Send registration request
@@ -155,38 +155,38 @@ GHashTable * dbus_get_ip2_ip_details (void);
* 0 for unregistration request
* 1 for registration request
*/
-void dbus_send_register (gchar* accountID, gboolean enable);
+void dbus_send_register(const gchar *accountID, gboolean enable);
/**
* ConfigurationManager - Add an account to the list
* @param a The account to add
*/
-void dbus_add_account (account_t *a);
+void dbus_add_account(account_t *a);
/**
* ConfigurationManager - Remove an account from the list
* @param accountID The account to remove
*/
-void dbus_remove_account (gchar * accountID);
+void dbus_remove_account(const gchar *accountID);
/**
* ConfigurationManager - Set volume for speaker/mic
* @param device The speaker or the mic
* @param value The new value
*/
-void dbus_set_volume (const gchar * device, gdouble value);
+void dbus_set_volume(const gchar *device, gdouble value);
/**
* ConfigurationManager - Get the volume of a device
* @param device The speaker or the mic
*/
-gdouble dbus_get_volume (const gchar * device);
+gdouble dbus_get_volume(const gchar *device);
/**
* ConfigurationManager - Play DTMF
* @param key The DTMF to send
*/
-void dbus_play_dtmf (const gchar * key);
+void dbus_play_dtmf(const gchar *key);
/**
* ConfigurationManager - Get the audio codecs list
@@ -199,82 +199,82 @@ GArray *dbus_audio_codec_list();
* @param payload The payload of the audio codec
* @return gchar** The audio codec details
*/
-gchar** dbus_audio_codec_details (int payload);
+gchar **dbus_audio_codec_details(int payload);
/**
* ConfigurationManager - Get the default audio codec list
* The default audio codec list are the audio codecs selected by the server if the user hasn't made any changes
* @return gchar** The default audio codec list
*/
-gchar** dbus_default_audio_codec_list();
+gchar **dbus_default_audio_codec_list();
/**
* ConfigurationManager - Get the list of the audio codecs used for media negotiation
* @return The list of audio codecs
*/
-GArray *dbus_get_active_audio_codec_list (gchar *accountID);
+GArray *dbus_get_active_audio_codec_list(const gchar *accountID);
/**
* ConfigurationManager - Set the list of audio codecs used for media negociation
* @param list The list of audio codecs
*/
-void dbus_set_active_audio_codec_list (const gchar** list, const gchar*);
+void dbus_set_active_audio_codec_list(const gchar **list, const gchar *);
/**
* CallManager - return the audio codec name
* @param callable_obj_t* current call
*/
-gchar* dbus_get_current_audio_codec_name (const callable_obj_t * c);
+gchar *dbus_get_current_audio_codec_name(const callable_obj_t *c);
/**
* ConfigurationManager - Get the list of available output audio plugins
* @return gchar** The list of plugins
*/
-gchar** dbus_get_audio_plugin_list();
+gchar **dbus_get_audio_plugin_list();
/**
* ConfigurationManager - Select an input audio plugin
* @param audioPlugin The string description of the plugin
*/
-void dbus_set_audio_plugin (gchar* audioPlugin);
+void dbus_set_audio_plugin(const gchar *audioPlugin);
/**
* ConfigurationManager - Get the list of available output audio devices
* @return gchar** The list of devices
*/
-gchar** dbus_get_audio_output_device_list();
+gchar **dbus_get_audio_output_device_list();
/**
* ConfigurationManager - Select an output audio device
* @param index The index of the soundcard
*/
-void dbus_set_audio_output_device (const int index);
+void dbus_set_audio_output_device(int index);
/**
* ConfigurationManager - Get the list of available input audio devices
* @return gchar** The list of devices
*/
-gchar** dbus_get_audio_input_device_list();
+gchar **dbus_get_audio_input_device_list();
/**
* ConfigurationManager - Select an input audio device
* @param index The index of the soundcard
*/
-void dbus_set_audio_input_device (const int index);
+void dbus_set_audio_input_device(int index);
/**
* ConfigurationManager - Get the current audio devices
* @return gchar** The index of the current soundcard
*/
-gchar** dbus_get_current_audio_devices_index();
+gchar **dbus_get_current_audio_devices_index();
/**
* ConfigurationManager - Get the index of the specified audio device
* @param name The string description of the audio device
* @return int The index of the device
*/
-int dbus_get_audio_device_index (const gchar* name);
+int dbus_get_audio_device_index(const gchar *name);
/**
* ConfigurationManager - Get the current output audio plugin
@@ -283,19 +283,19 @@ int dbus_get_audio_device_index (const gchar* name);
* plughw
* dmix
*/
-gchar* dbus_get_current_audio_output_plugin();
+gchar *dbus_get_current_audio_output_plugin();
/**
* ConfigurationManager - Get the current noise suppressor state
* @return gchar* The state (enabled/disabled)
*/
-gchar *dbus_get_noise_suppress_state (void);
+gchar *dbus_get_noise_suppress_state(void);
/**
* ConfigurationManager - Set the current noise suppressor state
* @param gchar* The state (enabled/disabled)
*/
-void dbus_set_noise_suppress_state (gchar *state);
+void dbus_set_noise_suppress_state(const gchar *state);
/**
* ConfigurationManager - Get the current echo cancel state
@@ -307,7 +307,7 @@ gchar *dbus_get_echo_cancel_state(void);
* ConfigurationManager - Set the current echo cancel state
* @param gchar* The state (enabled/disabled)
*/
-void dbus_set_echo_cancel_state(gchar *state);
+void dbus_set_echo_cancel_state(const gchar *state);
int dbus_get_echo_cancel_tail_length(void);
@@ -322,32 +322,32 @@ void dbus_set_echo_cancel_delay(int delay);
* @return int 1 if IAX2 is enabled
* 0 otherwise
*/
-int dbus_is_iax2_enabled (void);
+int dbus_is_iax2_enabled(void);
/**
* ConfigurationManager - Gives the maximum number of days the user wants to have in the history
* @return double The maximum number of days
*/
-guint dbus_get_history_limit (void);
+guint dbus_get_history_limit(void);
/**
* ConfigurationManager - Gives the maximum number of days the user wants to have in the history
*/
-void dbus_set_history_limit (const guint days);
+void dbus_set_history_limit(guint days);
/**
* ConfigurationManager - Returns the selected audio manager
* @return "alsa"
* or "pulseaudio"
*/
-gchar *dbus_get_audio_manager (void);
+gchar *dbus_get_audio_manager(void);
/**
* ConfigurationManager - Set the audio manager
* @param api "alsa"
* "pulseaudio"
*/
-void dbus_set_audio_manager (const gchar *api);
+void dbus_set_audio_manager(const gchar *api);
/**
* ConfigurationManager - Start a tone when a new call is open and no numbers have been dialed
@@ -356,7 +356,7 @@ void dbus_set_audio_manager (const gchar *api);
* @param type TONE_WITH_MESSAGE
* TONE_WITHOUT_MESSAGE
*/
-void dbus_start_tone (const int start , const guint type);
+void dbus_start_tone(int start, guint type);
/**
* Instance - Send registration request to dbus service.
@@ -365,43 +365,43 @@ void dbus_start_tone (const int start , const guint type);
* @param name The string description of the client. Here : GTK+ Client
* @param error return location for a GError or NULL
*/
-gboolean dbus_register (int pid, gchar * name, GError **error);
+gboolean dbus_register(int pid, const gchar *name, GError **error);
/**
* Instance - Send unregistration request to dbus services
* @param pid The pid of the processus
*/
-void dbus_unregister (int pid);
+void dbus_unregister(int pid);
-void dbus_set_sip_address (const gchar* address);
+void dbus_set_sip_address(const gchar *address);
-gint dbus_get_sip_address (void);
+gint dbus_get_sip_address(void);
/**
* Add a participant (callID) to this conference (confID)
*/
-void dbus_add_participant (const gchar* callID, const gchar* confID);
+void dbus_add_participant(const gchar *callID, const gchar *confID);
/**
* Return a list of participant for this conference (confID)
*/
-gchar** dbus_get_participant_list (const gchar *confID);
+gchar **dbus_get_participant_list(const gchar *confID);
/**
* Toggle recording for this instance, may be call or conference
*/
-void dbus_set_record (const gchar * id);
+void dbus_set_record(const gchar *id);
/**
* Set the path where the recorded audio files will be stored
*/
-void dbus_set_record_path (const gchar *path);
+void dbus_set_record_path(const gchar *path);
/**
* Get the path where the recorded audio files are stored
*/
-gchar* dbus_get_record_path (void);
+gchar *dbus_get_record_path(void);
/**
* Set the always recording functionality, once true all call
@@ -419,57 +419,57 @@ gboolean dbus_get_is_always_recording(void);
* Encapsulate all the address book-related configuration
* Get the configuration
*/
-GHashTable* dbus_get_addressbook_settings (void);
+GHashTable* dbus_get_addressbook_settings(void);
/**
* Encapsulate all the address book-related configuration
* Set the configuration
*/
-void dbus_set_addressbook_settings (GHashTable *);
+void dbus_set_addressbook_settings(GHashTable *);
-gchar** dbus_get_addressbook_list (void);
+gchar **dbus_get_addressbook_list(void);
-void dbus_set_addressbook_list (const gchar** list);
+void dbus_set_addressbook_list(const gchar **list);
/**
* Resolve the local address given an interface name
*/
-gchar * dbus_get_address_from_interface_name (gchar* interface);
+gchar * dbus_get_address_from_interface_name(const gchar *interface);
/**
* Query the daemon to return a list of network interface (described as there IP address)
*/
-gchar** dbus_get_all_ip_interface (void);
+gchar **dbus_get_all_ip_interface(void);
/**
* Query the daemon to return a list of network interface (described as there name)
*/
-gchar** dbus_get_all_ip_interface_by_name (void);
+gchar **dbus_get_all_ip_interface_by_name(void);
/**
* Encapsulate all the url hook-related configuration
* Get the configuration
*/
-GHashTable* dbus_get_hook_settings (void);
+GHashTable* dbus_get_hook_settings(void);
/**
* Encapsulate all the url hook-related configuration
* Set the configuration
*/
-void dbus_set_hook_settings (GHashTable *);
+void dbus_set_hook_settings(GHashTable *);
-gboolean dbus_get_is_recording (const callable_obj_t *);
+gboolean dbus_get_is_recording(const callable_obj_t *);
-GHashTable* dbus_get_call_details (const gchar* callID);
+GHashTable *dbus_get_call_details(const gchar *callID);
-gchar** dbus_get_call_list (void);
+gchar **dbus_get_call_list(void);
-GHashTable* dbus_get_conference_details (const gchar* confID);
+GHashTable* dbus_get_conference_details(const gchar *confID);
-gchar** dbus_get_conference_list (void);
+gchar **dbus_get_conference_list(void);
-void dbus_set_accounts_order (const gchar* order);
+void dbus_set_accounts_order(const gchar *order);
/**
* Get a the history
@@ -479,75 +479,75 @@ GPtrArray *dbus_get_history(void);
void dbus_clear_history(void);
-void sflphone_display_transfer_status (const gchar* message);
+void sflphone_display_transfer_status(const gchar *message);
/**
* CallManager - Confirm Short Authentication String
* for a given callId
* @param c The call to confirm SAS
*/
-void dbus_confirm_sas (const callable_obj_t * c);
+void dbus_confirm_sas(const callable_obj_t *c);
/**
* CallManager - Reset Short Authentication String
* for a given callId
* @param c The call to reset SAS
*/
-void dbus_reset_sas (const callable_obj_t * c);
+void dbus_reset_sas(const callable_obj_t *c);
/**
* CallManager - Request Go Clear in the ZRTP Protocol
* for a given callId
* @param c The call that we want to go clear
*/
-void dbus_request_go_clear (const callable_obj_t * c);
+void dbus_request_go_clear(const callable_obj_t *c);
/**
* CallManager - Accept Go Clear request from remote
* for a given callId
* @param c The call to confirm
*/
-void dbus_set_confirm_go_clear (const callable_obj_t * c);
+void dbus_set_confirm_go_clear(const callable_obj_t *c);
/**
* CallManager - Get the list of supported TLS methods from
* the server in textual form.
* @return an array of string representing supported methods
*/
-gchar** dbus_get_supported_tls_method();
+gchar **dbus_get_supported_tls_method();
-GHashTable* dbus_get_shortcuts (void);
+GHashTable* dbus_get_shortcuts(void);
-void dbus_set_shortcuts (GHashTable * shortcuts);
+void dbus_set_shortcuts(GHashTable *shortcuts);
-void dbus_set_audio_ringtone_device (const int index);
+void dbus_set_audio_ringtone_device(int index);
void
-dbus_hang_up_conference (const conference_obj_t * c);
+dbus_hang_up_conference(const conference_obj_t *c);
void
-dbus_hold_conference (const conference_obj_t * c);
+dbus_hold_conference(const conference_obj_t *c);
void
-dbus_unhold_conference (const conference_obj_t * c);
+dbus_unhold_conference(const conference_obj_t *c);
void
-dbus_detach_participant (const gchar* callID);
+dbus_detach_participant(const gchar *callID);
void
-dbus_join_participant (const gchar* sel_callID, const gchar* drag_callID);
+dbus_join_participant(const gchar *sel_callID, const gchar *drag_callID);
void
dbus_create_conf_from_participant_list(const gchar **list);
void
-dbus_join_conference (const gchar* sel_confID, const gchar* drag_confID);
+dbus_join_conference(const gchar *sel_confID, const gchar *drag_confID);
void
-dbus_add_main_participant (const gchar* confID);
+dbus_add_main_participant(const gchar *confID);
/* Instant messaging */
-void dbus_send_text_message (const gchar* callID, const gchar *message);
+void dbus_send_text_message(const gchar *callID, const gchar *message);
/**
* Start playback of a recorded
diff --git a/kde/src/dbus/callmanager-introspec.xml b/kde/src/dbus/callmanager-introspec.xml
index 62535f06029b78689ae8629ff981f3f0ef8dcbae..645a776d00cdb23af14f9d4dca3fae42835df746 100755
--- a/kde/src/dbus/callmanager-introspec.xml
+++ b/kde/src/dbus/callmanager-introspec.xml
@@ -671,7 +671,7 @@
</arg>
</signal>
- <signal name="transferSucceded" tp:name-for-bindings="transferSucceded">
+ <signal name="transferSucceeded" tp:name-for-bindings="transferSucceeded">
<tp:docstring>
<p>Transfer has been successfully
processed. Client should remove transfered
@@ -682,7 +682,7 @@
<signal name="transferFailed" tp:name-for-bindings="transferFailed">
<tp:docstring>
- <p>Transfer operation failed. Corespondin
+ <p>Transfer operation failed. Corresponding
call is no longer accessible in
SFLphone-daemon.</p>
</tp:docstring>