Permalink
Browse files

Reformatted all code

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1007 7f574dfc-610e-0410-a909-a81674777703
  • Loading branch information...
1 parent 3cf1a29 commit 3d26a4880e92df2c6004d85c1be458e35c6bfc3a Kevin Lyles committed Feb 20, 2008
Showing with 9,374 additions and 8,904 deletions.
  1. +2 −2 AUTHORS
  2. +25 −25 ChangeLog
  3. +28 −28 NEWS
  4. +11 −11 README.cvs-version
  5. +1 −1 autogen.sh
  6. +19 −19 configure.ac.in
  7. +3 −3 debian/copyright
  8. +1 −1 doc/Makefile.am
  9. +17 −17 doc/README.docs
  10. +11 −11 doc/command_options.xml
  11. +2 −2 doc/config_settings.xml
  12. +7 −7 doc/config_settings.xsl
  13. +518 −518 doc/conky.1
  14. +43 −43 doc/docs.xml
  15. +9 −9 doc/variables.xml
  16. +8 −8 doc/variables.xsl
  17. +1 −1 extras/nano/README
  18. +96 −96 extras/vim/syntax/conkyrc.vim
  19. +3 −3 m4/pkg.m4
  20. +1 −1 src/Makefile.am
  21. +170 −153 src/audacious.c
  22. +4 −7 src/audacious.h
  23. +35 −34 src/bmpx.c
  24. +79 −56 src/common.c
  25. +3,561 −3,333 src/conky.c
  26. +81 −81 src/conky.h
  27. +294 −339 src/freebsd.c
  28. +29 −22 src/fs.c
  29. +51 −44 src/hddtemp.c
  30. +923 −758 src/libmpdclient.c
  31. +236 −277 src/libmpdclient.h
  32. +496 −491 src/libtcp-portmon.c
  33. +117 −122 src/libtcp-portmon.h
  34. +845 −779 src/linux.c
  35. +32 −28 src/mail.c
  36. +62 −45 src/mboxscan.c
  37. +5 −6 src/mboxscan.h
  38. +13 −12 src/mixer.c
  39. +99 −72 src/mpd.c
  40. +78 −85 src/netbsd.c
  41. +213 −207 src/openbsd.c
  42. +114 −92 src/prss.c
  43. +30 −32 src/prss.h
  44. +43 −34 src/rss.c
  45. +8 −11 src/solaris.c
  46. +197 −203 src/timed_thread.c
  47. +21 −17 src/timed_thread.h
  48. +228 −239 src/top.c
  49. +28 −32 src/top.h
  50. +230 −255 src/x11.c
  51. +246 −232 src/xmms2.c
