Commit de9df68b authored by Julien Bonjean's avatar Julien Bonjean

[#2181] Fixed gnome client issues

parent 554a372a
......@@ -67,7 +67,7 @@ typedef struct {
gchar * accountID;
account_state_t state;
gchar * protocol_state_description;
guint * protocol_state_code;
guint protocol_state_code;
GHashTable * properties;
GPtrArray * credential_information;
} account_t;
......
......@@ -1085,7 +1085,7 @@ sflphone_fill_codec_list()
for(pl=codecs; *codecs; codecs++)
{
details = (gchar **)dbus_codec_details(atoi(*codecs));
if(codec_list_get_by_payload(atoi(*codecs))!=NULL){
if(codec_list_get_by_payload((gconstpointer) atoi(*codecs))!=NULL){
// does nothing - the codec is already in the list, so is active.
}
else{
......@@ -1155,7 +1155,7 @@ void sflphone_fill_conference_list(void)
c = g_new0(conference_obj_t, 1);
conf_id = (gchar*)(*conferences);
conference_details = dbus_get_conference_details(conf_id);
conference_details = (GHashTable*) dbus_get_conference_details(conf_id);
create_new_call_from_details (conf_id, conference_details, &c);
c->_confID = g_strdup(conf_id);
......
......@@ -164,7 +164,7 @@ void create_history_entry_from_serialized_form (gchar *timestamp, gchar *details
// details is in serialized form, i e: calltype%to%from%callid
if ((ptr = strtok(details, delim)) != NULL) {
if ((ptr = g_strsplit(details, delim,0)) != NULL) {
do {
switch (token)
{
......@@ -187,7 +187,7 @@ void create_history_entry_from_serialized_form (gchar *timestamp, gchar *details
break;
}
token ++;
} while ((ptr = strtok(NULL, delim)) != NULL);
} while ((ptr = g_strsplit(NULL, delim, 0)) != NULL);
}
if (g_strcasecmp (peer_name, "empty") == 0)
......
......@@ -103,7 +103,7 @@ codec_list_get_by_name( const gchar* name)
}
codec_t*
codec_list_get_by_payload( const int payload)
codec_list_get_by_payload(gconstpointer payload)
{
GList * c = g_queue_find_custom(codecQueue, payload, is_payload_codecstruct);
if(c)
......
......@@ -117,6 +117,6 @@ void codec_list_move_codec_down(guint index);
*/
void codec_list_update_to_daemon();
codec_t* codec_list_get_by_payload( const int payload);
codec_t* codec_list_get_by_payload(gconstpointer payload);
#endif
......@@ -710,7 +710,7 @@ GtkWidget * create_advanced_tab(account_t **a)
GtkTreeIter current_local_address_iter = iter;
gchar ** iface_list = NULL;
iface_list = dbus_get_all_ip_interface();
iface_list = (gchar **)dbus_get_all_ip_interface();
gchar ** iface = NULL;
if (iface_list != NULL) {
......
......@@ -396,11 +396,11 @@ codec_active_toggled(GtkCellRendererToggle *renderer UNUSED, gchar *path, gpoint
// codec_list_get_by_name(name);
if ((g_strcasecmp(name,"speex")==0) && (g_strcasecmp(srate,"8 kHz")==0))
codec = codec_list_get_by_payload(110);
codec = codec_list_get_by_payload((gconstpointer) 110);
else if ((g_strcasecmp(name,"speex")==0) && (g_strcasecmp(srate,"16 kHz")==0))
codec = codec_list_get_by_payload(111);
codec = codec_list_get_by_payload((gconstpointer) 111);
else if ((g_strcasecmp(name,"speex")==0) && (g_strcasecmp(srate,"32 kHz")==0))
codec = codec_list_get_by_payload(112);
codec = codec_list_get_by_payload((gconstpointer) 112);
else
codec = codec_list_get_by_name(name);
......
Markdown is supported
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