/pidgin/main: 12e93808f35d: Fix some warnings in debug and conv ...

[Tomasz Wasilczyk]

Changeset: 12e93808f35d8ef3ac48e4df062bf65f63ce8e3f
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2012-11-24 19:30 +0100
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/12e93808f35d

Description:

Fix some warnings in debug and conv windows

diffstat:

 pidgin/gtkdebug.c                           |    3 ++-
 pidgin/pixmaps/Makefile.am                  |    1 +
 pidgin/pixmaps/protocols/48/google-talk.png |  Bin 
 pidgin/smileyparser.c                       |    2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diffs (98 lines):

diff --git a/pidgin/gtkdebug.c b/pidgin/gtkdebug.c
--- a/pidgin/gtkdebug.c
+++ b/pidgin/gtkdebug.c
@@ -109,7 +109,8 @@ debug_window_destroy(GtkWidget *w, GdkEv
 		text = gtk_entry_get_text(GTK_ENTRY(debug_win->expression));
 		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/debug/regex", text);
 	}
-	g_regex_unref(debug_win->regex);
+	if (debug_win->regex != NULL)
+		g_regex_unref(debug_win->regex);
 
 	/* If the "Save Log" dialog is open then close it */
 	purple_request_close_with_handle(debug_win);
diff --git a/pidgin/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am
+++ b/pidgin/pixmaps/Makefile.am
@@ -297,6 +297,7 @@ PROTOCOLS_48 = \
 		protocols/48/bonjour.png \
 		protocols/48/facebook.png \
 		protocols/48/gadu-gadu.png \
+		protocols/48/google-talk.png \
 		protocols/48/novell.png \
 		protocols/48/icq.png \
 		protocols/48/irc.png \
