Commit 561492a9 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

gnome: actions.c parameter doesn't have to be a double pointer

parent 4e6f29fa
...@@ -1050,40 +1050,29 @@ sflphone_rec_call() ...@@ -1050,40 +1050,29 @@ sflphone_rec_call()
void sflphone_fill_codec_list () void sflphone_fill_codec_list ()
{ {
guint account_list_size; guint account_list_size = account_list_get_size();
guint i;
account_t *current = NULL;
DEBUG ("SFLphone: Fill codec list"); for (guint i = 0; i < account_list_size; i++) {
account_t *current = account_list_get_nth(i);
account_list_size = account_list_get_size ();
for (i=0; i<account_list_size; i++) {
current = account_list_get_nth (i);
if (current) if (current)
sflphone_fill_codec_list_per_account (&current); sflphone_fill_codec_list_per_account(current);
} }
} }
void sflphone_fill_codec_list_per_account (account_t **account) void sflphone_fill_codec_list_per_account (account_t *account)
{ {
gchar **order; gchar **order = dbus_get_active_audio_codec_list(account->accountID);
gchar** pl;
GQueue *codeclist;
order = (gchar**) dbus_get_active_audio_codec_list ( (*account)->accountID);
codeclist = (*account)->codecs; GQueue *codeclist = account->codecs;
// First clean the list // First clean the list
codec_list_clear (&codeclist); codec_list_clear(&codeclist);
if (!(*order)) if (!(*order))
ERROR ("SFLphone: No codec list provided"); ERROR ("SFLphone: No codec list provided");
else { else {
for (pl = order; *pl; pl++) { for (gchar **pl = order; *pl; pl++) {
codec_t * cpy = NULL; codec_t * cpy = NULL;
// Each account will have a copy of the system-wide capabilities // Each account will have a copy of the system-wide capabilities
...@@ -1099,8 +1088,7 @@ void sflphone_fill_codec_list_per_account (account_t **account) ...@@ -1099,8 +1088,7 @@ void sflphone_fill_codec_list_per_account (account_t **account)
guint caps_size = codec_list_get_size (); guint caps_size = codec_list_get_size ();
guint i; for (guint i = 0; i < caps_size; i++) {
for (i = 0; i < caps_size; i++) {
codec_t * current_cap = capabilities_get_nth (i); codec_t * current_cap = capabilities_get_nth (i);
// Check if this codec has already been enabled for this account // Check if this codec has already been enabled for this account
...@@ -1109,7 +1097,7 @@ void sflphone_fill_codec_list_per_account (account_t **account) ...@@ -1109,7 +1097,7 @@ void sflphone_fill_codec_list_per_account (account_t **account)
codec_list_add (current_cap, &codeclist); codec_list_add (current_cap, &codeclist);
} }
} }
(*account)->codecs = codeclist; account->codecs = codeclist;
} }
void sflphone_fill_call_list (void) void sflphone_fill_call_list (void)
......
...@@ -188,7 +188,7 @@ void sflphone_set_current_account(); ...@@ -188,7 +188,7 @@ void sflphone_set_current_account();
*/ */
void sflphone_fill_codec_list (); void sflphone_fill_codec_list ();
void sflphone_fill_codec_list_per_account (account_t **); void sflphone_fill_codec_list_per_account (account_t *);
void sflphone_add_participant(); void sflphone_add_participant();
......
Supports Markdown
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