From e6984e727cf115ca39da3b2c4894db728f0ca2a7 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 7 Feb 2002 05:01:56 +0000 Subject: [PATCH] handle out-of-memory creating target pixbuf 2002-02-06 Havoc Pennington * src/theme.c (colorize_pixbuf): handle out-of-memory creating target pixbuf * src/themes/Crux/*.png: convert the green-channel images to grayscale --- ChangeLog | 7 +++++++ src/theme.c | 3 +++ src/themes/Crux/active-bottom-left-border.png | Bin 174 -> 120 bytes src/themes/Crux/active-bottom-left-corner.png | Bin 187 -> 134 bytes .../Crux/active-bottom-mid-left-border.png | Bin 276 -> 171 bytes src/themes/Crux/active-left-border.png | Bin 171 -> 117 bytes .../Crux/active-left-top-border-shaded.png | Bin 201 -> 160 bytes src/themes/Crux/active-left-top-border.png | Bin 201 -> 161 bytes .../Crux/active-menu-button-prelight.png | Bin 359 -> 375 bytes src/themes/Crux/active-menu-button-pressed.png | Bin 345 -> 348 bytes src/themes/Crux/active-menu-button.png | Bin 354 -> 359 bytes src/themes/Crux/active-top-center-left.png | Bin 294 -> 250 bytes src/themes/Crux/active-top-center-mid-left.png | Bin 1059 -> 859 bytes src/themes/Crux/active-top-left-border.png | Bin 179 -> 137 bytes .../Crux/inactive-menu-button-prelight.png | Bin 399 -> 343 bytes .../Crux/inactive-menu-button-pressed.png | Bin 381 -> 311 bytes 16 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 45f3662aa..729abbc5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-02-06 Havoc Pennington + + * src/theme.c (colorize_pixbuf): handle out-of-memory creating + target pixbuf + + * src/themes/Crux/*.png: convert the green-channel images to grayscale + 2002-02-06 Havoc Pennington * src/prefs.c (change_notify): s/update_focus_mode/update_theme/ diff --git a/src/theme.c b/src/theme.c index b98c6135a..74707694a 100644 --- a/src/theme.c +++ b/src/theme.c @@ -70,6 +70,9 @@ colorize_pixbuf (GdkPixbuf *orig, gdk_pixbuf_get_bits_per_sample (orig), gdk_pixbuf_get_width (orig), gdk_pixbuf_get_height (orig)); + if (pixbuf == NULL) + return NULL; + orig_rowstride = gdk_pixbuf_get_rowstride (orig); dest_rowstride = gdk_pixbuf_get_rowstride (pixbuf); width = gdk_pixbuf_get_width (pixbuf); diff --git a/src/themes/Crux/active-bottom-left-border.png b/src/themes/Crux/active-bottom-left-border.png index 520c3570525740d68b1b2623e45f64d17877ed7c..c6657c6d9affb2191a5ca07d7fe14a6103e7b401 100644 GIT binary patch delta 89 zcmZ3-STR90xY)@vgaZg_I8r(o7#Q?DT^vIy<|L;iB>Xt6dIAGO^aqyobFVdQ I&MBb@0EPW1TL1t6 delta 158 zcmZo;+|4*awLaa^*O7r?V?XzwL{{XE)7O>#A|pSGrBGKR$0MMSg{O;SNX4Ak(+4>l90ZsT+&t{J=1<+Vl7g*A z+B-H?wkm2KIdbUO(GTZ4Z(jUtaWAPp&O^RmMf~bVHtt2-apo1Tt^o~U@O1TaS?83{ F1OQCZI%WU> diff --git a/src/themes/Crux/active-bottom-mid-left-border.png b/src/themes/Crux/active-bottom-mid-left-border.png index 7fa6adfa87fa95928fc52293d59f28fbdfec5ec5..7eec69f55ff3018591a3816df81aa12919dce312 100644 GIT binary patch delta 142 zcmV;90CE460;>U#C4X~5NmK|32nc)#WQYI&0Afi*K~#90#gefN05J#yo!4*0KG`dq zq+tn5Y`_3?`6|Wh`GzL$?32KS8-Rs_y2ltPAc;9ARJH9)L{{&;%+mrSQ($I@h*!2f w$r4WsnAtCM_mAJlD?C%f;SF3Tp98=Hk|tNYD%JAP00000Ne4wvM6N<$g0}8DWdHyG delta 247 zcmZ3@IE86~YJIw+uOkD)#(wTUiL49^3~Wi>?k)`fL2$v|<&%LToCO|{#S9GGJRrFdgViHS{=S$D^@QcgRKSpcyQw8=4#vd9!8m*F0R%B_r zy`lK+^Ly26wq~pi^xDgOhMiF?p*e`l^7-|g>@(ICYelnll`gSF?EA9$kcsb-DIe|~ vzBQw~;JM5(3703uPKBTNPrRS{{}rdgPfy!~FJU!6*D-jy`njxgN@xNAc%Wi3 diff --git a/src/themes/Crux/active-left-border.png b/src/themes/Crux/active-left-border.png index b030796f9ab481cb5da15c19d81ca3b9da1980c2..eb74fe87951a1bc568b52f0a28b73b8216acfd49 100644 GIT binary patch delta 87 zcmV-d0I2_~0dANmK|32;1RL-~a#sElET{RCt_YW?*1gxNxDiwzh(T!lg@> tm>6K-@87=+3=9bVzkmNw_z*DE`2aeA3r*O-OuGO8002ovPDHLkV1oZSBi8@` delta 142 zcmXS2%{W1&o+aJU*O7r?V?XzwL{)7O>#A|t;zhwhVG_AWpn4Nn)xkcv6UX$c7l5ho5TID25hfdd7djh&2q n|BMU_6h8l7_))TrS)QS^n)!C;k2hLCJq#S4u6{1-oD!M3f+Y%maTxw!mBz3a6kX{S5A za#K_}X5LQz$7IdEo!4)XfXZK2q1FdV$JJkFsyK~#90bLWY89ohFH>A(X`vR%G?DcPL>0000FSrKdLXHW&!79Avy$?|Q{a+T+=M zfrdD>52=f9vzGDYNzZXn^!U}S!gbKK&;QzGHLiU*q1npo1PvGYZ=RF(`M5m)jRyH7 U%i8mN(Q_d#0Pd^(--lJmu9Kdg`vOcHz$d32g?An}3PxsdX!Tr|FY(MbUqvDE(Xc%rGIAdX2 z`Z|4iOqB^{5+l=&Ifa}n6RJ5gvd?Ke&q{kRhTanF6~)rEv=^OL&r&4Vqc8VCa1ac;Xy eJLLy%x$y&dMRE@nH?F7v0000)^ diff --git a/src/themes/Crux/active-menu-button-pressed.png b/src/themes/Crux/active-menu-button-pressed.png index 95ea391a75db764a63da4e2aae7d2c6e65d8e12b..dbdc18ed86f9ce676ab1adb9834945b75a788a7f 100644 GIT binary patch delta 321 zcmV-H0lxm(0^926F-DhCA|i3=(HvnCk-(go zBafFE#6U!J0PsJ8WX#OWzh=GX0wbbt2U+%?9hlh(S|k}`UeI4cN=Y)2D7IWyUbc#0 zW_CoBbDrmUnmVQzNf*;enQQe|15=NV&^tv{Bx)_y*pq9}dAjIP7_3FBmxS&hrIo!4uzn6^F2SCe4;ub@kpJe8i^CkL-(*+8 zsYROFWY0H3t2c8!gT%xeubYvYGSp{Y)GuFM*s`jDAixbr2KCohvE!O6KP+T&0SYa8 QkpKVy07*qoM6N<$f(TZIeELf3VX zh|cG;h=>RXr4;YIb8cCL5JCw1{XP;A5gm`m$K&yQKIeIEPJbB3@pL-9Uay#QX6F0- zJ`4l&fGQ94eLqdp`~8kYBqHNDipWxOMNrk8b4n=^k*cPYn0aZvZjVO0^$OYB!2{FK}|sb0I`n?{9y$E000JJOGiWi{{a60|De66lK=n!32;bR za{vGf4*&oQ4*`<-1El}}00(qQO+^RM0S^Q(GOc%={Qv*}-$_J4RCt_~(lJiNFc5{| zFImH7I0#pypyCc30Ew2GiVjh1141hxiJeePydtXv!Biv5|9`ya=V@Fqk|~T#)~lgq zC+WE*lPfUMVA-^^Tn5l{%?q!5ZYb=z;Z4#p@XSMS!E};=!oaW*PLL5}mgaEs2Jq9;6hL2r{*ORpUntdUTQ8mT6Xm}OVj9)Gn|$uy6-Gk^K&!p5p5k^~og(V2gJwRW6y Z<{RJRa(}ljzZL)h002ovPDHLkV1kkfj#mHx diff --git a/src/themes/Crux/active-top-center-left.png b/src/themes/Crux/active-top-center-left.png index 2c6e7edbb015bf534030eab9c4070d63f0bbcf29..7275abb047212a1e144ecf921166468309ffbd2a 100644 GIT binary patch delta 221 zcmV<303!dU0{Q`vC4X~5NmK|32nc)#WQYI&0I^9#K~#90-Iu`)12G5$;Y24XCk>^9 zG!%D}pWTEpke5$MUa>jJN9MO5w5zp+!29)L006hg6C#2sC0lL61C>%%dvHN!p$h;K zkzJS>AmX$>YR-tJ*4poJPe}X#%)Huzi}(%HT335;5&sE=Z&u)a4@Bg@8cgU5t-88>wb35sE+>!!Us^*)gD~z0s39g-`S|{c;}32$~jLZKMM!|p--|G XL5ar5s2AtF00000NkvXXu0mjft~X#E delta 266 zcmeyxxQuCnYJIw+uOkD)#(wTUiL49^3~Wi>?k)`fL2$v|<&%LToCO|{#S9GGydcc@ zmi>SZP>{XE)7O>#5)+%asO8>(0~dipi#=T&Ln`Lno$koTtjOUiKkc{ta`i0zi`O=G z_q|L>yQrncvv2Bs0VXCX)ukafln=0KypFo|x1MPa-?eod;eDJePCKjH6P%Oh+iO%V z&N~17RbZXemU+1v(K8hqmzQ&xsjWD0*qTLJcuT+!t|#~1($h9^={Oj@0IK?u-m(3B z$-67RpYOZwzj$5(+adK073~R+XFL2A_gMbSfA_(tor1Hf>RX=j`eeG*G@0z&4|Fes Nr>mdKI%cPYCII&&X+i)1 diff --git a/src/themes/Crux/active-top-center-mid-left.png b/src/themes/Crux/active-top-center-mid-left.png index 7a3904a062336ac3a9611a110eba5d13e6897fd0..56678367af6ecbab27a00520d417ebc0cea52be5 100644 GIT binary patch delta 835 zcmV-J1HAmB2-^mbC4X~5NmK|32nc)#WQYI&0}@F@K~#90)mOVt<3JQWV>?c;#0OBK ztx*b!NQi=pW-0jz{$M*Aiv10`&}Wg5K!Pr!LP!K`gAu`zDIy_~;P=dIv9i}Q4k*#C zm*q6$IXUCp=iG#R|N4akz_%ZFkU(VOe*`%^Jmf`UFc{$Y_Za>+5`R zaS?`LpkA+|R;yuue?RYwot+(?rYYh$2Bj37a}YwHs;Z#-=MFTRO>Av#3Ebo3BTi3G z1G*J{`JRYNX zo-u}L@2e7}63Uvf_)IB99LH$2THG)UXqtu~2w+(jOn=iXonKp9@jiaL@P)flV17i$|qM+SwFhQ7BEu=rhzdA`2x^& z9iHb2eSc8(U=%WtMO;yoe6J`aA0BigR9C zGhMUUT6P*oL4lAzb?q2KT44rT9HU0vmkMg#SF9lEYV(=>ECo&1Zpx3_r~6nU~2 zbtMPn9>`_@Aw;;5WGpQ$VPj)M;4I5Rx7*D#kbj+Tx7)bAy~Weh6DE@hEXyhl%OD7_ zx3?$gOw+{u{r%hFpXR_kxW2v?_O9z9NfMZ*nR~smvchfKMyJyebaG=yQG{7^B?pQ( z&7XoX200+QuETX*;YMSOAqWCN7sv5TIvKeG^8bP&ii0iNXXQ~`r delta 1037 zcmV+o1oHda2BQd&C4Xl@O+f$vv5yPh5Yp zH^WLuNHSwGf4aNMLv>erDxFc+3AzsqT~+@KIIU!dC z!EG-FUjyF&OF$1uffxv3=lva#Bne6>uHC+7D1d1t+5iFwEHBG4YHl-Xi-w}`R$d3* z@z$OJpF_XjXJuu@M&S(j5O@w80b}4d;0w!JTU(>o>wl3X2|*BCp@6()b=RAJ2Mlal z2_Z<51SY^9@KrmnnMTI6R_cY|Vg!Jhq!NGz&fw(agfva9d8fbuxc#+%D&Er45^0*w z_@*}XB0Zs)wyZY4zdqRHT)<>9u@M-;%zka>!{Ly@U_cZ_t^g>dTtpTrLhylS;@XVO z@nhf-=YOVFm8dtXcTN0MaZ(@wA|QnO@7@<_ni9wHLXF)X0UxgdZ+mM`fzPl)boG(I zUEo)2dYx6g@2xLZS6AKkMHzdx5BSiH@gwiuE>OVDH*ShJj*(Jw>&sh)UEpDZ_cJhr z!^1ri%tbZ@6#&~peM5ohnhHe_WMlGtXvtL#K zW+PDFxNOX2%M*Ke3Mk7GA%x9o0Sq`#D_M=FFc=KTvJ5FDd7cwR5kU|*QyXI_ih{B% z(ONqJQcBm|gCMvdLhv5uLe*(PaBk-2^BFdcQlJ9_)uFFr8(O`Wirc}OI>tsy!Pe%M zOMkx`pWHC@rTCqFYjaCjQ_ zL{Svhls{t2YZE1$o}Ri2!+1XL`1qKjD5yeZ|B=g%`RF#P}jADM(O&;S63ogoGUsTy*@O1TaS?83{1ORYtFhc+U diff --git a/src/themes/Crux/inactive-menu-button-prelight.png b/src/themes/Crux/inactive-menu-button-prelight.png index d2063d5beb297631c8cfa8f0ecef91709e7e5708..ecf6f94055973e69c941b82a014a0ae71021ff2f 100644 GIT binary patch delta 316 zcmV-C0mJ@}1J?qOB!2^QLP=Bz2ngHZPv8Im0S`$;K~#90jgq}>!$1s$-%;8mg?7jS zE;2?Y@D^D|3kXoFPIa09wp&MqAm~WmF$HD$C$`~NvEcVezPsY<<4r%`3;q86!7B;? zHk*yAs%p;J%*-r=0N}D9A|h(rwgkY;P16849*^TV-ZkFsc7NOL7C;F=L;y5R<9@Ey z-c{H2G))Vjs)xhDu}6Ta#uyhMr8EpfjPY`HGh40hRh0)VQjM1+~w|M$O@h|03u@AuD5@8}PuHTk4f6zre? O00000000L_}3pHAxa8IyTJA%z2(0BC^(IS=RUcG)>mpmk$raP=6E!5g8)dwyo>Bs;VMR z%Cem2c?STDGe*ILti-n0000tK=N%Q&G~9hJpqmkdTA(cV{UaTaFx}Of~wN(SOW-P1*1FnJFnEfXw6? zN-03sbrunurwtAcf`o(uT#^cv-Q&*OofAC3C;Y(aY5;t}GkxD%M9|;^UjLDfc!8ed z@o4Uj!#BjGV(v3SFfa^*MFauA;Fs0s!_mo(DKB z_P3T+FuJZQ+wIofTWhT~cbBwYcqygUYG!8k2e;q7`2FP=ivR!s07*qoM6N<$f^El` AfdBvi