Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-04 21:18:33 +00:00
Code Issues Releases Activity

minor updates; changing package naming to meet http://devmanual.gentoo.org/ebuild-writing/file-format/index.html guidelines to begin doing prereleases

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1051 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2008-03-27 19:46:35 +00:00
parent bc6a75e44f
commit 5c9e2dcbfc
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac.in
View File

@ -4,13 +4,13 @@ dnl major, minor and micro version macros.
m4_define([conky_version_major], [1]) m4_define([conky_version_major], [1])
m4_define([conky_version_minor], [5]) m4_define([conky_version_minor], [5])
m4_define([conky_version_micro], [1]) m4_define([conky_version_micro], [1])
m4_define([conky_version_tag], [svn]) dnl [] for releases m4_define([conky_version_tag], [pre]) dnl [] for releases
m4_define([conky_version_revision],[r@REVISION@]) m4_define([conky_version_revision],[_pre@REVISION@])
m4_define([conky_version], m4_define([conky_version],
[conky_version_major().conky_version_minor().conky_version_micro()ifelse( [conky_version_major().conky_version_minor().conky_version_micro()ifelse(
conky_version_tag(), [svn], conky_version_tag(), [pre],
[-conky_version_tag()-conky_version_revision()], [conky_version_revision()],
[ifelse(conky_version_tag(), [], [], [-conky_version_tag()])])]) [ifelse(conky_version_tag(), [], [], [conky_version_tag()])])])
AC_INIT([Conky], [conky_version()], [brenden1@users.sourceforge.net]) AC_INIT([Conky], [conky_version()], [brenden1@users.sourceforge.net])

8
src/conky.c
View File

@ -1965,24 +1965,16 @@ static void free_text_objects(unsigned int count, struct text_object *objs)
switch (objs[i].type) { switch (objs[i].type) {
#ifndef __OpenBSD__ #ifndef __OpenBSD__
case OBJ_acpitemp: case OBJ_acpitemp:
close(objs[i].data.i);
break;
case OBJ_acpitempf: case OBJ_acpitempf:
close(objs[i].data.i); close(objs[i].data.i);
break; break;
case OBJ_i2c: case OBJ_i2c:
close(objs[i].data.sysfs.fd);
break;
case OBJ_platform: case OBJ_platform:
close(objs[i].data.sysfs.fd);
break;
case OBJ_hwmon: case OBJ_hwmon:
close(objs[i].data.sysfs.fd); close(objs[i].data.sysfs.fd);
break; break;
#endif /* !__OpenBSD__ */ #endif /* !__OpenBSD__ */
case OBJ_time: case OBJ_time:
free(objs[i].data.s);
break;
case OBJ_utime: case OBJ_utime:
free(objs[i].data.s); free(objs[i].data.s);
break; break;