From c1e7e67e061ff9878ba039d0dc94a33e3df73b61 Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Wed, 22 Jun 2011 21:10:24 +0000
Subject: [PATCH] FIxes facebook and google talk accounts. Fixes
 NullPointerException when status message is null. Renames "On The Phone"
 status to "On the phone", in order to improve compatibility.

---
 .../protocol/facebook/status16x16-phone.png       | Bin 0 -> 818 bytes
 .../protocol/googletalk/status16x16-phone.png     | Bin 0 -> 890 bytes
 .../OperationSetPersistentPresenceJabberImpl.java |   3 ++-
 .../jabberconstants/JabberStatusEnum.java         |   2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 resources/images/protocol/facebook/status16x16-phone.png
 create mode 100644 resources/images/protocol/googletalk/status16x16-phone.png

diff --git a/resources/images/protocol/facebook/status16x16-phone.png b/resources/images/protocol/facebook/status16x16-phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e96c201120a27bb96918a0fcef748bfc6cd4981
GIT binary patch
literal 818
zcmV-21I_%2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;!&Rf&hgIrkWf8000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipb~
z6e$1^b}#4v00Oc}L_t(I%axK_NK{c2hQB>$&T)>Hut-v-i(?I8N>0R(7C}@GHKq0%
zQ4fODL!~HTLC{Mu+2x^|U{@-FAbKtAMx{yj2ntIpBg$YDwZ`VmIOpu$!?A&ipf>D>
zz1Cje`v0}JC|SF|K`9kgN}Bw~62fB%A$Eztn$|?PYLPi5KM&K;$kILNUJtq^5JI3(
zNC~zhNu?#paR+PMVR$so^GA;@uTs*?$$}Txjv>=2%uwAwDJUt*MJZ`|0R|qN=lI_3
zyzYI^(aYB{ikD|DPR=u^t(?Kq@@WJLa~Vt8)a<#9sk?cvOvI?H46+~;VnHax&D(c*
zHToGNZyEr**DqvYa4G;J@f3!xAsw46uW$kRYJmE>=1j+(&0E>jbP$;x0bqW~6aeZD
z+@bf=SA+niz|fQnnC!Fh`~4X}Fc`#;aqb?j{l)W{9m@b%vh9jns7+YN%kcqV+cxc|
z&eCz~9x0#yufvm$4S<IU1wy!9S`QuOa(4{9U<DpcXVK=106c8p0FXIn{(+J%AYr8d
z=>PB$Eq|{2_R{{N^Y1Z7I<AtDgd!G;(X@RF`ru=vV`p~y`!J1-jkLA3VW+<TnoFl$
zz%YJ}9B*e{X(?5u1*|SJsIRV|zPf^d^Ng037Q*2$#a1Vgav$~86-dV>nHry%MRp;b
zPkQL<>!UTgm(*Yn-5r;B{i2(|Og}|MMTEm)E?qoF@6!$jzkEbFHr9l7Q5=b?nT6S;
z`)_dK=swEJ%INI6Pv6^jY}~LOUDq?d<MBAlSFK}wRt@v#6w>vyA1yz)vPJW1y02gk
zSFc>)P0veet0OE~T!p4-nc`$J$;s1a85nh#HM^A2ZwUrR5|#)=q74e7fC(V2Aqvz7
wCS_~nng#%4i6moInjtkEl{5V((-N@j2fs@l&47aJqyPW_07*qoM6N<$g4$_u$N&HU

literal 0
HcmV?d00001

diff --git a/resources/images/protocol/googletalk/status16x16-phone.png b/resources/images/protocol/googletalk/status16x16-phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ede5dc2198fb816f562d915a4f49e9d5f7d76c2
GIT binary patch
literal 890
zcmV-=1BLvFP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;!&Rf&hgIrkWf8000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipb~
z6e|cVo5ffF00R0+L_t(I%YBnyNLyzZ#-DROPm(riR%IN!+M*Xr2)MafLXeTm;uwe*
zvQ)g07E2xCl<B-UdSmg=8NrLhQp`Z8Fp#>763ZyN&I0X4sRflGT3bfc)sQ())ST~}
zobTO5Te02N-}Uo8?*s4q0PjK5G`FT{()%>hI|F9`-12xlUkV{q%d%v~7!*aZiRdrR
z`67TmUDx?r2CAz18X6j&D2noNe}BK!*w~25%1S7T0wMzE9K~W0nM{V3mzRZQSxH^j
z2ah*5H#cuBEiF+xou*VOMZ8oZ&N-Q;Nv3HM=bS9dA|V7F9v)I6k)Yw>;aLD+u~_Vf
za5(%`dwV-Vp%CugUBJ1L1uLF{yRjY>(o<L)-{YC|IeH%S;!1rCfrbFqR@N?s!{I&I
zahz|vy1I_jba&st{pF{S&sXE+;7vHT4N*36hPhyH1HV1b;+tQ3(9zKWm&^5C1reRD
zsi`?O2m}JyUi}^BpB&=o2xJxj2{<Y{D2p;CA5LQWauU_m)c{Z{dpsThK)GDT?H^~+
zdF?tvg#-9U`XKwffNbN)6v!D{U=l;EzYe3>o3I@lL<CuqBmn?3Gc&mJXbY}OU!x^h
zkNxok<hl#6<qrX;giotJflu*a@{4hl$-(N2RRH)yYHe-ZUR+%KNYgZQT)hs)Dsc8x
z1;}w;-I=ks9>?eN!R>Y<nM`7Tf4@&I6bjkh-CcBccH-xs?jTru9*i*v059`-jE#+9
zetsT82&k$G07#`$Fbrc>*Y#VBF_yD!yEPVzdDH1M<#IVG8jZrXZA?u~VRUp9RaI4(
zn3%xk<|Z<kj8iNY6S}VV9>;2GYPz?+zAiZDG&D3s@pzmT78Yn=V1VAhIj6R^wqht0
z`s`nYP*wG8G#Y)pva&)%MA>YX=H}+evMf4@VHgyNM4tU;t5j7z)zZ>pjf{+ld_GU_
zQYw{bdV2crNF<W@-!{HBst*Q(<9@&YqSx#F000hNvA46c6W`d_`1PdzAGfBEhdw)p
QI{*Lx07*qoM6N<$g5w8`uK)l5

literal 0
HcmV?d00001

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java
index bea94f5a0..d06669f48 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java
@@ -638,7 +638,8 @@ else if(mode.equals(Presence.Mode.away))
         {
             // on the phone a special status
             // which is away with custom status message
-            if(presence.getStatus().contains(JabberStatusEnum.ON_THE_PHONE))
+            if(presence.getStatus() != null
+                && presence.getStatus().contains(JabberStatusEnum.ON_THE_PHONE))
                 return jabberStatusEnum.getStatus(JabberStatusEnum.ON_THE_PHONE);
             else
                 return jabberStatusEnum.getStatus(JabberStatusEnum.AWAY);
diff --git a/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java b/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java
index 00bbe6fc5..66d8dc3ed 100644
--- a/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java
+++ b/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java
@@ -58,7 +58,7 @@ public class JabberStatusEnum
      * On The Phone Chat status.
      * Indicates that the user is talking to the phone.
      */
-    public static final String ON_THE_PHONE = "On The Phone";
+    public static final String ON_THE_PHONE = "On the phone";
 
     /**
      * The Free For Chat status. Indicates that the user is eager to