From 68de7282142c5394bb3ff6f62fe4b04c924ffc74 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 6 Jan 2014 14:50:56 +0100
Subject: [PATCH] [FIX] im: notifications fixes & sound change

notification sound on first message of conversation
no notification when message received is from the current uid
notifcation sound changed. Louder & clearer.

bzr revid: dle@openerp.com-20140106135056-4179b6u5lcou2w52
---
 addons/im/static/src/audio/Ting.mp3  | Bin 17293 -> 17409 bytes
 addons/im/static/src/audio/Ting.ogg  | Bin 17026 -> 17097 bytes
 addons/im/static/src/js/im_common.js |  15 ++++++++-------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/im/static/src/audio/Ting.mp3 b/addons/im/static/src/audio/Ting.mp3
index ffbb77144b2705ffb9a3ca96da750bb0060d8141..3e308ef41e354558acec2eb284448f480ad0bd3c 100644
GIT binary patch
delta 1839
zcmZ{lVN6q36vuC89gp_4Ag%84>ZE<8AO*{Vg38qSN{fhC`WzBn)LDyD8q!#en`G1E
zDl@hNg0VPpV-YuFWV(r7;=(5LIssuy&^Q;&X3`m5GN-YN?1P$RI}csrmMrOqHvjuO
z=YP(*=eA{!YG*{%eM`lyMF=qnY2yf~;Ikcmni0y!<gv=~Z*}r~^rcx{8Gj$wc!+b7
zpyJMb&Pp#-46eA|*^H*9FPK_#7pWS)h`&TaYG5mU4V1BBE)i#tw)5Po`(m(rKNcuC
zIvLoC>M>r<!i=mImS{S5=boG&l-iJmlK6|j4#w^n!lrog%W7dYThYRgM!Z8GU|~5)
zXMi25e#px<%3W4l5qqbV_eH$41=og2buzF+)z|E@AaR$W6wO$T<>c*hbO6<klV**=
zUVAi!+B&&mP_>?Vi*J27+J^#dWKaw2#Y%`QU=AZIc&_9|f$cyL`7ajO^6FcLumdq&
zNI=Q{jOim!1nC_tw2=}$u>DQre8M4dVQ`hIZZzeu%aIP@fJC;WD0wT#3S~3m_5!Q@
zK5FsNE-8Wq4>^$vY<YFUE}J{K{h;c+t;YN|FFlHd1i3Q>*hS=byPQS2UPV<$jrmuT
zr2}|<5y>zBTSo2|%2v$WgNoR(DDR`g(uX*J$Vwxy1BQoo+1|<g32HJI%{iIZCAH$f
zZL)8w;`yUrbHg(!_mjF7Y3rK!2Q(<PqFRw$nx?3+Uku?~^MotycyyYtXIR>cvWtkC
zgUA=JeaFi)5OW3zOZ1PXr25Vt$0roeuciY#XaF@EG0GJ5Yj&pj+P(A?0(Bb?Y#AAW
z=_{RtDfCB;zMi0Ts3mKhoH8kSwfFhBh?w1=YADoO6oh)MBDp&q*#6i^no?0OsJhMd
z`V=-qkLkd3<_smT6Y^RRa~M?CQ=69W*~lD2fo`%UW1<^FyljtiBT8QX4sMhUO5NDD
zog6R&>v0b83DNwSmk}mK=;n;7wxD!mSJqZ?#RBZNO@pQ_a~o&=P#2i1ZP{k@v0fTM
z8+wSw3haR4QaZK9R}QO7k#;PamTwF$?!e&6ojKuoFfCz6aIYXQ_hwqYco7}M)=aX)
zrqpW~EcNF~6KeAK9*7)-3Bs*AlLf3>J7@~e1XT^wx9riUa9(;GZURYUD{RvzunU+w
z29fnPAM3Me={FemC?`kBJE_YqXZpE&aGtd-&^wyzX$KA@NUa^%q3T_{oTucqqLgJ(
zP1TVQ9l+}->Bt4uqir;Vvniw8N%rb0R^J|?2bEp8o(GXHXpfr0*-xjS8Q+vz)xHsZ
zj04L_iUZivCQ$P_nRdpyI=QDW&0!4UBM2tAIA3u^BCtpOTo>%V&JtxET!@~>f|=|R
zm5O3@E}AVdH`P$lvbQvPZiF6FZtT|uN;f7&l)PLoY*}*MyXmvutB}6J0YCYpP|4c}
zs>9Df<hjh)rkB0yjp(eh3yz`*&l^lzi=J+o=Ee%Wx4n{{N5UAXD+adAxv_vc8YA$k
zEYaCoHM-6az0q{bNDj|dJjWKNQ=6YV3VqfMZ)0@rp`qUnL$7|E1FXBzZ3x@V&?~rg
zBefbuJ+175u>{xwV&mmp%-vMGk?!VBMu~h_nQzrAz+TX1@d>9Hx&g0QUx?8`HwLhf
zN%qVGw#<;k%P{@jFn!I^#?+<F!_t#|KTG8Nd|>+xGkLiLF}u{l8=9U^Q!j(shk$*&
z094QEMTYP^Kl3(QyIRxG%WAkF9z_8&aV~_&Zo(AGg%Z;MEL-DZ@;dA3S^YXhLXt&g
z>O1uy-JB&Q$xzYr{|gAI$tjm!73*He#Lktn@RlQ#6uVNIy?AbMUO|bNGyx#wm7V3T
zimJ7)rKL6Awcd&<uWKa|pPteF=S)qN$A@x7adzG;Q7nj=+!og9C@3rzMbW&zl!?u7
zb1}bra)an_&Yn~3EM%YYua(J5U9UfvM)`_n!Lb5BC)ocxDVMn_(LeEAa@lfMdD+S<
OV1A;Wrxbn$qrU;zST02X

delta 1697
zcmY+FeM}Q~7{`AdC*Ji1)K+qL5bQfpN-6I$VIH8om!4s6EYpQq6dKl8jf-ZB$xqn=
z9T1FV12-1yMvTrk@JE(x)A@750x|+dw_uhf9UDvLVq_7MsY|x!@SiQY^#1tf^E}_@
z?Run3)!V5WSy1tBV1!tNbjJ`<!E+fQWJIV?B2QGN|EsG?(6>gWF7_UNX`JN6nN|EZ
z7qrrIHPNPmNDo>sl$wg~A=ROaKM#-q18jr$5M?b`kYg;;M6R{ocl$@)$5x4)UIlD@
z<Gd)_F+0MTYt=*V7F{awOZ~_qkyt#iQ{hE@FgeB@X3RUZHNE!PF3;o#*m8#mEU?p!
z4@KEV1t()c+QmM*x64C&amx~E<ba)SyzP+9lHi0=)brc3F8x}C2GH&Uq(`l=w;!*i
zwuq1cs%A@jmbaw}9Y-w&64d~EvkoGgF&{$~@LXq|1$GEQ<bSll);2EagD%8z$c(t=
z4e2va&C*-gY9Pf4z)o~8i%Twvp95EGn2xmU*E6J(*hk6!L?v(Ce6DOn{1UL5JE1Hu
zJu7u#%Q!i|2H4uhC5LQ`@Q*;%dHRgm{T_N6TZ3eAEwDA@Pls%$f}p5O$e4YLlLqka
zF|t7qY&E%`D_byE4;5+WLv}Bnl0L*fOqvY9PU;^zWJiSC2`a~j3NAU%N`1Jcg&be6
zc>d`3%wRedN*Eu~v~}AbP`}iNT1LoplA?xx(+4w+E3P!lA+vXEN;-zp#|Xni<eRr|
zigGIAl90JJ;qlrO@0D}-yyE!<0oW-$sA-5(rjW4nNUC?xLq`#)2Ss43$qY<i=_E{H
zJY@8a`K6P+=?BPYvXWPGUyQjCy9lb9LcRHZsMk6|?xg@b5uRD6R3w0^+t)58Y6J9)
z4m?{^mArY7*MvA&W~ANXOU>TW%AP?jZnAU3N;f7&*%1@6l)TM{t+QIcG=lAalK~^J
zRe6)*lH2&%1=bwbMfYVk^!ugZqiM@z&IIg@?r8G<jU5?<ZM!yVdJh`CS`Y0)ZTUoP
z0d`V9El^ABl?<jFY34(z*#>|05C&Hj))mjubxRHedj)y<-Kp8`33LKmhsj}^Qm;N*
z-kd3|sN8ZVME1i3Ve3A(16!$yCI{0&WnlWIPBD@9&~wOw$x@oac7Fo5fCac=lwkAn
zUYmw~jp2?mGL*b=XC1P&S*VB2(b`HyS5G?yS3%-)06X1yRFs`cUJFXx7D{Ru4$vFe
zCy}8{P^&Z@`d}Jmm7UbydX-NY4A2wGEqw2U$WhJd<Y3yfDX5qCrZfz;qK~of4oP$Y
zyR{osXN3KWwd~-=uBN&Semsm|g4NlIE7ApbG%j#(`#MvIckuyw9a|#gs9UKh+*U@@
zB(9W!inhI(l)%r>Gs?z(m7{bcu1m=)2ykUw+uOFRcWR_Bu`fm*<tlkQKy@{95P2gz
zzc<6fw4y7@Ex7VmJnu<9kpJw;)OTMNJ%e@hI<hvAwgO<Q^ICJLt0M$om0F#xFG&{(
z(7WBg^pjJCisx{(KyA%JJoH&Nb<m(23{3uU3VQWp5wMjV75bpV2)%->oAD(n>Sg5?
z48_1s5}PPzVxg3&K)Rof7?jATl=(J14{TIp7nkyk&<*&ST@4s?(2X0|GE6!*0b8wK
zEy^(cMVP+2z9Xf+XG(f{e1VedCBRPT(?z)$u?vj(HTBr1Dc^y56#@IC6x6EAmHObO
zX7&fIZ-@HO7rdJH<5}d3ki5+hxstHCa<0VA1FPL$W^hK@>6L_Cm;@w~Dw&Qx5R7(d
z^$1k--~R=K7&2OxpbC#{X2aLYwW}_I%!KF4)8dPBoVhtgVN=C=F3asMaw<RJ%@wBj
roLpB<K|y#=g(W@5<<2WE$SW+9x4u|bwY6z(H9{*9R?;B+?1j+38&4AI

diff --git a/addons/im/static/src/audio/Ting.ogg b/addons/im/static/src/audio/Ting.ogg
index 74ee13a4e5a40b0d9fcb9ca58c93698d93f657ab..34af5684838694dfafe5263ebc921ae9358e27c1 100644
GIT binary patch
delta 98
zcmZo_Wjxu+I3a*dj=4-puw`PHhc^=g1A_t(2e}6LI7YfVdiuqO1UWi;#|OANdfOW6
g85mkv8kicG$YWCjQf{kjXryOkqLAXWanS=u0K$G5mjD0&

delta 27
hcmX@v%GlJ(I3a-TRs0u4LEDL89xMz%u<_*sM*xnG3D^Jt

diff --git a/addons/im/static/src/js/im_common.js b/addons/im/static/src/js/im_common.js
index 43ffdd982a0..dcc89e87c8a 100644
--- a/addons/im/static/src/js/im_common.js
+++ b/addons/im/static/src/js/im_common.js
@@ -259,7 +259,7 @@ function declare($, _, openerp) {
             _.each(messages, function(message) {
                 if (! message.technical) {
                     defs.push(self.activate_session(message.session_id[0]).then(function(conv) {
-                        received = true;
+                        received = self.my_id[0] !== message.from_id[0];
                         return conv.received_message(message);
                     }));
                 } else {
@@ -268,12 +268,13 @@ function declare($, _, openerp) {
                     defs.push($.when(im_common.technical_messages_handlers[json.type](self, message)));
                 }
             });
-            if (! this.get("window_focus") && received) {
-                this.set("waiting_messages", this.get("waiting_messages") + messages.length);
-                this.ting.play();
-                this.create_ting();
-            }
-            return $.when.apply($, defs);
+            return $.when.apply($, defs).then(function(){
+                if (! self.get("window_focus") && received) {
+                    self.set("waiting_messages", self.get("waiting_messages") + messages.length);
+                    self.ting.play();
+                    self.create_ting();
+                }
+            });
         },
         calc_positions: function() {
             var current = this.get("right_offset");