revert whoops

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7167 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/conf/directory/default/1000.xml b/conf/directory/default/1000.xml
index 408b3b358256415a698404597d5034eba2238593..d230325c4cce52fc956e2f77b7b1ed50d8128b4e 100644 (file)
--- a/conf/directory/default/1000.xml
+++ b/conf/directory/default/1000.xml
@@ -1,17 +1,5 @@
 <include>
   <user id="1000" mailbox="1000">
-    <mailboxes>
-      <mailbox id="1001"/>
-      <mailbox id="1002"/>
-      <mailbox id="1003"/>
-      <mailbox id="1004"/>
-      <mailbox id="1005"/>
-      <mailbox id="1006"/>
-      <mailbox id="1007"/>
-      <mailbox id="1008"/>
-      <mailbox id="1009"/>
-      <mailbox id="1010"/>
-    </mailboxes>
     <params>
       <param name="password" value="1234"/>
       <param name="vm-password" value="1000"/>

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index e649455d74741a3731846ad573683841eb812fd9..e579355d281543e27d505b4db906a82bbda878d6 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -186,7 +186,7 @@ char *sofia_presence_translate_rpid(char *in, char *ext)
 
 void sofia_presence_mwi_event_handler(switch_event_t *event)
 {
-       char *account, *registered_account, *dup_account, *yn, *host, *user;
+       char *account, *dup_account, *yn, *host, *user;
        char *sql;
        sofia_profile_t *profile = NULL;
        switch_stream_handle_t stream = { 0 };
@@ -195,9 +195,7 @@ void sofia_presence_mwi_event_handler(switch_event_t *event)
        
        switch_assert(event != NULL);
 
-       registered_account = switch_event_get_header(event, "registered-message-account");
-
-       if(!(account = switch_event_get_header(event, "mwi-message-account"))) {
+       if (!(account = switch_event_get_header(event, "mwi-message-account"))) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing required Header 'MWI-Message-Account'\n");
                return;
        }
@@ -206,11 +204,8 @@ void sofia_presence_mwi_event_handler(switch_event_t *event)
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing required Header 'MWI-Messages-Waiting'\n");
                return;
        }
-       if (!switch_strlen_zero(registered_account)) {
-               dup_account = strdup(registered_account);
-       } else {
-               dup_account = strdup(account);
-       }
+
+       dup_account = strdup(account);
        switch_assert(dup_account != NULL);
        sofia_glue_get_user_host(dup_account, &user, &host);
 
@@ -225,13 +220,10 @@ void sofia_presence_mwi_event_handler(switch_event_t *event)
                if (!strncasecmp(hp->name, "mwi-", 4)) {
                        char *tmp = NULL;
                        char *value = hp->value;
-                       
                        if (!strcasecmp(hp->name, "mwi-message-account") && strncasecmp(hp->value, "sip:", 4)) {
                                tmp = switch_mprintf("sip:%s", hp->value);
                                value = tmp;
                        } 
-                       
-
                        stream.write_function(&stream, "%s: %s\r\n", hp->name + 4, value);
                        switch_safe_free(tmp);
                }