From a6f23194f195658e57e85153b0e1078454d73184 Mon Sep 17 00:00:00 2001
From: Lyubomir Marinov <lyubomir.marinov@jitsi.org>
Date: Thu, 23 Jul 2009 23:51:19 +0000
Subject: [PATCH] Fixes a NullPointerException in the Accounts configuration
 form caused by the Facebook protocol because of its lack of a 32x32 protocol
 icon. In other words, adds a 32x32 icon for the Facebook protocol.

---
 resources/images/images.properties               |   1 +
 .../images/protocol/facebook/facebook32.png      | Bin 0 -> 1293 bytes
 .../protocol/facebook/ContactFacebookImpl.java   |   7 +++++--
 .../facebook/ProtocolIconFacebookImpl.java       |   7 ++-----
 4 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 resources/images/protocol/facebook/facebook32.png

diff --git a/resources/images/images.properties b/resources/images/images.properties
index acf6047a3..0ec8e45c9 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -322,6 +322,7 @@ service.protocol.googletalk.GTALK_64x64=resources/images/protocol/googletalk/log
 
 # facebook accregwizz
 service.protocol.facebook.FACEBOOK_16x16=resources/images/protocol/facebook/facebook-online.png
+service.protocol.facebook.FACEBOOK_32x32=resources/images/protocol/facebook/facebook32.png
 service.protocol.facebook.FACEBOOK_48x48=resources/images/protocol/facebook/facebook48.png
 service.protocol.facebook.CONNECTING_ICON=resources/images/protocol/facebook/facebook-connecting.gif
 service.protocol.facebook.IDLE_STATUS_ICON=resources/images/protocol/facebook/facebook-idle.png
