1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-29 13:22:36 +00:00
Commit Graph

1538 Commits

Author SHA1 Message Date
Brenden Matthews
fcb1260a39 exclude reserved IPs with if_up
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1113 7f574dfc-610e-0410-a909-a81674777703
2008-04-22 22:59:04 +00:00
Brenden Matthews
39a00f4cfa fixed hddtemp problems as well as some other misc things
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1112 7f574dfc-610e-0410-a909-a81674777703
2008-04-22 22:54:22 +00:00
Brenden Matthews
5c01c5991e fixed crash on realloc due to use of strncpy
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1111 7f574dfc-610e-0410-a909-a81674777703
2008-04-22 21:54:49 +00:00
Brenden Matthews
1dafa537d4 add missing math.h include
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1110 7f574dfc-610e-0410-a909-a81674777703
2008-04-17 20:46:29 +00:00
Brenden Matthews
5c32bc6bc8 include stdarg.h for va_start/va_end
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1109 7f574dfc-610e-0410-a909-a81674777703
2008-04-17 20:40:53 +00:00
Brenden Matthews
760d6217b9 updating LICENSE for ebuild
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1108 7f574dfc-610e-0410-a909-a81674777703
2008-04-16 04:16:44 +00:00
Brenden Matthews
feca8d2fb5 add missing include
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1107 7f574dfc-610e-0410-a909-a81674777703
2008-04-16 01:36:55 +00:00
Brenden Matthews
91dda068aa updating ebuilds
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1106 7f574dfc-610e-0410-a909-a81674777703
2008-04-14 23:57:15 +00:00
Brenden Matthews
5606618f07 oops; updating authors
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1105 7f574dfc-610e-0410-a909-a81674777703
2008-04-13 04:18:16 +00:00
Brenden Matthews
801cf11545 * Added patch for the following (thanks larsko):
* New $loadgraph to show a graph of load averages,
* add "show_graph_scale" option to turn off/on the showing of the
current max value for the graph,
* minor code fixes,
* update nano and vim syntax highlighting stuff.

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1104 7f574dfc-610e-0410-a909-a81674777703
2008-04-13 04:10:35 +00:00
Brenden Matthews
4d7ecc7951 * Getting rid of goto usage throughout code.
* Fix bug due to usage of gethostbyname() in threads (which is not
	reentrant) by using gethostbyname_r() when available.
	* Added patch for battery_time problem on 2.6.24 (thanks wedge).
	* Added patch to fix broken xmms2 stuff (thanks sleipner).
	* Added patch to fix SIGHUP/SIGUSR1 segfault (thanks norsetto).
	* Added patch to improve $if_up (thanks Aseem).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1103 7f574dfc-610e-0410-a909-a81674777703
2008-04-10 22:45:45 +00:00
Brenden Matthews
62b0a5f778 detect conky.conf as well as conkyrc for syntax highlighting
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1102 7f574dfc-610e-0410-a909-a81674777703
2008-04-03 02:54:47 +00:00
Brenden Matthews
77f8e9bba7 define our own strndup() when its not available (thanks to Pippijn for the idea)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1101 7f574dfc-610e-0410-a909-a81674777703
2008-04-02 19:46:09 +00:00
Brenden Matthews
a6a4a4c548 * Replacing strdup() with strndup() throughout
(this is probably going to break a few things)

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1100 7f574dfc-610e-0410-a909-a81674777703
2008-04-02 18:44:49 +00:00
Brenden Matthews
d46bcb0945 * Added patch to use mail_spool correctly (thanks Kapil)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1099 7f574dfc-610e-0410-a909-a81674777703
2008-04-02 18:29:08 +00:00
Brenden Matthews
fa94cac75f * Fixed segfault when configuration doesn't contain TEXT block (thanks
Pippijn).

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1098 7f574dfc-610e-0410-a909-a81674777703
2008-04-02 02:12:57 +00:00
Brenden Matthews
011f03b50d docs
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1097 7f574dfc-610e-0410-a909-a81674777703
2008-04-01 21:37:49 +00:00
Brenden Matthews
c6c02f6cf9 capitalization consistency
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1096 7f574dfc-610e-0410-a909-a81674777703
2008-04-01 06:10:58 +00:00
Brenden Matthews
3860b06624 cleanup configure output
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1095 7f574dfc-610e-0410-a909-a81674777703
2008-04-01 05:05:24 +00:00
Brenden Matthews
798207efbf bump version; doc fixes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1094 7f574dfc-610e-0410-a909-a81674777703
2008-04-01 04:59:00 +00:00
Brenden Matthews
e6ad00d26c Conky 1.5.1
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1092 7f574dfc-610e-0410-a909-a81674777703
2008-04-01 04:11:14 +00:00
Phil
d923325773 make specifying hdd names more flexible
* the macro DEV_NAME() "removes" any leading "/dev/"
  if existing
* the only object that needs the full path is hddtemp,
  so add code there to add "/dev/" if necessary
  (can't be done via macro)
* attempt to fix also the hddtemp output, as the
  "degree"-sign seems to be inserted in utf-8 and
  printed in latin.
* hddtemp breaks the rules by inserting the unit
  itself, but as it could be either "C" or "F", this
  would lead to confusion otherwise


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1091 7f574dfc-610e-0410-a909-a81674777703
2008-03-31 15:33:54 +00:00
Brenden Matthews
be2cd44e6d doc cleanup
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1090 7f574dfc-610e-0410-a909-a81674777703
2008-03-31 04:56:39 +00:00
Phil
81e424177b fix two typos in docs
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1089 7f574dfc-610e-0410-a909-a81674777703
2008-03-31 04:02:33 +00:00
Brenden Matthews
bbdbf3b4e3 fix possible mem leak in prepare_diskio_stat, fix return value on failure
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1088 7f574dfc-610e-0410-a909-a81674777703
2008-03-31 03:56:03 +00:00
Brenden Matthews
0ee3efdc0f make diskio accept devices starting with "/dev/"
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1087 7f574dfc-610e-0410-a909-a81674777703
2008-03-31 03:51:29 +00:00
Brenden Matthews
c2c6a63f5a * Added mem_res and mem_vsize to $top.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1084 7f574dfc-610e-0410-a909-a81674777703
2008-03-30 07:04:25 +00:00
Brenden Matthews
ceedc66f8d more battery cleanup
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1083 7f574dfc-610e-0410-a909-a81674777703
2008-03-30 04:02:53 +00:00
Brenden Matthews
fbb58187b5 add more checking in libmpdclient; make battery stuff look the same for sysfs and proc
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1082 7f574dfc-610e-0410-a909-a81674777703
2008-03-30 03:26:55 +00:00
Brenden Matthews
675b9fac96 mpd fix take 2
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1081 7f574dfc-610e-0410-a909-a81674777703
2008-03-30 02:29:12 +00:00
Brenden Matthews
3efefaf182 * Fixed bug in libmpdclient that caused file descriptors to be left open.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1080 7f574dfc-610e-0410-a909-a81674777703
2008-03-30 01:23:04 +00:00
Phil
70b9a1bf2e finally update our debugging CFLAGS
* drop -Wmissing-prototypes and -Wmissing-declarations,
  as not every function needs a prototype
* in fact the code builds using these flags, at least for
  my setup (--enable-smapi --enable-wlan --enable-rss
  --with-x --disable-portmon)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1079 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 12:55:36 +00:00
Phil
00eb4ec9af some relocation of header includes
* conky.h must come first, because it includes config.h
  which again defines _GNU_SOURCE, which is necessary
  for strdup() & Co.
* declaring cpu_separate in top.h makes no sense, as it
  includes conky.h which declares cpu_separate itself


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1078 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 12:44:29 +00:00
Phil
a8bb0d7052 fix typo
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1077 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 11:49:10 +00:00
Phil
2da63063d8 make use of __attribute__
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1076 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 11:35:02 +00:00
Phil
3135d8e672 update ChangeLog
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1075 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 11:13:13 +00:00
Phil
5c4fee8d32 implement upwards path traversal to find fs type
* yes, this is a feature and right now there is something
  like a feature freeze.
* BUT I tested this with: /, /tmp, /dev/mapper, /dev, //,
  /mnt/, /tmp/bla (the last one was non-existent, creating
  it during runtime and even mounting tmpfs on it led to
  expected results.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1074 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 11:09:47 +00:00
Phil
9d4c7ed14e improve header style
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1073 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 10:13:25 +00:00
Phil
871689ef5b no 'a' modifier in C99
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1072 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 10:11:16 +00:00
Phil
d75301498a remove unused global mail_s instance
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1071 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 09:59:27 +00:00
Phil
ab63c2b024 rename all shadowing variables for -Wshadow
* sadly intuitive names like "time" or "index" are already
  globally defined (functions in time.h and string.h)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1070 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 09:58:09 +00:00
Phil
a16a96911a fix register_iconv
* not sure but this looked completely wrong, as 'iconv'
  is a function.
* if iconv_cd is NULL, iconv_count is 0 and therefore
  realloc should do the same as malloc here.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1069 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 07:24:25 +00:00
Phil
2913a71216 the big relocation patch
* this moves all declarations to the beginning of their block
  to prevent mixed declarations and code


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1068 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 06:24:04 +00:00
Phil
4766f33456 don't use %Lu here, too
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1067 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 05:28:33 +00:00
Phil
42a62c0178 clear naming for the global text objects
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1066 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 05:23:45 +00:00
Phil
963bb6211c fix thread definitions
* we code against interfaces (void *f(void *))
* casting function pointers to object pointers
  is a no-no says gcc


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1065 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 05:14:35 +00:00
Phil
fea715f038 declaring info in common.c is redundant
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1064 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 04:55:41 +00:00
Phil
36a18732ea ISO C99 forbids named variadic macros
* also at least a single variadic argument must be
  specified, so this (absolutely perfect) code doesn't
  work
* this should fix it without changing the way the
  macros are to be called


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1063 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 04:47:10 +00:00
Brenden Matthews
cb653c0baa fix segfault
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1062 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 04:41:37 +00:00
Brenden Matthews
de53544017 moving debug cflags below other stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1061 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 04:09:09 +00:00