minor updates; changing package naming to meet http://devmanual.gentoo.org/ebuild...

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1051 7f574dfc-610e-0410-a909-a81674777703

diff --git a/configure.ac.in b/configure.ac.in
index 3485614..5a4331c 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -4,13 +4,13 @@ dnl major, minor and micro version macros.
 m4_define([conky_version_major], [1])
 m4_define([conky_version_minor], [5])
 m4_define([conky_version_micro], [1])
-m4_define([conky_version_tag], [svn]) dnl [] for releases
-m4_define([conky_version_revision],[r@REVISION@])
+m4_define([conky_version_tag], [pre]) dnl [] for releases
+m4_define([conky_version_revision],[_pre@REVISION@])
 m4_define([conky_version],
     [conky_version_major().conky_version_minor().conky_version_micro()ifelse(
-      conky_version_tag(), [svn],
-      [-conky_version_tag()-conky_version_revision()],
-      [ifelse(conky_version_tag(), [], [], [-conky_version_tag()])])])
+      conky_version_tag(), [pre],
+      [conky_version_revision()],
+      [ifelse(conky_version_tag(), [], [], [conky_version_tag()])])])
 
 AC_INIT([Conky], [conky_version()], [brenden1@users.sourceforge.net])
 

diff --git a/src/conky.c b/src/conky.c
index 6ab59b8..945df07 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -1965,24 +1965,16 @@ static void free_text_objects(unsigned int count, struct text_object *objs)
                switch (objs[i].type) {
 #ifndef __OpenBSD__
                        case OBJ_acpitemp:
-                               close(objs[i].data.i);
-                               break;
                        case OBJ_acpitempf:
                                close(objs[i].data.i);
                                break;
                        case OBJ_i2c:
-                               close(objs[i].data.sysfs.fd);
-                               break;
                        case OBJ_platform:
-                               close(objs[i].data.sysfs.fd);
-                               break;
                        case OBJ_hwmon:
                                close(objs[i].data.sysfs.fd);
                                break;
 #endif /* !__OpenBSD__ */
                        case OBJ_time:
-                               free(objs[i].data.s);
-                               break;
                        case OBJ_utime:
                                free(objs[i].data.s);
                                break;