Skip to content
Snippets Groups Projects
Commit f6e9dd98 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #10736: conferencelist: fixed invalid cast

parent 3ab5624c
No related branches found
No related tags found
No related merge requests found
...@@ -94,11 +94,11 @@ void conferencelist_add(calltab_t *tab, const conference_obj_t* conf) ...@@ -94,11 +94,11 @@ void conferencelist_add(calltab_t *tab, const conference_obj_t* conf)
} }
void conferencelist_remove(calltab_t *tab, const gchar* const conf) void conferencelist_remove(calltab_t *tab, const gchar* const conf_id)
{ {
DEBUG("ConferenceList: Remove conference %s", conf); DEBUG("ConferenceList: Remove conference %s", conf_id);
if (conf == NULL) { if (conf_id == NULL) {
ERROR("ConferenceList: Error: Conf id is NULL"); ERROR("ConferenceList: Error: Conf id is NULL");
return; return;
} }
...@@ -108,11 +108,10 @@ void conferencelist_remove(calltab_t *tab, const gchar* const conf) ...@@ -108,11 +108,10 @@ void conferencelist_remove(calltab_t *tab, const gchar* const conf)
return; return;
} }
gchar *c = (gchar*) conferencelist_get(tab, conf); conference_obj_t *c = conferencelist_get(tab, conf_id);
if (c == NULL) { if (c == NULL)
return; return;
}
g_queue_remove(tab->conferenceQueue, c); g_queue_remove(tab->conferenceQueue, c);
} }
...@@ -128,9 +127,8 @@ conference_obj_t* conferencelist_get(calltab_t *tab, const gchar* const conf_id) ...@@ -128,9 +127,8 @@ conference_obj_t* conferencelist_get(calltab_t *tab, const gchar* const conf_id)
GList *c = g_queue_find_custom(tab->conferenceQueue, conf_id, is_confID_confstruct); GList *c = g_queue_find_custom(tab->conferenceQueue, conf_id, is_confID_confstruct);
if (c == NULL) { if (c == NULL)
return NULL; return NULL;
}
return (conference_obj_t*) c->data; return (conference_obj_t*) c->data;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment