From 154ceab2535f7e749f78064a0368795e0033df7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?=
<rafael.carre@savoirfairelinux.com>
Date: Fri, 26 Aug 2011 16:49:22 -0400
Subject: [PATCH] conference : remove one prototype
---
gnome/src/conference_obj.c | 31 +++++++++++++------------------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/gnome/src/conference_obj.c b/gnome/src/conference_obj.c
index f191db7411..40d5f7f908 100644
--- a/gnome/src/conference_obj.c
+++ b/gnome/src/conference_obj.c
@@ -36,8 +36,6 @@
#include "calltab.h"
#include "calllist.h"
-static void conference_add_participant_number(const gchar *, conference_obj_t *);
-
conference_obj_t *create_new_conference (conference_state_t state, const gchar* const confID)
{
conference_obj_t *new_conf;
@@ -139,6 +137,19 @@ void free_conference_obj_t (conference_obj_t *c)
g_free (c);
}
+static
+void conference_add_participant_number(const gchar *call_id, conference_obj_t *conf)
+{
+ callable_obj_t *call = calllist_get_call(current_calls, call_id);
+ if (!call) {
+ ERROR("Conference: Error: Could not find %s", call_id);
+ return;
+ }
+
+ gchar *number_account = g_strconcat(call->_peer_number, ",", call->_accountID, NULL);
+
+ conf->participant_number = g_slist_append(conf->participant_number, number_account);
+}
void conference_add_participant (const gchar* call_id, conference_obj_t* conf)
{
@@ -151,22 +162,6 @@ void conference_add_participant (const gchar* call_id, conference_obj_t* conf)
conference_add_participant_number(call_id, conf);
}
-static
-void conference_add_participant_number(const gchar *call_id, conference_obj_t *conf)
-{
- gchar *number_account;
-
- callable_obj_t *call = calllist_get_call(current_calls, call_id);
- if (!call) {
- ERROR("Conference: Error: Could not find");
- return;
- }
-
- number_account = g_strconcat(call->_peer_number, ",", call->_accountID, NULL);
-
- conf->participant_number = g_slist_append(conf->participant_number, (gpointer) number_account);
-}
-
void conference_remove_participant (const gchar* call_id, conference_obj_t* conf)
{
// store the new participant list after removing participant id
--
GitLab