View
@@ -194,8 +194,8 @@ Peter Tarjan <ptarjan at citromail dot hu>
IBM acpi support patch
SMP support for freq stuff
CPU voltage patch
-
-Petr Holub <hopet@users.sourceforge.net>
+
+Petr Holub <hopet@users.sourceforge.net>
fix autotools on FreeBSD in autogen.sh
Improved battery readout on FreeBSD
View
@@ -16,14 +16,14 @@
cumulative CPU time of a process.
4) Simplified integer rounding.
5) Fixed the window width when a goto is used.
- 6) Fixed the window width when an offset is used.
+ 6) Fixed the window width when an offset is used.
(thanks Kevin Lyles).
2007-12-31
- * Applied submitted patches:
+ * Applied submitted patches:
1) to suport Debian's kFreeBSD;
- 2) to use realtime clock in timed threads and
- 3) to fix get_ibm_acpi_volume zero value bug
+ 2) to use realtime clock in timed threads and
+ 3) to fix get_ibm_acpi_volume zero value bug
(thanks Kapil Hari Paranjape).
2007-11-22
@@ -33,7 +33,7 @@
* Added Gentoo USE flag audacious-legacy for Audacious legacy support.
2007-11-16
- * Added support for Audacious 1.4.0 and legacy versions via
+ * Added support for Audacious 1.4.0 and legacy versions via
--enable-audacious=yes|no|legacy.
2007-11-14
@@ -70,7 +70,7 @@
2007-09-01
* Improved performance slightly.
* Added 'music_player_interval' config option to specify an update interval for
- music player threads (currently honored by mpd and audacious).
+ music player threads (currently honored by mpd and audacious).
* Fixed some minor memory leaks associated with SIGUSR1.
* Zero out imap and pop3 stuff when the connection fails.
@@ -184,7 +184,7 @@
2006-12-22
* client/server infrastructure and prototype for linux only (so far):
- requires libdexter (http://sourceforge.net/projects/libdexter)
- and the dxt-sysinfo plugin (svn only at the moment).
+ and the dxt-sysinfo plugin (svn only at the moment).
* new config items:
- dexter_client yes/no
- dexter_server yes/no
@@ -196,15 +196,15 @@
- wm_class_name (use own_window_class, same function)
* configure changes:
--disable-network (default=yes) with auto-detection for libdexter.
- - remove useless --enable-proc-uptime (PROC_UPTIME never referenced).
+ - remove useless --enable-proc-uptime (PROC_UPTIME never referenced).
HAVE_SYSINFO and others determine if /proc/uptime is used.
- silently disable xft, double-buffer and xdamage if no x11.
- change enable/disable labels to reflect defaults accurately.
- simplified compile-based checks for sysinfo/getloadavg and by moving
them into AC_CHECK_FUNCS.
* allow decorated, own_window=yes windows to be given input focus by WM:
- do not pass button clicks through to desktop in this scenario as conky
- immediately loses focus.
+ immediately loses focus.
2006-12-13
* Clarify LGPL license on timed_thread modules.
@@ -226,7 +226,7 @@
2006-12-09
* Replaced hash module used by libtcp-portmon with GLib's GHashTable,
due to licensing issue noted by Fedora Core packagers.
- * Eliminated config items:
+ * Eliminated config items:
min_port_monitors,
min_port_monitor_connections
* Added config item:
@@ -240,7 +240,7 @@
feature request #1600631.
2006-11-28
- * Rearrange retry attempts in pop3 and imap code, removing sleep()
+ * Rearrange retry attempts in pop3 and imap code, removing sleep()
calls which cause the whole process to sleep, not just the thread.
2006-11-22
@@ -273,7 +273,7 @@
2006-11-13
* Use pthread_cond_timedwait() instead of sleep() in audacious
- thread. Will convert all worker threads to this timing method.
+ thread. Will convert all worker threads to this timing method.
2006-11-12
* Fix freebsd build error.
@@ -311,9 +311,9 @@
* Added Hellf[i]re's nano syntax coloring script to svn.
2006-11-03
- * Removed support for Xmms, BMP and Infopipe from conky.
- The Xmms and Bmp players are projects are dead and distros such
- as Gentoo are slating them for removal.
+ * Removed support for Xmms, BMP and Infopipe from conky.
+ The Xmms and Bmp players are projects are dead and distros such
+ as Gentoo are slating them for removal.
* Added support for Audacious using new audacious vars.
2006-10-18
@@ -331,7 +331,7 @@
2006-09-28
* Use pkg-config instead of xft-config.
- * Fix last line bug which had required padding text with extra blank line
+ * Fix last line bug which had required padding text with extra blank line
to see text on last line.
2006-09-01
@@ -420,7 +420,7 @@
Holub <hopet@users.sourceforge.net>)
2006-03-15
- * Removed bmp-infopipe dependency from 1.4.1 and 1.9999 ebuilds for Gentoo
+ * Removed bmp-infopipe dependency from 1.4.1 and 1.9999 ebuilds for Gentoo
(Gentoo bug# 125226).
* Fixed subversion ebuild for conky1 (1.9999) so it pulls the new trunk
path for conky1.
@@ -451,7 +451,7 @@
* on_bottom and wm_class_name deprecated (they do nothing)
2006-02-13
- * Fixed typo bug in portmon code that caused incorrect monitor data
+ * Fixed typo bug in portmon code that caused incorrect monitor data
to be displayed.
2006-02-12
@@ -464,7 +464,7 @@
* Added freedesktop.org extended window manager hints (EWMH)
for window type NORMAL and state's STICKY/SKIP_PAGER/SKIP_TASKBAR.
Fixes stacking order issues with freedesktop-compliant wm's,
- such as XFCE4+.
+ such as XFCE4+.
2006-01-25
* Fixed stupid graph code (it still sucks) sf.net bug 1372962
@@ -509,11 +509,11 @@
* Fixed sf.net bug 1367745
2005-11-30
- * Fixed sf.net bugs 1369607, 1367735 and gentoo bug 113921,
+ * Fixed sf.net bugs 1369607, 1367735 and gentoo bug 113921,
all variations of the same array out of bounds issue.
* "Fixed" code in fs.c and conky.c to make fs stats match those displayed by df (affects reporting against ext3 filesystems only)
-2005-11-27
+2005-11-27
* new code in linux.c and top.c to calculate CPU % correctly on 2.6 kernels.
2005-11-24
@@ -533,7 +533,7 @@
2005-11-12
* Replaced bitwise copy of tcp_connection_t with function
copy_tcp_connection().
- * Changed call interfaces for get_acpi_fan(), get_acpi_ac_adapter(),
+ * Changed call interfaces for get_acpi_fan(), get_acpi_ac_adapter(),
get_freq(), get_freq_dynamic(), get_adt746x_cpu(), get_adt746x_fan(),
eliminating all mallocs. pkovacs. See bug 1355470.
@@ -741,7 +741,7 @@
options $addr and $linkstatus (please test!), as well as fixed a mem
leak in this patch
* adt746x fix, thanks to dan-h on sf.net
- * Added mldonkey support patch, thanks Lucas Brutschy on sf.net
+ * Added mldonkey support patch, thanks Lucas Brutschy on sf.net
* Added patch to allow hex colour values, thanks roiban adi on sf.net
* Added if constructs patch, thanks Lucas Brutschy on sf.net
* Fixed bug in tab code (hopefully for the last time)
@@ -753,7 +753,7 @@
=========================================================================
=========================================================================
-
+
2005-07-05
* Conky 1.1 released
@@ -798,7 +798,7 @@
=========================================================================
=========================================================================
-
+
2005-06-21
* Version 1.0. Conky is born from the ashes of torsmo. Main site:
http://conky.sf.net/
View
@@ -1,31 +1,31 @@
Summary of changes for Conky release 1.4.5:
-------------------------------------------
-Added config items:
-- max_specials
-- max_port_monitor_connections
-
-Removed config items:
-- min_port_monitors
-- min_port_monitor_connections
-
-Added variables:
-- entropy_avail
-- entropy_poolsize
-- entropy_bar
-
-Added length specifier to audacious_title.
-
-Split battery var into:
-- battery and battery_time
-
-Fixed broken texeci variable.
-Fixed build error with --disable-x11.
-Fixed build error with --disable-xdamage.
-Fixed acpi battery issues.
-Fixed mem var overflows when >= 4GB.
-Close pop3/imap sockets properly.
-Improved internal thread handling.
-Converted tcp_portmon internal hash to GLib
+Added config items:
+- max_specials
+- max_port_monitor_connections
+
+Removed config items:
+- min_port_monitors
+- min_port_monitor_connections
+
+Added variables:
+- entropy_avail
+- entropy_poolsize
+- entropy_bar
+
+Added length specifier to audacious_title.
+
+Split battery var into:
+- battery and battery_time
+
+Fixed broken texeci variable.
+Fixed build error with --disable-x11.
+Fixed build error with --disable-xdamage.
+Fixed acpi battery issues.
+Fixed mem var overflows when >= 4GB.
+Close pop3/imap sockets properly.
+Improved internal thread handling.
+Converted tcp_portmon internal hash to GLib
for GPL compatibility.
@@ -42,10 +42,10 @@ Summary of changes for Conky release 1.4.3:
* Removed support for dead projects: Xmms 1, Beep Media Player (BMP) and the Infopipe plugin.
- Removed the following related configuration items:
- - xmms_player
+ - xmms_player
- Removed the following related variables:
- xmms_bar
- - xmms_bitrate
+ - xmms_bitrate
- xmms_channels
- xmms_filename
- xmms_frequency
View
@@ -1,29 +1,29 @@
THESE INSTRUCTIONS ARE ONLY IF "sh autogen.sh" DOESN'T WORK!!!
-First, read the README. This contains instructions specific to building conky
-fresh from a CVS checkout:
+First, read the README. This contains instructions specific to building conky
+fresh from a CVS checkout:
-* As the README says, you need to have the X development libraries installed.
+* As the README says, you need to have the X development libraries installed.
This should be a package along the lines of libx11-dev or xorg-x11-dev .
* Conky requires three "auto-tools", with at least the specific version numbers.
Make sure these are installed:
-
+
aclocal-1.9
automake-1.9
autoconf-2.59
-* In the directory where you checked out conky from CVS,
- run "aclocal", "automake", and then "autoconf".
+* In the directory where you checked out conky from CVS,
+ run "aclocal", "automake", and then "autoconf".
Make sure you run those commands with the latest versions...
- it is very possible that older versions are installed, and
+ it is very possible that older versions are installed, and
plain "automake" really means automake-1.4, not what we want,
but "automake-1.9" instead.
Use the "--version" option to check the program version, i.e.
- "autoconf --version".
-* After that, it's the familiar
+ "autoconf --version".
+* After that, it's the familiar
- ./configure
- make
+ ./configure
+ make
make install
You might have to do the last step as root.
View
@@ -38,7 +38,7 @@ LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
if test "$1" != "" && test -d "$1/.svn"; then
revision=`LC_ALL=C svn info $1 | awk '/^Revision: / {printf "%05d\n", $2}'`;
elif test -d ".svn"; then
- revision=`LC_ALL=C svn info | awk '/^Revision: / {printf "%05d\n", $2}'`;
+ revision=`LC_ALL=C svn info | awk '/^Revision: / {printf "%05d\n", $2}'`;
else
revision="NONE"; fi
Oops, something went wrong.

0 comments on commit 3d26a48

Please sign in to comment.