- Merge with edhelas

- Merge with nodpounod

app/widgets/Roster/Roster.php

@@ -171,7 +171,7 @@ class Roster extends WidgetBase
         if($type == 'bot')
             $html .= '<div class="infoicon bot"></div>';
 
-        if($jingle_video )
+        if($jingle_video && $jingle_ice && $jingle_audio)
             $html .= '<div class="infoicon jingle" onclick="Popup.open(\''.$contact->jid.'/'.$contact->ressource.'\')"></div>';
 
         if(($contact->tuneartist != null && $contact->tuneartist != '') ||

lib/JingletoSDP.php

@@ -18,6 +18,8 @@ class JingletoSDP {
 
     function generate() {
         $username = current(explode('@', $this->jingle->attributes()->initiator));
+        $username = $username? $username : "-";
+        
         $sessid   = $this->jingle->attributes()->sid;
         $this->values['session_id']   = substr(base_convert($sessid, 30, 10), 0, 6);
         

lib/SDPtoJingle.php

@@ -243,7 +243,7 @@ class SDPtoJingle {
             }
         }
         
-        // We reintend properly the Jingle package
+        // We reindent properly the Jingle package
         $xml = $this->jingle->asXML();
         $doc = new \DOMDocument();
         $doc->loadXML($xml);