diff --git a/pidgin/pixmaps/protocols/48/google-talk.png b/pidgin/pixmaps/protocols/48/google-talk.png
new file mode 100644
index 0000000000000000000000000000000000000000..c42c97a41a16690b726ffbc9c98937329a383676
GIT binary patch
literal 2865
zc$@(-3(oY3P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000X3Nkl<ZXx{Bv
zdu&tJ9sbVsy}t1yZ-+c^X&8Yapc(B}1q$Uc0;QQIfe>q9t$?YdQl?g2Bt#RKnvN1e
zMu)0VMFRx1f at -X3%9c{v60IpvvM|P at gFqPMK||sgXc9kS-^V$3e>lFe6Wd9aQfX3;
z^pkzA?>XoDey{U8$H4dP`!=pd#yde-Sy_tT?_VMaLar!^vo%fop)AW2RaG?ufWct!
z6G9jv#3u+s7a^qG at Ao%QN-t`f)=*JV(es at X*t&J=Q~<vaMe!NN*z~--JUV&uWHBWr
zg;=dth at uEW0#j?61^{4;L6&8By<Rw-PIlwQ4e9db%RGQqMNy6bcxU_e?d=bgKxt{|
zV{vhD<z};a!Lnt`gvpa9^A?Lm2O0z${0v)YfY8v-{{DVkzkXe=tE<x_NjfJ<(vI at -
z@)O at Gfz6vY|HxvoR3#@T&tAE5r70^b3!0{ZF$TuixLlCqIB*;XLI|8rCu(bJeVv`1
z%|4&+g^G%be~pVkVPT<=k&*GH$z*zA-MV$AjEoF0#y}~JsO9lCgTVlU!GP}WZX7vs
z#P9KV4glCxR#w(OW&)+9rRhea at kCx;-t=Y5mYFn7gQ}_z1o+U#^E^0?!`ZWE<+{4M
z+p4POM~jb$1WHOuri-FjzkdCC+oVa842q(FQu>{yM~>ql2m-pgy0rcK_xH)Nys*5y
z{HqZOY}vBqVV>vD7Znwy+H5u=Ns_L0w@=aEv&IP^<4D3T|JMTm2;$@HQQs3q5iXYt
zd-m*cdA;5zcJADHH7bFZUV2GPO-;SLVZ(-LcDtSU{eB(1qB1Pq^f&$8kIH`rt4SC&
zV0X(DXlgeAAYqyZd(X at WxQihUznXg?=2%e_(c9aLJ$v>z2q81e%F4dcEfxA=Qc_ao
z;>C-z?RGoy`FvoE>FII2LRCN=kU*d5GSXPT-;d<vWUN at RB8?DoAk5W5f_9eGYTY=0
z{(Lbic*X{0tOOM3qG=i^Wx9-Jyx;FfZf>q2EiG;7tFOMAKa4<JTwLXvHEZHjRn^nv
zaA6 at bMgkO|YCr-O7?jZWF18;+U;oz;##6|$jMb}Gn at uLut}p_dHf_q_d493oZr6i0
zR2IBkjU~l3`o_f=L&4_1V!_MRxbN~oQ&q5!K7#t<i%=IX1bzBxun#^6vlLUq2{6jQ
zC<9domDPCjk2rO0JE|Mkpx4_z42LYsNJ&XSQc_Y*NlD2Joq*A3T(NNBLN2QILtSTx
z5a(Se&p!|4wbww;p9l4LpgNsU%FCg?`>sBRs%YUZG$aNtw!MS1&2NFK41L}%wB0>D
z3<qNjilQJtKR?c3Fs#)Hh@!YWCnv`!%W{~OgA$7XGn=70ouH~35K#nW3{+L2y!|%V
zKs>1-K^)l4HBhR7Q4RmRxetH;_cs06W7!)q%l>RcEQ+FF;>3vtqtUobC!lHCBMAu!
z`c6AkK7VT!K6`Uz*hIAzKgZ{9twLg2BDnSIf!tj1 at 4W}%i!Z<x6 at gI-=JSCzHxIf{
z1PjQrA75Op)cZN<1(-Yam8h|#C<-hV3shCj0RSEVD5Z%!&%@{QMJ*MAuB7+bVD-tZ
zS_N+PYJlSc&+_s>RW*?32b2=@|KMDV2G<!}FDG*;md~yPK%(McjKN?qKvmUvodCyi
zYADOd1Q=MzZ(-$gZ!gr^TF?s at pmlcxem~ei=@AU%p#-QJUd1Muv#|Wpogm;wRc~<|
z$8-XOkbAN$rxQYA4%XOUJ;Z{+`PpaiZQcw>QdEtRAOR(W01YS5<L<!amcQU9Q`e7J
zBT-7hahxYK25z}rF7P}bJD;-<(KN8Tcj4W%3DoNaRaKBDpM<bw3$)Z!J*f2!kpXN#
zLid3{dJTN9yHJkij*~Gl7z_ru-EQza->egmB&nvUsmX6N8e<L)4PpS0FJ6S|@dPxI
zpAU0Y6 at -EUP)P!%RIgx%S~YYh1_V4g^A%9apr{I}PyZS%U8kdB5JeGfZEdO~NuTHh
z6h%4F*w_d`5Wo!tVq^;prq5kR8nN$mhpuV)(j~Zyi_x=W36$>c!L%CT3=zmmgYv|T
zB0TzowP30SRhIF7eG$6uUm3Q3u&}GIuU7~mM|A?bcI|RXl2qH$(!wkjOJvh=1nJ2p
zoxsV)R=n3~z@?1opp-(neH;DN)li&Ha5HCunM|ORqW{1FP?syJ1%kEE(jRYy-S#*r
zWsqb)zH!|ihQVU7z~OMf<#K)X#v5-mht)!ivEP39;fHcuTpR>Jh)AMj-5gA at C&FUl
zk)CSC(!7U}zW+}UpL-6B=L4=ZV+O2MRj_Q^2FCN~|MXM%tE<DT5NRjo2#;qL at 5SWw
z`B?YVpD}&XQ^S1UY&N5&rlwy}l;VizfwHo)%DlY1m-F-U#qRFzu^rfD8JZ-4#K#Y2
zAdd$`(?H_mLFK!E7KjOhm@($l*@OubaN)uQ<-~~- at 4x=~>%WY69sp3<(9m$Rt*wov
zrKKU5R!1d*09dVI&xpmMKjQ=&IAc0EWBQn?SO7>(O at +hZ(2gHJ?(qBlMPU~Kp`H5r
zdNyy~ybrEixw3ZZ)T!|q85yL%zkl3UC*wI6r=_K#r>95Tw{Kscq9_Y0Dk?go5&(eH
zr%!w5%$ZYt_3G8NnVFfU?Cfk#k|d}DrNMXAL{UU~dOF(L+StK^2k$G2GJnU89nHh8
zVj>Ox^2;y#=FXk_PIGhfPbEo8oi%F~F9-rc&&Ur_>&eN<NJ>gVU0t2@@y8!uS5<Z1
zjvYJNBHkrMo9N7$GyRJeEjrlI(UEZO+_^`mOqs$z^w2|u<2VG%?r-~2D={$<X=!P2
zI-T17{rjbsmX_Td$F1GAZCl^Ct`<v5N~VdTc+h6E%`PY?Fi)B^2|YbM=<Dknx3*0t
z6RcJ%%w{w0+_|G2KYm<tI2`AFK3`#FW#zSR<8G7$rMS5GajVt(yUfhY`Gtjrrk0kL
zQGpC<nCE#2f&ftz5!`S3`ucF~+BNCasZ-SF^L_4iyMMoX_wF+xb+#5(bB~e$i6$F2
zZp_Ke%{^CGSZHo<k9-?W2*HF26A&LCue%zh6h5C1Znql_heK^`ZS^-bHSwCJUH5oA
zhg(})kJi-G+zSC5O~S7sM+uw at em9v+Iayg*nxZHX1DfMFWMyTcx3^c at y?eK!C<+~T
z?jwXaD5Wi4ulFBbulIaIL&K#jSFZR%z!@R{X0eFyQNVN2NSI8fMboBDGlgC`2Aj!b
zLS|+rnwy*H(W6JdX=-X(SyNN<pU^TWf@^Rww9SV6&W6kt)dEooiK4jNZntx8w_A4)
zgTVls%?7L0in_Ww`Rv)Vj>g8uRVPoL><n2WmP=?+K#~|PuSK#z%(h{}hDU5RTXuYW
zJi5BN!1Fwkl9G^;l7i08PVC*g*WcUQTU%XSU3%-*Eni5fGSt_!A?s=}Vln1#e1u6!
zguVs<6DLmGQczGJQc97Xoee<{(9zL>W5<qp+uPgk-nnz<H-`=#YKWl_ZInS8tv}2a
zBM}(Nm;vC5i;JI4NJz*xo6Y3r&6~J!<A(3jrAve{cJ1E1dw)25`0yugx0?-dLqyTM
zHU=4W5F=#3&;Zsf7RzFn%jK!6s=CV<JLmO!PqnqR)g3!_?Ea9r!6*q}1kH~Kek8w-
zmQoR;k5Ljp3>O*o9x#@_Sw{ko|B(PjLE?e^Q$Ld1kQm^j5%|9S-?je&0&OAG|9S3W
P00000NkvXXu0mjf60&{^

diff --git a/pidgin/smileyparser.c b/pidgin/smileyparser.c
--- a/pidgin/smileyparser.c
+++ b/pidgin/smileyparser.c
@@ -151,7 +151,7 @@ smiley_parse_markup(const char *markup, 
 	}
 
 	/* now for each theme smiley, observe that this does look nasty */
-	if (!current_smiley_theme || !(current_smiley_theme->list)) {
+	if (!current_smiley_theme) {
 		purple_debug_warning("smiley", "theme does not exist\n");
 		return temp;
 	}