From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 7 Nov 2012 20:57:08 +0000 (-0600)
Subject: bad merge
X-Git-Tag: v1.3.3~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6814014f7d077a961ca633a5bc0a70377e22b8be;p=thirdparty%2Ffreeswitch.git

bad merge
---

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index cf89cba93c..74096a3173 100644
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -7162,23 +7162,6 @@ void sofia_event_fire(sofia_profile_t *profile, switch_event_t **event)
 	*event = NULL;
 }
 
-void sofia_glue_fire_events(sofia_profile_t *profile)
-{
-	void *pop = NULL;
-
-	while (profile->event_queue && switch_queue_trypop(profile->event_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
-		switch_event_t *event = (switch_event_t *) pop;
-		switch_event_fire(&event);
-	}
-
-}
-
-void sofia_event_fire(sofia_profile_t *profile, switch_event_t **event)
-{
-	switch_queue_push(profile->event_queue, *event);
-	*event = NULL;
-}
-
 
 /* For Emacs:
  * Local Variables: