From 9b8cd050a22f8ab6625c6a937eba0a370a22f161 Mon Sep 17 00:00:00 2001 From: oliver Date: Sun, 26 Jun 2005 13:27:11 +0000 Subject: replace "get all" and "send later" icons too when ICON_THEME is selected Submitted by: jylefort --- mail/sylpheed2-devel/Makefile | 7 ++ mail/sylpheed2-devel/files/icon-theme.diff | 129 +++++++++++++++++++++++++++-- mail/sylpheed2/Makefile | 7 ++ mail/sylpheed2/files/icon-theme.diff | 129 +++++++++++++++++++++++++++-- mail/sylpheed3/Makefile | 7 ++ mail/sylpheed3/files/icon-theme.diff | 129 +++++++++++++++++++++++++++-- 6 files changed, 381 insertions(+), 27 deletions(-) diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile index a2ffc17..607ffe7 100644 --- a/mail/sylpheed2-devel/Makefile +++ b/mail/sylpheed2-devel/Makefile @@ -87,6 +87,8 @@ CONFIGURE_ARGS+=--disable-ssl .if defined(WITH_ICON_THEME) RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme EXTRA_PATCHES+= ${FILESDIR}/icon-theme.diff +UUDECODE?= /usr/bin/uudecode +GDK_PIXBUF_CSOURCE?= ${X11BASE}/bin/gdk-pixbuf-csource .endif MAKEFILES= Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \ @@ -113,6 +115,11 @@ post-patch: pre-build: ${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool +.if defined(WITH_ICON_THEME) +.for i in mail_receive_all mail_send_queue + cd ${WRKSRC}/src/pixmaps && ${UUDECODE} ${i}.png.uu && ${GDK_PIXBUF_CSOURCE} --raw --name=${i} ${i}.png > ${i}.h +.endfor +.endif post-install: .if !defined(NOPORTDOCS) diff --git a/mail/sylpheed2-devel/files/icon-theme.diff b/mail/sylpheed2-devel/files/icon-theme.diff index 0cc63ae..f0e979b 100644 --- a/mail/sylpheed2-devel/files/icon-theme.diff +++ b/mail/sylpheed2-devel/files/icon-theme.diff @@ -1,6 +1,6 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/compose.c ./src/compose.c --- ../sylpheed-2.0.0beta3.orig/src/compose.c Tue Jun 21 08:57:48 2005 -+++ ./src/compose.c Sat Jun 25 20:05:20 2005 ++++ ./src/compose.c Sun Jun 26 14:12:37 2005 @@ -4331,7 +4331,7 @@ gtk_container_add(GTK_CONTAINER(container), toolbar); gtk_widget_set_size_request(toolbar, 1, -1); @@ -10,6 +10,15 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/compose.c ./src/compose.c send_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Send"), _("Send message"), +@@ -4340,7 +4340,7 @@ + G_CALLBACK(toolbar_send_cb), + compose); + +- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SEND_QUEUE); ++ icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_SEND_QUEUE); + sendl_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), + _("Send later"), + _("Put into queue folder and send later"), @@ -4349,7 +4349,7 @@ G_CALLBACK(toolbar_send_later_cb), compose); @@ -80,7 +89,7 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/folderview.c ./src/folderview.c stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_NOSELECT, diff -ruN ../sylpheed-2.0.0beta3.orig/src/mainwindow.c ./src/mainwindow.c --- ../sylpheed-2.0.0beta3.orig/src/mainwindow.c Mon Jun 20 10:13:33 2005 -+++ ./src/mainwindow.c Sat Jun 25 20:15:17 2005 ++++ ./src/mainwindow.c Sun Jun 26 14:12:20 2005 @@ -2188,11 +2188,11 @@ GTK_ORIENTATION_HORIZONTAL); gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH); @@ -95,6 +104,15 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/mainwindow.c ./src/mainwindow.c get_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Get"), _("Incorporate new mail"), +@@ -2200,7 +2200,7 @@ + icon_wid, + G_CALLBACK(toolbar_inc_cb), + mainwin); +- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_RECEIVE_ALL); ++ icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_RECEIVE_ALL); + getall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), + _("Get all"), + _("Incorporate new mail of all accounts"), @@ -2211,7 +2211,7 @@ gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); @@ -196,9 +214,66 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/mainwindow.c ./src/mainwindow.c account_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Account"), _("Account setting"), +diff -ruN ../sylpheed-2.0.0beta3.orig/src/pixmaps/mail_receive_all.png.uu ./src/pixmaps/mail_receive_all.png.uu +--- ../sylpheed-2.0.0beta3.orig/src/pixmaps/mail_receive_all.png.uu Thu Jan 1 01:00:00 1970 ++++ ./src/pixmaps/mail_receive_all.png.uu Sun Jun 26 13:47:39 2005 +@@ -0,0 +1,23 @@ ++begin 644 mail_receive_all.png ++MB5!.1PT*&@H````-24A$4@```!@````8"`8```#@=SWX````!F)+1T0`_P#_ ++M`/^@O:>3````"7!(67,```L3```+$P$`FIP8```##TE$051(Q]663T@<5QS' ++M/SONKGO*.M8VM$5*H( ++MI%AH#6'72PB4DDNVB0@2XL&35T>P,<[HFG6R?V9^.61WF74WQ3^]],&7>;SW ++MY?=]W_=^\WL/_N_-=WK@2OC*_A>]D2['<7CY:H^]G9>O2F_*'UZ4U]3Z!OKV ++M_WKQIV2?/9#)V9O2]6GG_F5X?D^_"V@3<95BN(B`)#^.7E-`G?"'>']N52<4 ++M_`$_G]_XC&`HD`.^.2/OVU9G"_`](%]^'97,DP?RV^-?9?R'8?G@$U6`)OP+ ++M[S80JBU>\633+XE$@LS]+,\>K5',%Q$SR,;3Y[BN2Z52H5*I4"J5L&V;WY?_ ++MX.^'3RGFBSC[;3S,/"*12`#\#*A`T.M$`<0T3=$T3;:WM^7NCW=E5RHFF:K*ZNUEQ$@+#W"!1`1$0,PY"A ++MH2%Q'*<>W"M@69:8IBFF:)Q^.$0B%$!-=U&[XUG)R<,#DYR<3$!)%(I.5_U200#`91595T.LW(R`CM ++M[>WPSEY3<%W7B;FYEA86&!W ++M=_=<%\OBXB)C8V,,#@X"7`<,X*A!()5*,3HZ>N';:V5EA:6EI08![Q;=;E74 ++M+H"?O*7"YREV[=5]"P.!2US#Y>K*+:#H.Y5)P2K:+B'@`*4J7%^+1X#O/WA, ++8U+:+M\VX-P;4@`4U`````$E%3D2N0F"" ++` ++end +diff -ruN ../sylpheed-2.0.0beta3.orig/src/pixmaps/mail_send_queue.png.uu ./src/pixmaps/mail_send_queue.png.uu +--- ../sylpheed-2.0.0beta3.orig/src/pixmaps/mail_send_queue.png.uu Thu Jan 1 01:00:00 1970 ++++ ./src/pixmaps/mail_send_queue.png.uu Sun Jun 26 13:47:51 2005 +@@ -0,0 +1,26 @@ ++begin 644 mail_send_queue.png ++MB5!.1PT*&@H````-24A$4@```!@````8"`8```#@=SWX````!F)+1T0`_P#_ ++M`/^@O:>3````"7!(67,```L3```+$P$`FIP8```#JDE$051(Q\V5STMC5Q3' ++M/^_EY26=*9JH6)JNW'3JHMVUPBPL&`5=M+&&=B/2A6!!8SM%J_-'.#JT*(ZZ ++M$+J8TDY7;84(6?D#"]8Z()5:<2@F(XYOC-4D)B;OG2[R@R03!UT4>N#P[GWW ++MW._WGG/N.1?^3^)[_X;\E_@2>_J+`-`"L-2BDS_P^_V( ++M2(EF5[72;TX2B03Q>)Q8+,;^_CY^OQ_@:\`-Z(!23,#L["R=G9TEFP&LS"F8 ++MR1?BFTPF22:31*-1`H$`W=W=^:5JP/'"D=QN-Y.3D[2VMK*XN$@BD0)N@9_'Z1YQ9$-L8B02"0(!`+T]/3@\7CR4/;R_*I9>Y%X/"[A<%A\/I^D ++MT^E\8574_?U]\7J],C\_+UM;6[*VMI9?>SL7)E4K=UO7]8(G[>WMA3#DWB[,V]O;GWL\G@\O]:`8/$^V ++MM;4E+2TMLKR\+"(BIFF*B,C"PH*TM;6)98DD4]F0_?#HD30V-HY73/+AX2$3 ++M$Q/,S>$\W@2I_,F`$M+2[%8 ++M++91?DT'7U94@*BJ*KJNR\S,C%PF]\;'T\"/3H?S5G&$%,`)O`Z\E:O$2GH; ++MN*/K^J\C(R.)2#@LJ51*8K%SV=O;D_Z!@02P#GP&O$8V-25>Z#FU7?)^5`,- ++MP'O`N_7U];=J:FIpixbuf) +- pix_d->pixbuf = gdk_pixbuf_new_from_xpm_data +- ((const gchar **)pix_d->data); ++ if (!pix_d->pixbuf) { ++ if (pix_d->data) ++ pix_d->pixbuf = gdk_pixbuf_new_from_xpm_data ++ ((const gchar **)pix_d->data); ++ else if (pix_d->pixbuf_data) ++ pix_d->pixbuf = gdk_pixbuf_new_from_inline ++ (pix_d->pixbuf_data_len, ++ pix_d->pixbuf_data, ++ FALSE, ++ NULL); ++ else ++ g_return_val_if_reached(-1); ++ } + if (!pix_d->pixbuf) + return -1; + diff -ruN ../sylpheed-2.0.0beta3.orig/src/stock_pixmap.h ./src/stock_pixmap.h --- ../sylpheed-2.0.0beta3.orig/src/stock_pixmap.h Mon May 9 11:29:14 2005 +++ ./src/stock_pixmap.h Sat Jun 25 19:59:24 2005 diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile index a2ffc17..607ffe7 100644 --- a/mail/sylpheed2/Makefile +++ b/mail/sylpheed2/Makefile @@ -87,6 +87,8 @@ CONFIGURE_ARGS+=--disable-ssl .if defined(WITH_ICON_THEME) RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme EXTRA_PATCHES+= ${FILESDIR}/icon-theme.diff +UUDECODE?= /usr/bin/uudecode +GDK_PIXBUF_CSOURCE?= ${X11BASE}/bin/gdk-pixbuf-csource .endif MAKEFILES= Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \ @@ -113,6 +115,11 @@ post-patch: pre-build: ${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool +.if defined(WITH_ICON_THEME) +.for i in mail_receive_all mail_send_queue + cd ${WRKSRC}/src/pixmaps && ${UUDECODE} ${i}.png.uu && ${GDK_PIXBUF_CSOURCE} --raw --name=${i} ${i}.png > ${i}.h +.endfor +.endif post-install: .if !defined(NOPORTDOCS) diff --git a/mail/sylpheed2/files/icon-theme.diff b/mail/sylpheed2/files/icon-theme.diff index 0cc63ae..f0e979b 100644 --- a/mail/sylpheed2/files/icon-theme.diff +++ b/mail/sylpheed2/files/icon-theme.diff @@ -1,6 +1,6 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/compose.c ./src/compose.c --- ../sylpheed-2.0.0beta3.orig/src/compose.c Tue Jun 21 08:57:48 2005 -+++ ./src/compose.c Sat Jun 25 20:05:20 2005 ++++ ./src/compose.c Sun Jun 26 14:12:37 2005 @@ -4331,7 +4331,7 @@ gtk_container_add(GTK_CONTAINER(container), toolbar); gtk_widget_set_size_request(toolbar, 1, -1); @@ -10,6 +10,15 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/compose.c ./src/compose.c send_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Send"), _("Send message"), +@@ -4340,7 +4340,7 @@ + G_CALLBACK(toolbar_send_cb), + compose); + +- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SEND_QUEUE); ++ icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_SEND_QUEUE); + sendl_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), + _("Send later"), + _("Put into queue folder and send later"), @@ -4349,7 +4349,7 @@ G_CALLBACK(toolbar_send_later_cb), compose); @@ -80,7 +89,7 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/folderview.c ./src/folderview.c stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_NOSELECT, diff -ruN ../sylpheed-2.0.0beta3.orig/src/mainwindow.c ./src/mainwindow.c --- ../sylpheed-2.0.0beta3.orig/src/mainwindow.c Mon Jun 20 10:13:33 2005 -+++ ./src/mainwindow.c Sat Jun 25 20:15:17 2005 ++++ ./src/mainwindow.c Sun Jun 26 14:12:20 2005 @@ -2188,11 +2188,11 @@ GTK_ORIENTATION_HORIZONTAL); gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH); @@ -95,6 +104,15 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/mainwindow.c ./src/mainwindow.c get_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Get"), _("Incorporate new mail"), +@@ -2200,7 +2200,7 @@ + icon_wid, + G_CALLBACK(toolbar_inc_cb), + mainwin); +- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_RECEIVE_ALL); ++ icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_RECEIVE_ALL); + getall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), + _("Get all"), + _("Incorporate new mail of all accounts"), @@ -2211,7 +2211,7 @@ gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); @@ -196,9 +214,66 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/mainwindow.c ./src/mainwindow.c account_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Account"), _("Account setting"), +diff -ruN ../sylpheed-2.0.0beta3.orig/src/pixmaps/mail_receive_all.png.uu ./src/pixmaps/mail_receive_all.png.uu +--- ../sylpheed-2.0.0beta3.orig/src/pixmaps/mail_receive_all.png.uu Thu Jan 1 01:00:00 1970 ++++ ./src/pixmaps/mail_receive_all.png.uu Sun Jun 26 13:47:39 2005 +@@ -0,0 +1,23 @@ ++begin 644 mail_receive_all.png ++MB5!.1PT*&@H````-24A$4@```!@````8"`8```#@=SWX````!F)+1T0`_P#_ ++M`/^@O:>3````"7!(67,```L3```+$P$`FIP8```##TE$051(Q]663T@<5QS' ++M/SONKGO*.M8VM$5*H( ++MI%AH#6'72PB4DDNVB0@2XL&35T>P,<[HFG6R?V9^.61WF74WQ3^]],&7>;SW ++MY?=]W_=^\WL/_N_-=WK@2OC*_A>]D2['<7CY:H^]G9>O2F_*'UZ4U]3Z!OKV ++M_WKQIV2?/9#)V9O2]6GG_F5X?D^_"V@3<95BN(B`)#^.7E-`G?"'>']N52<4 ++M_`$_G]_XC&`HD`.^.2/OVU9G"_`](%]^'97,DP?RV^-?9?R'8?G@$U6`)OP+ ++M[S80JBU>\633+XE$@LS]+,\>K5',%Q$SR,;3Y[BN2Z52H5*I4"J5L&V;WY?_ ++MX.^'3RGFBSC[;3S,/"*12`#\#*A`T.M$`<0T3=$T3;:WM^7NCW=E5RHFF:K*ZNUEQ$@+#W"!1`1$0,PY"A ++MH2%Q'*<>W"M@69:8IBFF:)Q^.$0B%$!-=U&[XUG)R<,#DYR<3$!)%(I.5_U200#`91595T.LW(R`CM ++M[>WPSEY3<%W7B;FYEA86&!W ++M=_=<%\OBXB)C8V,,#@X"7`<,X*A!()5*,3HZ>N';:V5EA:6EI08![Q;=;E74 ++M+H"?O*7"YREV[=5]"P.!2US#Y>K*+:#H.Y5)P2K:+B'@`*4J7%^+1X#O/WA, ++8U+:+M\VX-P;4@`4U`````$E%3D2N0F"" ++` ++end +diff -ruN ../sylpheed-2.0.0beta3.orig/src/pixmaps/mail_send_queue.png.uu ./src/pixmaps/mail_send_queue.png.uu +--- ../sylpheed-2.0.0beta3.orig/src/pixmaps/mail_send_queue.png.uu Thu Jan 1 01:00:00 1970 ++++ ./src/pixmaps/mail_send_queue.png.uu Sun Jun 26 13:47:51 2005 +@@ -0,0 +1,26 @@ ++begin 644 mail_send_queue.png ++MB5!.1PT*&@H````-24A$4@```!@````8"`8```#@=SWX````!F)+1T0`_P#_ ++M`/^@O:>3````"7!(67,```L3```+$P$`FIP8```#JDE$051(Q\V5STMC5Q3' ++M/^_EY26=*9JH6)JNW'3JHMVUPBPL&`5=M+&&=B/2A6!!8SM%J_-'.#JT*(ZZ ++M$+J8TDY7;84(6?D#"]8Z()5:<2@F(XYOC-4D)B;OG2[R@R03!UT4>N#P[GWW ++MW._WGG/N.1?^3^)[_X;\E_@2>_J+`-`"L-2BDS_P^_V( ++M2(EF5[72;TX2B03Q>)Q8+,;^_CY^OQ_@:\`-Z(!23,#L["R=G9TEFP&LS"F8 ++MR1?BFTPF22:31*-1`H$`W=W=^:5JP/'"D=QN-Y.3D[2VMK*XN$@BD0)N@9_'Z1YQ9$-L8B02"0(!`+T]/3@\7CR4/;R_*I9>Y%X/"[A<%A\/I^D ++MT^E\8574_?U]\7J],C\_+UM;6[*VMI9?>SL7)E4K=UO7]8(G[>WMA3#DWB[,V]O;GWL\G@\O]:`8/$^V ++MM;4E+2TMLKR\+"(BIFF*B,C"PH*TM;6)98DD4]F0_?#HD30V-HY73/+AX2$3 ++M$Q/,S>$\W@2I_,F`$M+2[%8 ++M++91?DT'7U94@*BJ*KJNR\S,C%PF]\;'T\"/3H?S5G&$%,`)O`Z\E:O$2GH; ++MN*/K^J\C(R.)2#@LJ51*8K%SV=O;D_Z!@02P#GP&O$8V-25>Z#FU7?)^5`,- ++MP'O`N_7U];=J:FIpixbuf) +- pix_d->pixbuf = gdk_pixbuf_new_from_xpm_data +- ((const gchar **)pix_d->data); ++ if (!pix_d->pixbuf) { ++ if (pix_d->data) ++ pix_d->pixbuf = gdk_pixbuf_new_from_xpm_data ++ ((const gchar **)pix_d->data); ++ else if (pix_d->pixbuf_data) ++ pix_d->pixbuf = gdk_pixbuf_new_from_inline ++ (pix_d->pixbuf_data_len, ++ pix_d->pixbuf_data, ++ FALSE, ++ NULL); ++ else ++ g_return_val_if_reached(-1); ++ } + if (!pix_d->pixbuf) + return -1; + diff -ruN ../sylpheed-2.0.0beta3.orig/src/stock_pixmap.h ./src/stock_pixmap.h --- ../sylpheed-2.0.0beta3.orig/src/stock_pixmap.h Mon May 9 11:29:14 2005 +++ ./src/stock_pixmap.h Sat Jun 25 19:59:24 2005 diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile index a2ffc17..607ffe7 100644 --- a/mail/sylpheed3/Makefile +++ b/mail/sylpheed3/Makefile @@ -87,6 +87,8 @@ CONFIGURE_ARGS+=--disable-ssl .if defined(WITH_ICON_THEME) RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme EXTRA_PATCHES+= ${FILESDIR}/icon-theme.diff +UUDECODE?= /usr/bin/uudecode +GDK_PIXBUF_CSOURCE?= ${X11BASE}/bin/gdk-pixbuf-csource .endif MAKEFILES= Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \ @@ -113,6 +115,11 @@ post-patch: pre-build: ${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool +.if defined(WITH_ICON_THEME) +.for i in mail_receive_all mail_send_queue + cd ${WRKSRC}/src/pixmaps && ${UUDECODE} ${i}.png.uu && ${GDK_PIXBUF_CSOURCE} --raw --name=${i} ${i}.png > ${i}.h +.endfor +.endif post-install: .if !defined(NOPORTDOCS) diff --git a/mail/sylpheed3/files/icon-theme.diff b/mail/sylpheed3/files/icon-theme.diff index 0cc63ae..f0e979b 100644 --- a/mail/sylpheed3/files/icon-theme.diff +++ b/mail/sylpheed3/files/icon-theme.diff @@ -1,6 +1,6 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/compose.c ./src/compose.c --- ../sylpheed-2.0.0beta3.orig/src/compose.c Tue Jun 21 08:57:48 2005 -+++ ./src/compose.c Sat Jun 25 20:05:20 2005 ++++ ./src/compose.c Sun Jun 26 14:12:37 2005 @@ -4331,7 +4331,7 @@ gtk_container_add(GTK_CONTAINER(container), toolbar); gtk_widget_set_size_request(toolbar, 1, -1); @@ -10,6 +10,15 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/compose.c ./src/compose.c send_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Send"), _("Send message"), +@@ -4340,7 +4340,7 @@ + G_CALLBACK(toolbar_send_cb), + compose); + +- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SEND_QUEUE); ++ icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_SEND_QUEUE); + sendl_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), + _("Send later"), + _("Put into queue folder and send later"), @@ -4349,7 +4349,7 @@ G_CALLBACK(toolbar_send_later_cb), compose); @@ -80,7 +89,7 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/folderview.c ./src/folderview.c stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_NOSELECT, diff -ruN ../sylpheed-2.0.0beta3.orig/src/mainwindow.c ./src/mainwindow.c --- ../sylpheed-2.0.0beta3.orig/src/mainwindow.c Mon Jun 20 10:13:33 2005 -+++ ./src/mainwindow.c Sat Jun 25 20:15:17 2005 ++++ ./src/mainwindow.c Sun Jun 26 14:12:20 2005 @@ -2188,11 +2188,11 @@ GTK_ORIENTATION_HORIZONTAL); gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH); @@ -95,6 +104,15 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/mainwindow.c ./src/mainwindow.c get_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Get"), _("Incorporate new mail"), +@@ -2200,7 +2200,7 @@ + icon_wid, + G_CALLBACK(toolbar_inc_cb), + mainwin); +- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_RECEIVE_ALL); ++ icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_RECEIVE_ALL); + getall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), + _("Get all"), + _("Incorporate new mail of all accounts"), @@ -2211,7 +2211,7 @@ gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); @@ -196,9 +214,66 @@ diff -ruN ../sylpheed-2.0.0beta3.orig/src/mainwindow.c ./src/mainwindow.c account_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Account"), _("Account setting"), +diff -ruN ../sylpheed-2.0.0beta3.orig/src/pixmaps/mail_receive_all.png.uu ./src/pixmaps/mail_receive_all.png.uu +--- ../sylpheed-2.0.0beta3.orig/src/pixmaps/mail_receive_all.png.uu Thu Jan 1 01:00:00 1970 ++++ ./src/pixmaps/mail_receive_all.png.uu Sun Jun 26 13:47:39 2005 +@@ -0,0 +1,23 @@ ++begin 644 mail_receive_all.png ++MB5!.1PT*&@H````-24A$4@```!@````8"`8```#@=SWX````!F)+1T0`_P#_ ++M`/^@O:>3````"7!(67,```L3```+$P$`FIP8```##TE$051(Q]663T@<5QS' ++M/SONKGO*.M8VM$5*H( ++MI%AH#6'72PB4DDNVB0@2XL&35T>P,<[HFG6R?V9^.61WF74WQ3^]],&7>;SW ++MY?=]W_=^\WL/_N_-=WK@2OC*_A>]D2['<7CY:H^]G9>O2F_*'UZ4U]3Z!OKV ++M_WKQIV2?/9#)V9O2]6GG_F5X?D^_"V@3<95BN(B`)#^.7E-`G?"'>']N52<4 ++M_`$_G]_XC&`HD`.^.2/OVU9G"_`](%]^'97,DP?RV^-?9?R'8?G@$U6`)OP+ ++M[S80JBU>\633+XE$@LS]+,\>K5',%Q$SR,;3Y[BN2Z52H5*I4"J5L&V;WY?_ ++MX.^'3RGFBSC[;3S,/"*12`#\#*A`T.M$`<0T3=$T3;:WM^7NCW=E5RHFF:K*ZNUEQ$@+#W"!1`1$0,PY"A ++MH2%Q'*<>W"M@69:8IBFF:)Q^.$0B%$!-=U&[XUG)R<,#DYR<3$!)%(I.5_U200#`91595T.LW(R`CM ++M[>WPSEY3<%W7B;FYEA86&!W ++M=_=<%\OBXB)C8V,,#@X"7`<,X*A!()5*,3HZ>N';:V5EA:6EI08![Q;=;E74 ++M+H"?O*7"YREV[=5]"P.!2US#Y>K*+:#H.Y5)P2K:+B'@`*4J7%^+1X#O/WA, ++8U+:+M\VX-P;4@`4U`````$E%3D2N0F"" ++` ++end +diff -ruN ../sylpheed-2.0.0beta3.orig/src/pixmaps/mail_send_queue.png.uu ./src/pixmaps/mail_send_queue.png.uu +--- ../sylpheed-2.0.0beta3.orig/src/pixmaps/mail_send_queue.png.uu Thu Jan 1 01:00:00 1970 ++++ ./src/pixmaps/mail_send_queue.png.uu Sun Jun 26 13:47:51 2005 +@@ -0,0 +1,26 @@ ++begin 644 mail_send_queue.png ++MB5!.1PT*&@H````-24A$4@```!@````8"`8```#@=SWX````!F)+1T0`_P#_ ++M`/^@O:>3````"7!(67,```L3```+$P$`FIP8```#JDE$051(Q\V5STMC5Q3' ++M/^_EY26=*9JH6)JNW'3JHMVUPBPL&`5=M+&&=B/2A6!!8SM%J_-'.#JT*(ZZ ++M$+J8TDY7;84(6?D#"]8Z()5:<2@F(XYOC-4D)B;OG2[R@R03!UT4>N#P[GWW ++MW._WGG/N.1?^3^)[_X;\E_@2>_J+`-`"L-2BDS_P^_V( ++M2(EF5[72;TX2B03Q>)Q8+,;^_CY^OQ_@:\`-Z(!23,#L["R=G9TEFP&LS"F8 ++MR1?BFTPF22:31*-1`H$`W=W=^:5JP/'"D=QN-Y.3D[2VMK*XN$@BD0)N@9_'Z1YQ9$-L8B02"0(!`+T]/3@\7CR4/;R_*I9>Y%X/"[A<%A\/I^D ++MT^E\8574_?U]\7J],C\_+UM;6[*VMI9?>SL7)E4K=UO7]8(G[>WMA3#DWB[,V]O;GWL\G@\O]:`8/$^V ++MM;4E+2TMLKR\+"(BIFF*B,C"PH*TM;6)98DD4]F0_?#HD30V-HY73/+AX2$3 ++M$Q/,S>$\W@2I_,F`$M+2[%8 ++M++91?DT'7U94@*BJ*KJNR\S,C%PF]\;'T\"/3H?S5G&$%,`)O`Z\E:O$2GH; ++MN*/K^J\C(R.)2#@LJ51*8K%SV=O;D_Z!@02P#GP&O$8V-25>Z#FU7?)^5`,- ++MP'O`N_7U];=J:FIpixbuf) +- pix_d->pixbuf = gdk_pixbuf_new_from_xpm_data +- ((const gchar **)pix_d->data); ++ if (!pix_d->pixbuf) { ++ if (pix_d->data) ++ pix_d->pixbuf = gdk_pixbuf_new_from_xpm_data ++ ((const gchar **)pix_d->data); ++ else if (pix_d->pixbuf_data) ++ pix_d->pixbuf = gdk_pixbuf_new_from_inline ++ (pix_d->pixbuf_data_len, ++ pix_d->pixbuf_data, ++ FALSE, ++ NULL); ++ else ++ g_return_val_if_reached(-1); ++ } + if (!pix_d->pixbuf) + return -1; + diff -ruN ../sylpheed-2.0.0beta3.orig/src/stock_pixmap.h ./src/stock_pixmap.h --- ../sylpheed-2.0.0beta3.orig/src/stock_pixmap.h Mon May 9 11:29:14 2005 +++ ./src/stock_pixmap.h Sat Jun 25 19:59:24 2005 -- cgit v1.1