Skip to content
Snippets Groups Projects
Commit d73e1b4a authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

[#2365] Fixes bad cast

parent 40974937
No related branches found
No related tags found
No related merge requests found
...@@ -304,9 +304,9 @@ void sflphone_fill_ip2ip_profile(void) ...@@ -304,9 +304,9 @@ void sflphone_fill_ip2ip_profile(void)
ip2ip_profile = (GHashTable *) dbus_get_ip2_ip_details(); ip2ip_profile = (GHashTable *) dbus_get_ip2_ip_details();
} }
GHashTable * sflphone_get_ip2ip_properties(void) void sflphone_get_ip2ip_properties (GHashTable **properties)
{ {
return ip2ip_profile; *properties = ip2ip_profile;
} }
void void
......
...@@ -159,7 +159,7 @@ void sflphone_fill_ip2ip_profile(void); ...@@ -159,7 +159,7 @@ void sflphone_fill_ip2ip_profile(void);
* @return The internal hash table representing * @return The internal hash table representing
* the settings for the ip2ip profile. * the settings for the ip2ip profile.
*/ */
GHashTable * sflphone_get_ip2ip_properties(void); void sflphone_get_ip2ip_properties (GHashTable **properties);
/** /**
* Initialize the accounts data structure * Initialize the accounts data structure
......
...@@ -179,7 +179,8 @@ GtkWidget* create_direct_ip_calls_tab() ...@@ -179,7 +179,8 @@ GtkWidget* create_direct_ip_calls_tab()
gchar * curKeyExchange = "0"; gchar * curKeyExchange = "0";
gchar * description; gchar * description;
directIpCallsProperties = sflphone_get_ip2ip_properties(); //directIpCallsProperties = sflphone_get_ip2ip_properties();
sflphone_get_ip2ip_properties(&directIpCallsProperties);
if(directIpCallsProperties != NULL) { if(directIpCallsProperties != NULL) {
DEBUG("got a directIpCallsProperties"); DEBUG("got a directIpCallsProperties");
......
...@@ -269,7 +269,7 @@ row_single_click(GtkTreeView *tree_view UNUSED, void * data UNUSED) ...@@ -269,7 +269,7 @@ row_single_click(GtkTreeView *tree_view UNUSED, void * data UNUSED)
DEBUG("Display SAS once %s", displaySasOnce); DEBUG("Display SAS once %s", displaySasOnce);
} else { } else {
GHashTable * properties = NULL; GHashTable * properties = NULL;
properties = sflphone_get_ip2ip_properties(); sflphone_get_ip2ip_properties (&properties);
if(properties != NULL) if(properties != NULL)
{ displaySasOnce = g_hash_table_lookup(properties, ACCOUNT_DISPLAY_SAS_ONCE); DEBUG("IP2IP displaysasonce %s", displaySasOnce); } { displaySasOnce = g_hash_table_lookup(properties, ACCOUNT_DISPLAY_SAS_ONCE); DEBUG("IP2IP displaysasonce %s", displaySasOnce); }
} }
...@@ -539,7 +539,7 @@ calltree_update_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent) ...@@ -539,7 +539,7 @@ calltree_update_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
{ display_sas = FALSE; } { display_sas = FALSE; }
} else { } else {
GHashTable * properties = NULL; GHashTable * properties = NULL;
properties = sflphone_get_ip2ip_properties(); sflphone_get_ip2ip_properties (&properties);
if(properties != NULL) { if(properties != NULL) {
if(g_strcasecmp(g_hash_table_lookup(properties, ACCOUNT_ZRTP_DISPLAY_SAS),"false") == 0) if(g_strcasecmp(g_hash_table_lookup(properties, ACCOUNT_ZRTP_DISPLAY_SAS),"false") == 0)
{ display_sas = FALSE; } { display_sas = FALSE; }
......
...@@ -385,7 +385,7 @@ main_window_zrtp_not_supported(callable_obj_t * c) ...@@ -385,7 +385,7 @@ main_window_zrtp_not_supported(callable_obj_t * c)
} else { } else {
DEBUG("Account is null callID %s", c->_callID); DEBUG("Account is null callID %s", c->_callID);
GHashTable * properties = NULL; GHashTable * properties = NULL;
properties = sflphone_get_ip2ip_properties(); sflphone_get_ip2ip_properties (&properties);
if(properties != NULL) if(properties != NULL)
{ warning_enabled = g_hash_table_lookup(properties, ACCOUNT_ZRTP_NOT_SUPP_WARNING); } { warning_enabled = g_hash_table_lookup(properties, ACCOUNT_ZRTP_NOT_SUPP_WARNING); }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment