diff --git a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
index 8c8fc90c0018ebafec8e87e1376b5dc59c52f209..8ca26faf75d5e62086486a83848be75a0955b180 100755
--- a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
+++ b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
@@ -101,29 +101,15 @@
</arg>
</method>
- <method name="setNumberOfCredential" tp:name-for-bindings="setNumberOfCredential">
+ <method name="deleteAllCredential" tp:name-for-bindings="deleteAllCredential">
<tp:docstring>
</tp:docstring>
<arg type="s" name="accountID" direction="in">
- <tp:docstring>
- </tp:docstring>
- </arg>
- <arg type="i" name="number" direction="in">
<tp:docstring>
</tp:docstring>
</arg>
</method>
- <method name="deleteAllCredential" tp:name-for-bindings="deleteAllCredential">
- <tp:docstring>
- </tp:docstring>
- <arg type="s" name="accountID" direction="in">
- <tp:docstring>
- Account ID
- </tp:docstring>
- </arg>
- </method>
-
<method name="getIp2IpDetails" tp:name-for-bindings="getIp2IpDetails">
<tp:docstring>
Get configuration settings of the IP2IP_PROFILE. They are sligthly different from account settings since no VoIP accounts are involved.
@@ -207,55 +193,55 @@
<method name="addAccount" tp:name-for-bindings="addAccount">
<tp:docstring>
- Add a new account. When created, the signal <tp:member-ref>accountsChanged</tp:member-ref> is emitted. The clients must then call <tp:member-ref>getAccountList</tp:member-ref> to update their internal data structure.
- <tp:rationale>If no details are specified, the default parameters are used.</tp:rationale>
- <tp:rationale>The core tries to register the account as soon it is created.</tp:rationale>
+ Add a new account. When created, the signal <tp:member-ref>accountsChanged</tp:member-ref> is emitted. The clients must then call <tp:member-ref>getAccountList</tp:member-ref> to update their internal data structure.
+ <tp:rationale>If no details are specified, the default parameters are used.</tp:rationale>
+ <tp:rationale>The core tries to register the account as soon it is created.</tp:rationale>
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="in" tp:type="String_String_Map">
- <tp:docstring>
- The new account settings
- </tp:docstring>
+ <tp:docstring>
+ The new account settings
+ </tp:docstring>
</arg>
<arg type="s" name="createdAccountId" direction="out">
- <tp:docstring>
- A new account ID
- </tp:docstring>
+ <tp:docstring>
+ A new account ID
+ </tp:docstring>
</arg>
</method>
<method name="setAccountsOrder" tp:name-for-bindings="setAccountsOrder">
<tp:docstring>
- Update the accounts order.
- <tp:rationale>When placing a call, the first registered account in the list is used.</tp:rationale>
+ Update the accounts order.
+ <tp:rationale>When placing a call, the first registered account in the list is used.</tp:rationale>
</tp:docstring>
<arg type="s" name="order" direction="in">
- <tp:docstring>
- An ordered list of account IDs, delimited by '/'
- </tp:docstring>
+ <tp:docstring>
+ An ordered list of account IDs, delimited by '/'
+ </tp:docstring>
</arg>
</method>
<method name="removeAccount" tp:name-for-bindings="removeAccount">
- <tp:docstring>
- Remove an existing account. When removed, the signal <tp:member-ref>accountsChanged</tp:member-ref> is emitted. The clients must then call <tp:member-ref>getAccountList</tp:member-ref> to update their internal data structure.
- </tp:docstring>
- <arg type="s" name="accoundID" direction="in">
- <tp:docstring>
- The account to remove, identified by its ID
- </tp:docstring>
- </arg>
+ <tp:docstring>
+ Remove an existing account. When removed, the signal <tp:member-ref>accountsChanged</tp:member-ref> is emitted. The clients must then call <tp:member-ref>getAccountList</tp:member-ref> to update their internal data structure.
+ </tp:docstring>
+ <arg type="s" name="accoundID" direction="in">
+ <tp:docstring>
+ The account to remove, identified by its ID
+ </tp:docstring>
+ </arg>
</method>
<method name="getAccountList" tp:name-for-bindings="getAccountList">
- <tp:docstring>
- Get a list of all created accounts, as stored by the core.
- </tp:docstring>
+ <tp:docstring>
+ Get a list of all created accounts, as stored by the core.
+ </tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
- <tp:docstring>
- A list of account IDs
- </tp:docstring>
+ <tp:docstring>
+ A list of account IDs
+ </tp:docstring>
</arg>
</method>
@@ -268,15 +254,15 @@
@param[in] input accountID
-->
<arg type="s" name="accountID" direction="in">
- <tp:docstring>
- The account ID
- </tp:docstring>
+ <tp:docstring>
+ The account ID
+ </tp:docstring>
</arg>
<arg type="i" name="expire" direction="in">
- <tp:docstring>
- <p>To register, expire must be 1.</p>
- <p>To un-register, expire must be 0.</p>
- </tp:docstring>
+ <tp:docstring>
+ <p>To register, expire must be 1.</p>
+ <p>To un-register, expire must be 0.</p>
+ </tp:docstring>
</arg>
</method>
@@ -285,14 +271,13 @@
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
- <tp:docstring>
- </tp:docstring>
+ <tp:docstring>
+ </tp:docstring>
</arg>
</method>
<method name="getVersion" tp:name-for-bindings="getVersion">
<tp:docstring>
- Return SFLphone-daemon version
</tp:docstring>
<arg type="s" name="version" direction="out">
<tp:docstring>
@@ -302,19 +287,16 @@
<method name="getRingtoneList" tp:name-for-bindings="getRingtoneList">
<tp:docstring>
- Return a list of valid Sun's .au sound file used
- as ringtones.
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
- <tp:docstring>
- </tp:docstring>
+ <tp:docstring>
+ </tp:docstring>
</arg>
</method>
<method name="getPlaybackDeviceList" tp:name-for-bindings="getPlaybackDeviceList">
<tp:docstring>
- Provide a list of playback device from ALSA
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
@@ -325,7 +307,6 @@
<method name="getRecordDeviceList" tp:name-for-bindings="getRecordDeviceList">
<tp:docstring>
- Provide a list of record device from ALSA
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
@@ -336,7 +317,6 @@
<method name="isRingtoneEnabled" tp:name-for-bindings="isRingtoneEnabled">
<tp:docstring>
- Return true if ringtone is enabled, false otherwise
</tp:docstring>
<arg type="s" name="accountID" direction="in" />
<arg type="i" name="bool" direction="out">
@@ -353,24 +333,21 @@
<method name="getRingtoneChoice" tp:name-for-bindings="getRingtoneChoice">
<tp:docstring>
- Get current ringtone .au file selected
</tp:docstring>
<arg type="s" name="accountID" direction="in"/>
<arg type="s" name="tone" direction="out">
- <tp:docstring>
- </tp:docstring>
+ <tp:docstring>
+ </tp:docstring>
</arg>
</method>
<method name="setRingtoneChoice" tp:name-for-bindings="setRingtoneChoice">
<tp:docstring>
- Set current ringtone .au file from list acquired using <tp:member-ref>getAccountList</tp:member-ref>
</tp:docstring>
<arg type="s" name="accountID" direction="in"/>
<arg type="s" name="tone" direction="in">
- <tp:docstring>
- A valid .au file path
- </tp:docstring>
+ <tp:docstring>
+ </tp:docstring>
</arg>
</method>
@@ -669,7 +646,6 @@
</arg>
</method>
-
<!-- Addressbook configuration -->
<method name="getAddressbookSettings" tp:name-for-bindings="getAddressbookSettings">
<tp:docstring>
@@ -748,144 +724,92 @@
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
<arg type="a{ss}" name="entries" direction="in">
- <tp:docstring>
- </tp:docstring>
+ <tp:docstring>
+ </tp:docstring>
</arg>
</method>
<signal name="accountsChanged" tp:name-for-bindings="accountsChanged">
- <tp:docstring>
- Signal emited on account changes. Clients should update
- all account status with <tp:member-ref>getAccountDetails</tp:member-ref>
- iterating over the list provided by <tp:member-ref>getAccountList</tp:member-ref>
- </tp:docstring>
</signal>
<signal name="errorAlert" tp:name-for-bindings="errorAlert">
<arg type="i" name="code">
- <tp:docstring>
- </tp:docstring>
+ <tp:docstring>
+ </tp:docstring>
</arg>
</signal>
<!-- TLS Methods -->
<method name="getSupportedTlsMethod" tp:name-for-bindings="getSupportedTlsMethod">
<tp:docstring>
- Provide a list of supported TLS method
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
- <tp:docstring>
- A list of TLS method: (TLSv1, SSLv1, SSLv2,
- SSLv3, SSLv23)
- </tp:docstring>
+ <tp:docstring>
+ </tp:docstring>
</arg>
</method>
<method name="getTlsSettingsDefault" tp:name-for-bindings="getTlsSettingsDefault">
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<tp:docstring>
- Get default TLS setting for new accounts
</tp:docstring>
<arg type="a{ss}" name="details" direction="out">
- <tp:docstring>
- A hash table containing details. Refer
- to <tp:member-ref>getTlsSettings</tp:member-ref>
- for possible keys
- </tp:docstring>
+ <tp:docstring>
+ </tp:docstring>
</arg>
</method>
<method name="getTlsSettings" tp:name-for-bindings="getTlsSettings">
<tp:docstring>
- Get current TLS setting for a specific account
</tp:docstring>
- <arg type="s" name="accountID" direction="in">
- <tp:docstring>
- The account ID
- </tp:docstring>
- </arg>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="out">
- <tp:docstring>
- A hash table containing details with key:
- <ul>
- <li>"TLS.listenerPort": valid numerical port</li>
- <li>"TLS.enable": true/false</li>
- <li>"TLS.certificateListFile": A valid path to
- a .pem file containing CA certificate</li>
- <li>"TLS.certificateFile": A valid path to a
- file containing the public end-point
- certificate (optional)</li>
- <li>"TLS.privateKeyFile": A valid path to a
- file containing the public end-point private
- key (optional)</li>
- <li>"TLS.password": Public end-point private
- key password (optional)</li>
- <li>"TLS.method": (TLSv1, SSLv1, SSLv2,
- SSLv3, SSLv23)</li>
- </ul>
- </tp:docstring>
+ <tp:docstring>
+ </tp:docstring>
</arg>
</method>
<method name="setTlsSettings" tp:name-for-bindings="setTlsSettings">
<tp:docstring>
- Update TLS setting for a specific account
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="MapStringString"/>
- <arg type="s" name="accountID" direction="in">
- <tp:docstring>
- The account ID
- </tp:docstring>
- </arg>
<arg type="a{ss}" name="details" direction="in">
- <tp:docstring>
- A hash table containing details. Refer
- to <tp:member-ref>getTlsSettings</tp:member-ref>
- for possible keys.
- </tp:docstring>
+ <tp:docstring>
+ </tp:docstring>
</arg>
</method>
<method name="getAddrFromInterfaceName" tp:name-for-bindings="getAddrFromInterfaceName">
<tp:docstring>
- Resolve interface IPv4 address provided its name.
</tp:docstring>
<arg type="s" name="interface" direction="in">
- <tp:docstring>
- Interface name
- </tp:docstring>
+ <tp:docstring>
+ </tp:docstring>
</arg>
<arg type="s" name="address" direction="out">
- <tp:docstring>
- Interface IPv4 address
- </tp:docstring>
+ <tp:docstring>
+ </tp:docstring>
</arg>
</method>
<method name="getAllIpInterface" tp:name-for-bindings="getAllIpInterface">
<tp:docstring>
- Provide a list of IP interface's IPv4 address.
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
- <tp:docstring>
- A list of interface's IPv4 address
- </tp:docstring>
+ <tp:docstring>
+ </tp:docstring>
</arg>
</method>
<method name="getAllIpInterfaceByName" tp:name-for-bindings="getAllIpInterfaceByName">
<tp:docstring>
- Provide a list of IP interface's name: default
- (0.0.0.0), lo, eth0 ...
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
- <tp:docstring>
- A list of interface's name
- </tp:docstring>
+ <tp:docstring>
+ </tp:docstring>
</arg>
</method>
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index 2b6fcd70ac93be7e0a7c32ad260f0394db7a76a8..fc7f2f0cbe5f2a8f8e32b73a5b3c0384cf9b9e3f 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -938,22 +938,6 @@ dbus_set_credential(account_t *a, int index)
}
}
void
-dbus_set_number_of_credential(account_t *a, int number)
-{
- DEBUG("Sending number of credential %d to server", number);
- GError *error = NULL;
-
- org_sflphone_SFLphone_ConfigurationManager_set_number_of_credential(
- configurationManagerProxy, a->accountID, number, &error);
-
- if (error)
- {
- ERROR ("Failed to call set_number_of_credential() on ConfigurationManager: %s",
- error->message);
- g_error_free(error);
- }
-}
-void
dbus_delete_all_credential(account_t *a)
{
DEBUG("Deleting all credentials\n");
diff --git a/sflphone-client-gnome/src/dbus/dbus.h b/sflphone-client-gnome/src/dbus/dbus.h
index 03370a5ddcfcb238c71bdd221594fa825fafa1ed..1a6cc9249a8f855a5794d495a0eed1d5381f9c37 100644
--- a/sflphone-client-gnome/src/dbus/dbus.h
+++ b/sflphone-client-gnome/src/dbus/dbus.h
@@ -145,13 +145,6 @@ int dbus_get_number_of_credential(gchar * accountID);
*/
void dbus_delete_all_credential(account_t *a);
-/**
- * ConfigurationManager - Set the number of credential that
- * is being used.
- * @param a The account id
- */
-void dbus_set_number_of_credential(account_t *a, int number);
-
/**
* ConfigurationManager - Set the additional credential information
* of a specific account, for a specific credential index.
diff --git a/sflphone-client-gnome/src/eel-gconf-extensions.c b/sflphone-client-gnome/src/eel-gconf-extensions.c
index 2bc4ab804f5d6d16e3bf586a9de8b189cba02fb0..88b43dc30701559bc34f8c12a015ee5340137938 100644
--- a/sflphone-client-gnome/src/eel-gconf-extensions.c
+++ b/sflphone-client-gnome/src/eel-gconf-extensions.c
@@ -587,7 +587,7 @@ gpdf_notification_add (const char *key,
callback_data);
if (notifiers != NULL) {
*notifiers = g_list_append(*notifiers,
- (gpointer)id);
+ GINT_TO_POINTER(id));
}
}