From 4bbd967142a43b416377ee617fad720f0f810464 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 17 Feb 2012 20:21:44 -0600 Subject: [PATCH] FS-3794 this one might solve more issues --- src/mod/applications/mod_spandsp/Makefile.am | 6 ------ src/mod/endpoints/mod_sofia/sofia_presence.c | 7 +++---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/mod/applications/mod_spandsp/Makefile.am b/src/mod/applications/mod_spandsp/Makefile.am index 551a2b560c..2a63c42316 100644 --- a/src/mod/applications/mod_spandsp/Makefile.am +++ b/src/mod/applications/mod_spandsp/Makefile.am @@ -22,9 +22,3 @@ $(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update $(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update cd $(TIFF_BUILDDIR) && $(MAKE) -j1 $(TOUCH_TARGET) - -install-exec-local: $(DESTDIR)$(libdir)/libspandsp.la - -$(DESTDIR)$(libdir)/libspandsp.la: $(SPANDSP_LA) - cd $(TIFF_DIR) && $(MAKE) -j1 install - cd $(SPANDSP_DIR) && $(MAKE) -j1 install diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c index 5a10dbfb64..719cdfcecd 100644 --- a/src/mod/endpoints/mod_sofia/sofia_presence.c +++ b/src/mod/endpoints/mod_sofia/sofia_presence.c @@ -1272,8 +1272,9 @@ static void actual_sofia_presence_event_handler(switch_event_t *event) event->event_id == SWITCH_EVENT_PRESENCE_IN ? "IN" : "OUT", profile->name); } -#if 0 - if (hup) { + + if (hup) { + /* so many phones get confused when whe hangup we have to reprobe to get them all to reset to absolute states so the lights stay correct */ switch_event_t *s_event; if (switch_event_create(&s_event, SWITCH_EVENT_PRESENCE_PROBE) == SWITCH_STATUS_SUCCESS) { @@ -1287,8 +1288,6 @@ static void actual_sofia_presence_event_handler(switch_event_t *event) } } -#endif - if (!zstr((char *) helper.stream.data)) { char *this_sql = (char *) helper.stream.data; char *next = NULL;