diff --git a/resources/images/protocol/facebook/facebook32.png b/resources/images/protocol/facebook/facebook32.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6da37b0b259dfd590e4eecb3e888c3bc4e37b8a
GIT binary patch
literal 1293
zcmV+o1@iidP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf000D_Nkl<ZSi`-S
z&2Jn<5XFDh)8pB!y=yy;BS8{_Fp^^+ib#M+TmS_jafLGo331E;4hZEQD{$fuK)G<p
zksCq^NQhI!hmZ;61W^+5K^*KD+jza+=_(F0Ue9=EleGklG&4Qjt*Y0rUe$C%em(l?
zhx}hx(U%kl4xT(aZa$sUPWr5YLGh6_tdCJCnv-qA()|{3-hU?{I{o{XAKdE!aNy-L
zBaLSLm!rpyPEG8au-HcuIf$GPIfr-PL=Y#4l##1}nW1W=3aU!T+i6hJpmb8RrNu?L
zJU@SZ{qOdZH!hrB1MpoV+L?ap$l<BwwrAn$(vFqdE=iV3ien!$^Tf>54;R0m2Ik8E
zOntqUaA$Fo$cgMWu4+aSN9=1R)RTxP5=<dgrQK0({<$t2X<)orL(RH={q`D#NDR{e
zyY$~lm1B?Z<-ONu**{jJp7?EGYB(o6bLw;Ii6?Td#HTN^>>QXWs)GYCGoGKF<fC_v
zSB^WE+0vk>D&D!$xGznHoB=m5fZ@dR?rXDMFaT1)pqXMCh{X3{01z=$6_vq7H__a~
z<XElb_}ZN{=FZP^<@O2_jf4}k`$;^QD$bQP?Tb1W01IGlK>A^{?(tE1{@L?Ca_Pzv
zPJ|m99j-5|5=TNB0&WL6euv4Nfd@OU4MiN99O3Yxu~L5;l<`Kw%)w^<ZCqPeCFB~2
zg#IA_#Y_iE`$zUSIrsic-Pmu@?<2?D+s}39Ev;_w#@tsdueC8%WJh>?sbE-^hJ$Fp
zR14baPnl|NQ$w~m`T#%#GaHxzR{&XLpx6c&*)x<mHO&~{J{mAJP{jt&z@;m9Ir7%0
zoIHMrk59c=V&ly-UoijMT_pc2C2^E9`~Uz!17@L{&kw5hwHV^47wwQ267RMPswqbH
zlgh#%)c{m8noI^RgJ9aHKhU!d%K=E02t^1Xn_vUhAyuo~A!OxTdwwaZimH{uP!2%|
z8FICO8L&zQv@Zjyp-&o0R;g6Ar&`^Q0aPpc`!f(i9}Ni5NduS?(!m%|%PMCjfDkGf
z3!x0GR0q;DFg}v-%8BW0bvty`V-J{_n&|0&;pr(Jdw8@YHbJ=X?XOvw`&GhDni4tK
zH(Dp`SXouEGlS8QT2KFYBcZ)nFBK#ah#Yi6DD@XasFHR<zAo!27?su0tUonXw3(4+
zVU{8Q0i1PO@n)K4dpR?-O5If$s?v}wJFK+X5zLfMnqp}y1|mRxz7a~&*5Yt`^8lFH
zdaEs?jXeWx$Lh7Xr@x-W)Z(ZcHvty^T4%l0w&9^z!usMckN|C;BdND;&xhrQrdJvx
zN%ND>E}DTj$<F{H2wUx3QnH<joivo#AMz0*lChJY84$6(jk?^rb8n^f$4>#M18D@r
zKx1>|W+PSCqBc3>e7&CGs=lrGmIxokL{W^(-&<pb!z{wgq2^?HX=&-!<*(1JUj620
zU=7%ioQg5vATR|qfm$A#U7rv7N(B_y09JtOzzty80|8hE7Jv>glC$FYcQ4KDuL1XR
zpFwg*TcJqu%=ovR7eS;zI|mbrhuE$Azj9s#VO#e<$?9!y5o#Fz00000NkvXXu0mjf
D#r9V(

literal 0
HcmV?d00001

diff --git a/src/net/java/sip/communicator/impl/protocol/facebook/ContactFacebookImpl.java b/src/net/java/sip/communicator/impl/protocol/facebook/ContactFacebookImpl.java
index 1a22f70de..b16c342db 100644
--- a/src/net/java/sip/communicator/impl/protocol/facebook/ContactFacebookImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/facebook/ContactFacebookImpl.java
@@ -295,8 +295,11 @@ public byte[] getBigImage(){
      */
     public static byte[] getDefaultAvatar()
     {
-        return ProtocolIconFacebookImpl.getResources().getImageInBytes(
-            "defaultAvatarFacebook");
+        return
+            ProtocolIconFacebookImpl
+                .getResources()
+                    .getImageInBytes(
+                        "service.protocol.facebook.DEFAULT_AVATAR");
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/facebook/ProtocolIconFacebookImpl.java b/src/net/java/sip/communicator/impl/protocol/facebook/ProtocolIconFacebookImpl.java
index ba91cef09..0a6c4ea8f 100644
--- a/src/net/java/sip/communicator/impl/protocol/facebook/ProtocolIconFacebookImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/facebook/ProtocolIconFacebookImpl.java
@@ -37,13 +37,10 @@ public class ProtocolIconFacebookImpl
     {
         iconsTable.put(ProtocolIcon.ICON_SIZE_16x16,
             getImageInBytes("service.protocol.facebook.FACEBOOK_16x16"));
-
+        iconsTable.put(ProtocolIcon.ICON_SIZE_32x32,
+            getImageInBytes("service.protocol.facebook.FACEBOOK_32x32"));
         iconsTable.put(ProtocolIcon.ICON_SIZE_48x48,
             getImageInBytes("service.protocol.facebook.FACEBOOK_48x48"));
-        /*
-         * iconsTable.put(ProtocolIcon.ICON_SIZE_64x64,
-         * getImageInBytes("facebook64x64Icon"));
-         */
     }
 
     /**