Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / xmpp / hangoutpubsubclient.cc

diff --git a/src/third_party/libjingle/source/talk/xmpp/hangoutpubsubclient.cc b/src/third_party/libjingle/source/talk/xmpp/hangoutpubsubclient.cc
index 8e92a7b..dacccf1 100644 (file)
--- a/src/third_party/libjingle/source/talk/xmpp/hangoutpubsubclient.cc
+++ b/src/third_party/libjingle/source/talk/xmpp/hangoutpubsubclient.cc
@@ -25,13 +25,13 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/xmpp/hangoutpubsubclient.h"
+#include "webrtc/libjingle/xmpp/hangoutpubsubclient.h"
 
-#include "talk/base/logging.h"
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/jid.h"
-#include "talk/xmllite/qname.h"
-#include "talk/xmllite/xmlelement.h"
+#include "webrtc/libjingle/xmllite/qname.h"
+#include "webrtc/libjingle/xmllite/xmlelement.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/jid.h"
+#include "webrtc/base/logging.h"
 
 
 // Gives a high-level API for MUC call PubSub needs such as
@@ -42,7 +42,6 @@ namespace buzz {
 namespace {
 const char kPresenting[] = "s";
 const char kNotPresenting[] = "o";
-const char kEmpty[] = "";
 
 }  // namespace
 
@@ -278,6 +277,7 @@ void HangoutPubSubClient::OnAudioMuteStateChange(
   bool is_muted = change.new_state;
   bool remote_action = (!change.publisher_nick.empty() &&
                         (change.publisher_nick != change.published_nick));
+
   if (remote_action) {
     const std::string& mutee_nick = change.published_nick;
     const std::string& muter_nick = change.publisher_nick;
@@ -288,9 +288,8 @@ void HangoutPubSubClient::OnAudioMuteStateChange(
     }
     bool should_mute_locally = (mutee_nick == nick_);
     SignalRemoteMute(mutee_nick, muter_nick, should_mute_locally);
-  } else {
-    SignalAudioMuteStateChange(change.published_nick, was_muted, is_muted);
   }
+  SignalAudioMuteStateChange(change.published_nick, was_muted, is_muted);
 }
 
 const std::string GetAudioMuteNickFromItem(const XmlElement* item) {