Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-16 18:15:17 +00:00
Code Issues Releases Activity

* Added patch to use mail_spool correctly (thanks Kapil)

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1099 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2008-04-02 18:29:08 +00:00
parent fa94cac75f
commit d46bcb0945
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -152,6 +152,7 @@ Kapil Hari Paranjape <kapil@imsc.res.in>
kFreeBSD support patch kFreeBSD support patch
realtime clock patch realtime clock patch
sysfs battery patch sysfs battery patch
mail_spool patch
Kevin Lyles <kevinlyles at gmail dot com> Kevin Lyles <kevinlyles at gmail dot com>
add long options patch add long options patch

3
ChangeLog
View File

@ -1,5 +1,8 @@
# $Id$ # $Id$
2008-04-02
* Added patch to use mail_spool correctly (thanks Kapil)
2008-04-01 2008-04-01
* Fixed segfault when configuration doesn't contain TEXT block (thanks * Fixed segfault when configuration doesn't contain TEXT block (thanks
Pippijn). Pippijn).

14
src/conky.c
View File

@ -3330,7 +3330,12 @@ static struct text_object *construct_text_object(const char *s,
if (!arg) { if (!arg) {
n1 = 9.5; n1 = 9.5;
strncpy(box, MAIL_FILE, sizeof(box)); /* Kapil: Changed from MAIL_FILE to
current_mail_spool since the latter
is a copy of the former if undefined
but the latter should take precedence
if defined */
strncpy(box, current_mail_spool, sizeof(box));
} else { } else {
if (sscanf(arg, "%s %f", box, &n1) != 2) { if (sscanf(arg, "%s %f", box, &n1) != 2) {
n1 = 9.5; n1 = 9.5;
@ -3380,7 +3385,12 @@ static struct text_object *construct_text_object(const char *s,
if (!arg) { if (!arg) {
n1 = 9.5; n1 = 9.5;
strncpy(box, MAIL_FILE, sizeof(box)); /* Kapil: Changed from MAIL_FILE to
current_mail_spool since the latter
is a copy of the former if undefined
but the latter should take precedence
if defined */
strncpy(box, current_mail_spool, sizeof(box));
} else { } else {
if (sscanf(arg, "%s %f", box, &n1) != 2) { if (sscanf(arg, "%s %f", box, &n1) != 2) {
n1 = 9.5; n1 = 9.5;

2
src/x11.c
View File

@ -403,7 +403,7 @@ void init_window(int own_window, int w, int h, int set_trans, int back_colour,
} }
} /* else { window.type != TYPE_OVERRIDE */ } /* else { window.type != TYPE_OVERRIDE */
fprintf(stderr, "Conky: drawing to created window (%lx)\n", fprintf(stderr, "Conky: drawing to created window (0x%lx)\n",
window.window); window.window);
fflush(stderr); fflush(stderr);