diff --git a/sflphone-client-gnome/src/accountlist.h b/sflphone-client-gnome/src/accountlist.h index 51f3c878e71c8fcb9d829d4f2f30fdff693b2143..346f87cc79d7346c37ce0f98df7def6046d55fe7 100644 --- a/sflphone-client-gnome/src/accountlist.h +++ b/sflphone-client-gnome/src/accountlist.h @@ -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; diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c index ff0c693730ee40d0bad7c3854c9d725a37e9f203..601414d77f372cba6a4c057055e97f6130c10b69 100644 --- a/sflphone-client-gnome/src/actions.c +++ b/sflphone-client-gnome/src/actions.c @@ -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); diff --git a/sflphone-client-gnome/src/callable_obj.c b/sflphone-client-gnome/src/callable_obj.c index 4ea86bc699539254b05b435f48df7f1126ebb203..61d4c1e21a158155ab53cf15282eb20d2b93e65b 100644 --- a/sflphone-client-gnome/src/callable_obj.c +++ b/sflphone-client-gnome/src/callable_obj.c @@ -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) diff --git a/sflphone-client-gnome/src/codeclist.c b/sflphone-client-gnome/src/codeclist.c index cd90fb4efa217090663702eb1cd1075c2e7ab08b..1e27bf8c1ee1ee99865276bda50a57a987cda1d5 100644 --- a/sflphone-client-gnome/src/codeclist.c +++ b/sflphone-client-gnome/src/codeclist.c @@ -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) diff --git a/sflphone-client-gnome/src/codeclist.h b/sflphone-client-gnome/src/codeclist.h index e825e148c90c0ecc0b50674168af0e68fb93eeed..80e1520c3a0f2b74a3d3d86d339bffa7a9934fbb 100644 --- a/sflphone-client-gnome/src/codeclist.h +++ b/sflphone-client-gnome/src/codeclist.h @@ -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 diff --git a/sflphone-client-gnome/src/config/accountconfigdialog.c b/sflphone-client-gnome/src/config/accountconfigdialog.c index 27dd8fbaf0d825188297eaa488fdfcd763338476..f261b40f40dbfcebe261c63119a22154f092ec36 100644 --- a/sflphone-client-gnome/src/config/accountconfigdialog.c +++ b/sflphone-client-gnome/src/config/accountconfigdialog.c @@ -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) { diff --git a/sflphone-client-gnome/src/config/audioconf.c b/sflphone-client-gnome/src/config/audioconf.c index ce85d94dea9343190aa00e5360259c7221f3c088..b508aa36fefb8292065b1e319e62f894b3798ee4 100644 --- a/sflphone-client-gnome/src/config/audioconf.c +++ b/sflphone-client-gnome/src/config/audioconf.c @@ -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);