Skip to content
Snippets Groups Projects
Commit fecf8200 authored by Julien Bonjean's avatar Julien Bonjean
Browse files

Fixed some warnings

parent 5fb27ebe
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
sflphone-gtk/src/dbus.c
+ 126
− 126
View file @ fecf8200
......@@ -3,22 +3,22 @@
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@savoirfairelinux.com>
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <calltab.h>
#include <callmanager-glue.h>
#include <configurationmanager-glue.h>
......@@ -40,7 +40,7 @@ DBusGProxy * callManagerProxy;
DBusGProxy * configurationManagerProxy;
DBusGProxy * instanceProxy;
static void
static void
incoming_call_cb (DBusGProxy *proxy UNUSED,
const gchar* accountID,
const gchar* callID,
......@@ -53,7 +53,7 @@ incoming_call_cb (DBusGProxy *proxy UNUSED,
c->callID = g_strdup(callID);
c->from = g_strdup(from);
c->state = CALL_STATE_INCOMING;
#if GTK_CHECK_VERSION(2,10,0)
#if GTK_CHECK_VERSION(2,10,0)
status_tray_icon_blink( TRUE );
#endif
notify_incoming_call( c );
......@@ -70,7 +70,7 @@ curent_selected_codec (DBusGProxy *proxy UNUSED,
sflphone_display_selected_codec (codecName);
}
static void
static void
volume_changed_cb (DBusGProxy *proxy UNUSED,
const gchar* device,
const gdouble value,
......@@ -80,7 +80,7 @@ volume_changed_cb (DBusGProxy *proxy UNUSED,
set_slider(device, value);
}
static void
static void
voice_mail_cb (DBusGProxy *proxy UNUSED,
const gchar* accountID,
const guint nb,
......@@ -90,17 +90,17 @@ voice_mail_cb (DBusGProxy *proxy UNUSED,
sflphone_notify_voice_mail (accountID , nb);
}
static void
static void
incoming_message_cb (DBusGProxy *proxy UNUSED,
const gchar* accountID UNUSED,
const gchar* msg,
void * foo UNUSED )
{
g_print ("Message %s! \n",msg);
}
static void
static void
call_state_cb (DBusGProxy *proxy UNUSED,
const gchar* callID,
const gchar* state,
......@@ -151,8 +151,8 @@ call_state_cb (DBusGProxy *proxy UNUSED,
{
sflphone_busy (c);
}
}
else
}
else
{ //The callID is unknow, threat it like a new call
if ( strcmp(state, "RINGING") == 0 )
{
......@@ -167,7 +167,7 @@ call_state_cb (DBusGProxy *proxy UNUSED,
}
}
static void
static void
accounts_changed_cb (DBusGProxy *proxy UNUSED,
void * foo UNUSED )
{
......@@ -176,7 +176,7 @@ accounts_changed_cb (DBusGProxy *proxy UNUSED,
config_window_fill_account_list();
}
static void
static void
error_alert(DBusGProxy *proxy UNUSED,
int errCode,
void * foo UNUSED )
......@@ -185,18 +185,18 @@ error_alert(DBusGProxy *proxy UNUSED,
sflphone_throw_exception( errCode );
}
gboolean
gboolean
dbus_connect ()
{
GError *error = NULL;
connection = NULL;
instanceProxy = NULL;
g_type_init ();
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (error)
{
g_printerr ("Failed to open connection to bus: %s\n",
......@@ -206,95 +206,95 @@ dbus_connect ()
}
/* Create a proxy object for the "bus driver" (name "org.freedesktop.DBus") */
instanceProxy = dbus_g_proxy_new_for_name (connection,
"org.sflphone.SFLphone",
"/org/sflphone/SFLphone/Instance",
"org.sflphone.SFLphone.Instance");
if (instanceProxy==NULL)
if (instanceProxy==NULL)
{
g_printerr ("Failed to get proxy to Instance\n");
return FALSE;
}
g_print ("DBus connected to Instance\n");
callManagerProxy = dbus_g_proxy_new_for_name (connection,
"org.sflphone.SFLphone",
"/org/sflphone/SFLphone/CallManager",
"org.sflphone.SFLphone.CallManager");
if (callManagerProxy==NULL)
if (callManagerProxy==NULL)
{
g_printerr ("Failed to get proxy to CallManagers\n");
return FALSE;
}
g_print ("DBus connected to CallManager\n");
/* Incoming call */
dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_STRING_STRING,
dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_STRING_STRING,
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_add_signal (callManagerProxy,
dbus_g_proxy_add_signal (callManagerProxy,
"incomingCall", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (callManagerProxy,
"incomingCall", G_CALLBACK(incoming_call_cb), NULL, NULL);
/* Current codec */
dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_STRING_STRING,
dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_STRING_STRING,
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_add_signal (callManagerProxy,
dbus_g_proxy_add_signal (callManagerProxy,
"currentSelectedCodec", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (callManagerProxy,
"currentSelectedCodec", G_CALLBACK(curent_selected_codec), NULL, NULL);
/* Register a marshaller for STRING,STRING */
dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_STRING,
dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_STRING,
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_add_signal (callManagerProxy,
dbus_g_proxy_add_signal (callManagerProxy,
"callStateChanged", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (callManagerProxy,
"callStateChanged", G_CALLBACK(call_state_cb), NULL, NULL);
dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_INT,
dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_INT,
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID);
dbus_g_proxy_add_signal (callManagerProxy,
dbus_g_proxy_add_signal (callManagerProxy,
"voiceMailNotify", G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (callManagerProxy,
"voiceMailNotify", G_CALLBACK(voice_mail_cb), NULL, NULL);
dbus_g_proxy_add_signal (callManagerProxy,
dbus_g_proxy_add_signal (callManagerProxy,
"incomingMessage", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (callManagerProxy,
"incomingMessage", G_CALLBACK(incoming_message_cb), NULL, NULL);
dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_DOUBLE,
dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__STRING_DOUBLE,
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_INVALID);
dbus_g_proxy_add_signal (callManagerProxy,
dbus_g_proxy_add_signal (callManagerProxy,
"volumeChanged", G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (callManagerProxy,
"volumeChanged", G_CALLBACK(volume_changed_cb), NULL, NULL);
configurationManagerProxy = dbus_g_proxy_new_for_name (connection,
"org.sflphone.SFLphone",
"/org/sflphone/SFLphone/ConfigurationManager",
"org.sflphone.SFLphone.ConfigurationManager");
if (!configurationManagerProxy)
if (!configurationManagerProxy)
{
g_printerr ("Failed to get proxy to ConfigurationManager\n");
return FALSE;
}
g_print ("DBus connected to ConfigurationManager\n");
dbus_g_proxy_add_signal (configurationManagerProxy,
dbus_g_proxy_add_signal (configurationManagerProxy,
"accountsChanged", G_TYPE_INVALID);
dbus_g_proxy_connect_signal (configurationManagerProxy,
"accountsChanged", G_CALLBACK(accounts_changed_cb), NULL, NULL);
dbus_g_object_register_marshaller(g_cclosure_user_marshal_VOID__INT,
G_TYPE_NONE, G_TYPE_INT , G_TYPE_INVALID);
dbus_g_proxy_add_signal (configurationManagerProxy,
dbus_g_proxy_add_signal (configurationManagerProxy,
"errorAlert", G_TYPE_INT , G_TYPE_INVALID);
dbus_g_proxy_connect_signal (configurationManagerProxy,
"errorAlert", G_CALLBACK(error_alert), NULL, NULL);
......@@ -315,12 +315,12 @@ dbus_hold (const call_t * c)
{
GError *error = NULL;
org_sflphone_SFLphone_CallManager_hold ( callManagerProxy, c->callID, &error);
if (error)
if (error)
{
g_printerr ("Failed to call hold() on CallManager: %s\n",
error->message);
g_error_free (error);
}
}
}
void
......@@ -328,12 +328,12 @@ dbus_unhold (const call_t * c)
{
GError *error = NULL;
org_sflphone_SFLphone_CallManager_unhold ( callManagerProxy, c->callID, &error);
if (error)
if (error)
{
g_printerr ("Failed to call unhold() on CallManager: %s\n",
error->message);
g_error_free (error);
}
}
}
void
......@@ -341,12 +341,12 @@ dbus_hang_up (const call_t * c)
{
GError *error = NULL;
org_sflphone_SFLphone_CallManager_hang_up ( callManagerProxy, c->callID, &error);
if (error)
if (error)
{
g_printerr ("Failed to call hang_up() on CallManager: %s\n",
error->message);
g_error_free (error);
}
}
}
void
......@@ -354,12 +354,12 @@ dbus_transfert (const call_t * c)
{
GError *error = NULL;
org_sflphone_SFLphone_CallManager_transfert ( callManagerProxy, c->callID, c->to, &error);
if (error)
if (error)
{
g_printerr ("Failed to call transfert() on CallManager: %s\n",
error->message);
g_error_free (error);
}
}
}
void
......@@ -370,12 +370,12 @@ dbus_accept (const call_t * c)
#endif
GError *error = NULL;
org_sflphone_SFLphone_CallManager_accept ( callManagerProxy, c->callID, &error);
if (error)
if (error)
{
g_printerr ("Failed to call accept(%s) on CallManager: %s\n", c->callID,
(error->message == NULL ? g_quark_to_string(error->domain): error->message));
g_error_free (error);
}
}
}
void
......@@ -386,12 +386,12 @@ dbus_refuse (const call_t * c)
#endif
GError *error = NULL;
org_sflphone_SFLphone_CallManager_refuse ( callManagerProxy, c->callID, &error);
if (error)
if (error)
{
g_printerr ("Failed to call refuse() on CallManager: %s\n",
error->message);
g_error_free (error);
}
}
}
......@@ -400,12 +400,12 @@ dbus_place_call (const call_t * c)
{
GError *error = NULL;
org_sflphone_SFLphone_CallManager_place_call ( callManagerProxy, c->accountID, c->callID, c->to, &error);
if (error)
if (error)
{
g_printerr ("Failed to call placeCall() on CallManager: %s\n",
error->message);
g_error_free (error);
}
}
}
gchar** dbus_account_list()
......@@ -433,7 +433,7 @@ GHashTable* dbus_account_details(gchar * accountID)
{
GError *error = NULL;
GHashTable * details;
if(!org_sflphone_SFLphone_ConfigurationManager_get_account_details( configurationManagerProxy, accountID, &details, &error))
{
if(error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION)
......@@ -453,12 +453,12 @@ dbus_send_register ( gchar* accountID , const guint expire)
{
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_send_register ( configurationManagerProxy, accountID, expire ,&error);
if (error)
if (error)
{
g_printerr ("Failed to call send_register() on ConfigurationManager: %s\n",
error->message);
g_error_free (error);
}
}
}
void
......@@ -466,15 +466,15 @@ dbus_remove_account(gchar * accountID)
{
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_remove_account (
configurationManagerProxy,
accountID,
configurationManagerProxy,
accountID,
&error);
if (error)
if (error)
{
g_printerr ("Failed to call remove_account() on ConfigurationManager: %s\n",
error->message);
g_error_free (error);
}
}
}
void
......@@ -482,16 +482,16 @@ dbus_set_account_details(account_t *a)
{
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_set_account_details (
configurationManagerProxy,
a->accountID,
a->properties,
configurationManagerProxy,
a->accountID,
a->properties,
&error);
if (error)
if (error)
{
g_printerr ("Failed to call set_account_details() on ConfigurationManager: %s\n",
error->message);
g_error_free (error);
}
}
}
void
......@@ -499,15 +499,15 @@ dbus_add_account(account_t *a)
{
GError *error = NULL;
org_sflphone_SFLphone_ConfigurationManager_add_account (
configurationManagerProxy,
a->properties,
configurationManagerProxy,
a->properties,
&error);
if (error)
if (error)
{
g_printerr ("Failed to call add_account() on ConfigurationManager: %s\n",
error->message);
g_error_free (error);
}
}
}
void
......@@ -515,17 +515,17 @@ dbus_set_volume(const gchar * device, gdouble value)
{
GError *error = NULL;
org_sflphone_SFLphone_CallManager_set_volume(
callManagerProxy,
device,
value,
callManagerProxy,
device,
value,
&error);
if (error)
if (error)
{
g_printerr ("Failed to call set_volume() on callManagerProxy: %s\n",
error->message);
g_error_free (error);
}
}
}
......@@ -534,19 +534,19 @@ dbus_get_volume(const gchar * device)
{
gdouble value;
GError *error = NULL;
org_sflphone_SFLphone_CallManager_get_volume(
callManagerProxy,
device,
&value,
callManagerProxy,
device,
&value,
&error);
if (error)
if (error)
{
g_printerr ("Failed to call get_volume() on callManagerProxy: %s\n",
error->message);
g_error_free (error);
}
}
return value;
}
......@@ -555,74 +555,74 @@ void
dbus_play_dtmf(const gchar * key)
{
GError *error = NULL;
org_sflphone_SFLphone_CallManager_play_dt_mf(
callManagerProxy,
key,
callManagerProxy,
key,
&error);
if (error)
if (error)
{
g_printerr ("Failed to call playDTMF() on callManagerProxy: %s\n",
error->message);
g_error_free (error);
}
}
}
void
dbus_start_tone(const int start , const guint type )
{
GError *error = NULL;
org_sflphone_SFLphone_CallManager_start_tone(
callManagerProxy,
callManagerProxy,
start,
type,
type,
&error);
if (error)
if (error)
{
g_printerr ("Failed to call startTone() on callManagerProxy: %s\n",
error->message);
g_error_free (error);
}
}
}
void
dbus_register(int pid, gchar * name)
{
GError *error = NULL;
org_sflphone_SFLphone_Instance_register(
instanceProxy,
pid,
name,
instanceProxy,
pid,
name,
&error);
if (error)
if (error)
{
g_printerr ("Failed to call register() on instanceProxy: %s\n",
error->message);
g_error_free (error);
}
}
}
void
void
dbus_unregister(int pid)
{
GError *error = NULL;
org_sflphone_SFLphone_Instance_unregister(
instanceProxy,
pid,
instanceProxy,
pid,
&error);
if (error)
if (error)
{
g_printerr ("Failed to call unregister() on instanceProxy: %s\n",
error->message);
g_error_free (error);
}
}
}
gchar**
......@@ -669,12 +669,12 @@ dbus_codec_details( int payload )
gchar*
dbus_get_current_codec_name(const call_t * c)
{
printf("dbus_get_current_codec_name : CallID : %s \n", c->callID);
gchar* codecName;
GError* error = NULL;
org_sflphone_SFLphone_CallManager_get_current_codec_name (
callManagerProxy,
c->callID,
......@@ -684,10 +684,10 @@ dbus_get_current_codec_name(const call_t * c)
{
g_error_free(error);
}
printf("dbus_get_current_codec_name : codecName : %s \n", codecName);
return codecName;
return codecName;
}
......@@ -758,7 +758,7 @@ dbus_get_output_audio_plugin_list()
{
gchar** array;
GError* error = NULL;
if(!org_sflphone_SFLphone_ConfigurationManager_get_output_audio_plugin_list( configurationManagerProxy, &array, &error))
{
if(error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION)
......@@ -920,7 +920,7 @@ dbus_get_audio_device_index(const gchar *name)
}
/**
* Get audio plugin
* Get audio plugin
*/
gchar*
dbus_get_current_audio_output_plugin()
......@@ -1123,16 +1123,16 @@ dbus_set_record(const call_t * c)
}
}
gboolean*
gboolean
dbus_get_is_recording(const call_t * c)
{
g_print("calling dbus_get_is_recording on CallManager\n");
GError* error = NULL;
gboolean* isRecording = NULL;
gboolean isRecording;
org_sflphone_SFLphone_CallManager_get_is_recording (
callManagerProxy,
c->callID,
&isRecording,
callManagerProxy,
c->callID,
&isRecording,
&error);
if(error)
{
......@@ -1321,7 +1321,7 @@ dbus_get_mail_notify( void )
g_print("Error calling dbus_get_mail_notif_level\n");
g_error_free(error);
}
return (guint)level;
}
......@@ -1353,7 +1353,7 @@ dbus_get_audio_manager( void )
g_print("Error calling dbus_get_audio_manager\n");
g_error_free(error);
}
return api;
}
......@@ -1457,7 +1457,7 @@ gint dbus_stun_is_enabled (void)
void dbus_enable_stun (void)
{
GError* error = NULL;
org_sflphone_SFLphone_ConfigurationManager_enable_stun(
configurationManagerProxy,
......@@ -1474,13 +1474,13 @@ GHashTable* dbus_get_addressbook_settings (void) {
GHashTable *results = NULL;
//g_print ("Calling org_sflphone_SFLphone_ConfigurationManager_get_addressbook_settings\n");
org_sflphone_SFLphone_ConfigurationManager_get_addressbook_settings (configurationManagerProxy, &results, &error);
if (error){
g_print ("Error calling org_sflphone_SFLphone_ConfigurationManager_get_addressbook_settings\n");
g_error_free (error);
}
return results;
}
......@@ -1489,7 +1489,7 @@ void dbus_set_addressbook_settings (GHashTable * settings){
GError *error = NULL;
g_print ("Calling org_sflphone_SFLphone_ConfigurationManager_set_addressbook_settings\n");
org_sflphone_SFLphone_ConfigurationManager_set_addressbook_settings (configurationManagerProxy, settings, &error);
if (error){
g_print ("Error calling org_sflphone_SFLphone_ConfigurationManager_set_addressbook_settings\n");
......@@ -1503,13 +1503,13 @@ GHashTable* dbus_get_hook_settings (void) {
GHashTable *results = NULL;
//g_print ("Calling org_sflphone_SFLphone_ConfigurationManager_get_addressbook_settings\n");
org_sflphone_SFLphone_ConfigurationManager_get_hook_settings (configurationManagerProxy, &results, &error);
if (error){
g_print ("Error calling org_sflphone_SFLphone_ConfigurationManager_get_hook_settings\n");
g_error_free (error);
}
return results;
}
......
sflphone-gtk/src/dbus.h
+ 40
− 40
View file @ fecf8200
......@@ -3,17 +3,17 @@
* Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Guillaume Carmel-Archambault <guillaume.carmel-archambault@savoirfairelinux.com>
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
......@@ -32,9 +32,9 @@
* @brief General DBus functions wrappers.
*/
/**
/**
* Try to connect to DBus services
* @return TRUE if connection succeeded, FALSE otherwise
* @return TRUE if connection succeeded, FALSE otherwise
*/
gboolean dbus_connect ();
......@@ -88,26 +88,26 @@ void dbus_place_call (const call_t * c);
/**
* ConfigurationManager - Get the list of the setup accounts
* @return gchar** The list of accounts
* @return gchar** The list of accounts
*/
gchar ** dbus_account_list();
/**
* ConfigurationManager - Get the details of a specific account
* @param accountID The unique of the account
* @param accountID The unique of the account
* @return GHashTable* The details of the account
*/
GHashTable * dbus_account_details(gchar * accountID);
/**
* ConfigurationManager - Set the details of a specific account
* @param a The account to update
* @param a The account to update
*/
void dbus_set_account_details(account_t *a);
/**
* ConfigurationManager - Send registration request
* @param accountID The account to register/unregister
* @param accountID The account to register/unregister
* @param expire The flag for the type of registration
* 0 for unregistration request
* 1 for registration request
......@@ -116,18 +116,18 @@ void dbus_send_register( gchar* accountID , const guint expire );
/**
* ConfigurationManager - Add an account to the list
* @param a The account to add
* @param a The account to add
*/
void dbus_add_account(account_t *a);
/**
* ConfigurationManager - Remove an account from the list
* @param accountID The account to remove
* @param accountID The account to remove
*/
void dbus_remove_account(gchar * accountID);
/**
* ConfigurationManager - Set volume for speaker/mic
* ConfigurationManager - Set volume for speaker/mic
* @param device The speaker or the mic
* @param value The new value
*/
......@@ -141,18 +141,18 @@ gdouble dbus_get_volume(const gchar * device);
/**
* ConfigurationManager - Play DTMF
* @param key The DTMF to send
* @param key The DTMF to send
*/
void dbus_play_dtmf(const gchar * key);
/**
* ConfigurationManager - Get the codecs list
* @return gchar** The list of codecs
* ConfigurationManager - Get the codecs list
* @return gchar** The list of codecs
*/
gchar** dbus_codec_list();
/**
* ConfigurationManager - Get the codec details
* ConfigurationManager - Get the codec details
* @param payload The payload of the codec
* @return gchar** The codec details
*/
......@@ -160,8 +160,8 @@ gchar** dbus_codec_details(int payload);
/**
* ConfigurationManager - Get the default codec list
* The default codec list are the codecs selected by the server if the user hasn't made any changes
* @return gchar** The default codec list
* The default codec list are the codecs selected by the server if the user hasn't made any changes
* @return gchar** The default codec list
*/
gchar** dbus_default_codec_list();
......@@ -246,7 +246,7 @@ int dbus_get_audio_device_index(const gchar* name);
/**
* ConfigurationManager - Get the current output audio plugin
* @return gchar* The current plugin
* @return gchar* The current plugin
* default
* plughw
* dmix
......@@ -262,31 +262,31 @@ int dbus_is_iax2_enabled( void );
/**
* ConfigurationManager - Query the server about the ringtone option.
* If ringtone is enabled, ringtone on incoming call use custom choice. If not, only standart tone.
* If ringtone is enabled, ringtone on incoming call use custom choice. If not, only standart tone.
* @return int 1 if enabled
* 0 otherwise
*/
int dbus_is_ringtone_enabled( void );
/**
* ConfigurationManager - Set the ringtone option
* ConfigurationManager - Set the ringtone option
* Inverse current value
*/
void dbus_ringtone_enabled( void );
/**
* ConfigurationManager - Set PA behaviour for the other sound streams
* ConfigurationManager - Set PA behaviour for the other sound streams
* Inverse current value
*/
void dbus_set_pulse_app_volume_control( void );
/**
* ConfigurationManager - Get PA behaviour for the other sound streams
* ConfigurationManager - Get PA behaviour for the other sound streams
*/
int dbus_get_pulse_app_volume_control( void );
/**
* ConfigurationManager - Get the ringtone
* ConfigurationManager - Get the ringtone
* @return gchar* The file name selected as a ringtone
*/
gchar* dbus_get_ringtone_choice( void );
......@@ -303,7 +303,7 @@ void dbus_set_ringtone_choice( const gchar* tone );
void dbus_set_dialpad( );
/**
* ConfigurationManager - Tells if the user wants to display the dialpad or not
* ConfigurationManager - Tells if the user wants to display the dialpad or not
* @return int 1 if dialpad has to be displayed
* 0 otherwise
*/
......@@ -315,7 +315,7 @@ int dbus_get_dialpad( void );
void dbus_set_searchbar( );
/**
* ConfigurationManager - Tells if the user wants to display the search bar or not
* ConfigurationManager - Tells if the user wants to display the search bar or not
* @return int 1 if the search bar has to be displayed
* 0 otherwise
*/
......@@ -327,7 +327,7 @@ int dbus_get_searchbar( void );
void dbus_set_volume_controls( );
/**
* ConfigurationManager - Tells if the user wants to display the volume controls or not
* ConfigurationManager - Tells if the user wants to display the volume controls or not
* @return int 1 if the controls have to be displayed
* 0 otherwise
*/
......@@ -340,13 +340,13 @@ int dbus_get_volume_controls( void );
void dbus_start_hidden( void );
/**
* ConfigurationManager - Gives the maximum number of calls the user wants to have in the history
* ConfigurationManager - Gives the maximum number of calls the user wants to have in the history
* @return double The maximum number of calls
*/
guint dbus_get_max_calls( void );
/**
* ConfigurationManager - Gives the maximum number of calls the user wants to have in the history
* ConfigurationManager - Gives the maximum number of calls the user wants to have in the history
*/
void dbus_set_max_calls( const guint calls );
/**
......@@ -357,7 +357,7 @@ void dbus_set_max_calls( const guint calls );
int dbus_is_start_hidden( void );
/**
* ConfigurationManager - Configure the popup behaviour
* ConfigurationManager - Configure the popup behaviour
* When SFLphone is in the system tray, you can configure when it popups
* Never or only on incoming calls
*/
......@@ -366,27 +366,27 @@ void dbus_switch_popup_mode( void );
/**
* ConfigurationManager - Configure the popup behaviour
* @return int 1 if it should popup on incoming calls
* 0 if it should never popups
* 0 if it should never popups
*/
int dbus_popup_mode( void );
/**
* ConfigurationManager - Returns the selected audio manager
* @return int 0 ALSA
* 1 PULSEAUDIO
* 1 PULSEAUDIO
*/
int dbus_get_audio_manager( void );
/**
* ConfigurationManager - Set the audio manager
* @param api 0 ALSA
* 1 PULSEAUDIO
* 1 PULSEAUDIO
*/
void dbus_set_audio_manager( int api );
/**
* ConfigurationManager - Configure the notification level
* @return int 0 disable
* @return int 0 disable
* 1 enable
*/
guint dbus_get_notify( void );
......@@ -398,7 +398,7 @@ void dbus_set_notify( void );
/**
* ConfigurationManager - Configure the mail notification level
* @return int 0 disable
* @return int 0 disable
* 1 enable
*/
guint dbus_get_mail_notify( void );
......@@ -409,15 +409,15 @@ guint dbus_get_mail_notify( void );
void dbus_set_mail_notify( void );
/**
* ConfigurationManager - Start a tone when a new call is open and no numbers have been dialed
* ConfigurationManager - Start a tone when a new call is open and no numbers have been dialed
* @param start 1 to start
* 0 to stop
* @param type TONE_WITH_MESSAGE
* TONE_WITHOUT_MESSAGE
* TONE_WITHOUT_MESSAGE
*/
void dbus_start_tone(const int start , const guint type);
void dbus_start_tone(const int start , const guint type);
/**
/**
* Instance - Send registration request to dbus service.
* Manage the instances of clients connected to the server
* @param pid The pid of the processus client
......@@ -471,6 +471,6 @@ GHashTable* dbus_get_hook_settings (void);
void dbus_set_hook_settings (GHashTable *);
gboolean dbus_get_is_recording(const call_t *);
#endif
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