1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-16 10:05:22 +00:00
Commit Graph

517 Commits

Author SHA1 Message Date
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
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
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
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
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
Phil
d151828d23 make intense use of const keyword
* accidential writes to const char * are being detected
  at compile time
* also clean up casting at some places


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1059 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 03:45:36 +00:00
Phil
418b3d62e0 match signedness and format when scanning into variables
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1058 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 03:01:48 +00:00
Phil
e306a2c2e8 some linting on function definitions
* instead of empty args "void" should always be specified.
  Using this, the compiler can detect incorrect function calls,
  like with update_stuff().
* No args seems to be interpreted as "unspecified args" by the
  compiler, as with update_mail_count(). So no checking for
  correctness of arguments when calling was done at all.
* This is not complete yet, as I still don't have any BSD for
  testing.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1055 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 02:01:03 +00:00
Brenden Matthews
59c5fe4d11 oh yeah, battery_percent too
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1054 7f574dfc-610e-0410-a909-a81674777703
2008-03-28 23:23:21 +00:00
Brenden Matthews
60985a41e7 * Fixed messed up percentages (fs_free_perc, fs_used_perc, mpd_percent).
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1053 7f574dfc-610e-0410-a909-a81674777703
2008-03-28 23:17:01 +00:00
Brenden Matthews
5c9e2dcbfc minor updates; changing package naming to meet http://devmanual.gentoo.org/ebuild-writing/file-format/index.html guidelines to begin doing prereleases
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1051 7f574dfc-610e-0410-a909-a81674777703
2008-03-27 19:46:35 +00:00
Brenden Matthews
a56e669356 * Fixed battery_bar default size
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1049 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 21:44:50 +00:00
Phil
004d1cb7ba disk_protect - show queue protection state
* disk protection needs a kernel patch and is useful in combination with hdaps


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1045 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 20:08:16 +00:00
Phil
d6953f4864 check validity of specified config
* I accidentially used wrong args when testing conky -> segfault
* reproduce using 'conky -c /this/doesnt/exist'
* code should be portable, but untested on freebsd


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1044 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 19:24:55 +00:00
Brenden Matthews
902ff4ca5c fixed compilation with --disable-x11
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1041 7f574dfc-610e-0410-a909-a81674777703
2008-03-23 17:26:41 +00:00
Phil
6a528f4e17 support displaying current nameservers
* gathers information from /etc/resolv.conf
* included (still commented) code to prevent reading too often,
  as I'm not sure whether reading from a real FS (not /proc or /sys)
  could generate higher load in some cases -> comments please!


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1035 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 22:58:26 +00:00
Phil
bcbca8cb5b enable displaying the used ioscheduler for a given disk
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1034 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 21:10:43 +00:00
Phil
d2ed065fdd laptop_mode displays the current laptop mode
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1033 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 20:13:51 +00:00
Phil
8fd27c0026 make default gateway information accessible
* gw_iface prints the interface having a default gateway
* gw_ip prints the gatway's ip
* if_gw jumps if no default gateway exists
* when there are multiple gateways, gw_iface and gw_ip
  only print "multiple" when they are different (allows
  basic debugging of ones networking setup)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1031 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 19:06:09 +00:00
Phil
9b222e23e9 hopefully fix spaced_print
* when printing only width bytes to buf, with
  width being set to pad_percents which itself
  is set by the user to zero, nothing is printed
* in the unlikely (but possible) case of width > size,
  this could lead to a segfault


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1029 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 18:18:25 +00:00
Phil
c1cb65ff6d smapi review
* rewrote some functions in src/smapi.c for more
  simplicity and less malloc/free hell
* added object cleanup in free_text_objects(),
  valgrind said it was missing
* fixed indenting in construct_text_object()
* fixed use of spaced_print() in generate_text_internal()


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1028 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 18:08:47 +00:00
Brenden Matthews
94bb46b868 added $execpi, new ebuild, various other misc updates
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1027 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 06:10:54 +00:00
Brenden Matthews
ed92bf7f60 small fix for newly introduced bug in non-xft font loading--thanks Phil
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1025 7f574dfc-610e-0410-a909-a81674777703
2008-03-21 23:39:38 +00:00
Brenden Matthews
934c3a94e8 fixing up text_buffer_size stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1021 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 21:28:19 +00:00
Brenden Matthews
4fe68fcc04 fixing problem where p_max_size becomes <1
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1020 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 20:56:13 +00:00
Brenden Matthews
46e129e7b1 * Added CRLF characters to POP3 and IMAP stuff (should play nicer with
some servers now).
	* Added preliminary support for parsing the output of external commands
	(via $execp)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1019 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 20:33:31 +00:00
Brenden Matthews
e48d5ce71e cleaning up
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1018 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 19:22:29 +00:00
Brenden Matthews
a76c4fb437 trying to fix more leaks
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1017 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 05:28:23 +00:00
Brenden Matthews
2698046591 2008-03-19
* Fixed a number of small memory leaks.
	* Performed some minor profiling on Conky; introduced
	small_text_buffer_size and large_text_buffer_size config options instead
	of just text_buffer_size.
	* Fixed some minor bugs introduced by new patches.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1014 7f574dfc-610e-0410-a909-a81674777703
2008-03-19 22:28:23 +00:00
Brenden Matthews
a1452f5db4 * Applied 12 patches:
1) sysfs battery support (for Linux >=2.6.24) (thanks Kapil)
        2) Improved audacious support patch (thanks Miroslav)
        3) tp_smapi support patch for IBM laptops (thanks Phil)
        4) user info patch (thanks Roland)
        5) added conky build info patch (thanks Roland)
        6) added if_up patch (thanks Phil)
        7) added reload on SIGHUP patch (thanks Jonas)
        8) added pad percentages patch (thanks Jonas)
        9) added fs_type patch (thanks Ryan)
        10) added xmms2 fixes patch (thanks Lassi)
        11) fix sysfs crash patch (thanks Phil)
        12) multiple ip patch ($addrs)
    * Added more alignment support (top_middle, bottom_middle, middle_left,
    and middle_right).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1010 7f574dfc-610e-0410-a909-a81674777703
2008-03-18 00:23:16 +00:00
Brenden Matthews
dd3b471f2d * Applied 2 patches:
1) sysfs battery support (for Linux >=2.6.24) (thanks Kapil)
		2) Improved audacious support patch (thanks Miroslav)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1009 7f574dfc-610e-0410-a909-a81674777703
2008-03-17 22:27:20 +00:00
Roman Bogorodskiy
ae8c4198b8 Fix compilation.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1008 7f574dfc-610e-0410-a909-a81674777703
2008-02-24 16:35:18 +00:00
Kevin Lyles
3d26a4880e Reformatted all code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1007 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 20:30:45 +00:00
Kevin Lyles
3cf1a29768 Refactored the top and top_mem handling to use a switch statement
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1006 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:01:31 +00:00
Kevin Lyles
9c3ae23a15 Fixed a few minor type issues
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1005 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:01:23 +00:00
Kevin Lyles
c96f5b1143 Removed unused macros and removed X11 options from the options string unless X11 is enabled
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1004 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:01:13 +00:00
Kevin Lyles
32c8f71eaa Added missing break statements and a missing freebsd kernel check
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1003 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:01:00 +00:00
Kevin Lyles
2a7a05342f Fixed a typo and re-added an accidentally removed line
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1002 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:00:45 +00:00
Kevin Lyles
e39a3ad8e4 Fixed some typos and restored a few accidentally removed lines in the recent diskio patch.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@999 7f574dfc-610e-0410-a909-a81674777703
2008-02-10 11:14:19 +00:00
Brenden Matthews
433b564e14 * Applied 2 patches:
1) Add diskio for individual devices
        2) Improved output of units, added "short_units" option


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@996 7f574dfc-610e-0410-a909-a81674777703
2008-02-09 02:21:06 +00:00
Brenden Matthews
35b4ed3aff 2008-01-05
* Applied some more submitted patches:
        1) Add long forms of (most of) the command-line options.
        2) Added an option (top_cpu_separate) that emulates top's "separate
        cpus" option.  Processor usage is shown as a percentage of a
        single processor on your system, instead of a percentage
        of all processors combined.
        3) Adds a parameter (time) to top and top_mem that will show the
        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.
        (thanks Kevin Lyles).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@994 7f574dfc-610e-0410-a909-a81674777703
2008-01-06 01:35:14 +00:00
Philip Kovacs
651be79121 applied submitted patches for get_ibm_acpi_volume bug,
realtime clock bug and kFreeBSD support (thanks KPH).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@993 7f574dfc-610e-0410-a909-a81674777703
2007-12-31 00:00:35 +00:00
Philip Kovacs
dd572d3d24 Fix compilation error with --disable-x11 (bug #1830373).
Bump doc stylesheet from 4.3 to 4.4.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@987 7f574dfc-610e-0410-a909-a81674777703
2007-11-14 21:41:08 +00:00
Philip Kovacs
73e578ee19 fix mpd_smart bug #1822773
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@984 7f574dfc-610e-0410-a909-a81674777703
2007-10-31 22:49:09 +00:00
Philip Kovacs
723771f304 add system config file to -v output
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@982 7f574dfc-610e-0410-a909-a81674777703
2007-10-23 22:06:02 +00:00
Philip Kovacs
c08db2aba5 Externalize default config file: /conky/conky.conf
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@981 7f574dfc-610e-0410-a909-a81674777703
2007-10-23 21:52:11 +00:00
Philip Kovacs
7c07529932 Remove ${tail /var/log/Xorg.0.log} from default text
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@979 7f574dfc-610e-0410-a909-a81674777703
2007-10-21 23:36:53 +00:00
Philip Kovacs
03d011678b Initialize music_player_interval so built-in .conkyrc actual works.
Lower timed_thread minimum timing interval from 50 usecs to 10 usecs.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@978 7f574dfc-610e-0410-a909-a81674777703
2007-10-21 18:04:53 +00:00
Philip Kovacs
8d81c9a6d7 conky 1.4.8
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@974 7f574dfc-610e-0410-a909-a81674777703
2007-10-18 21:12:27 +00:00
Philip Kovacs
441cedd2ad struct alignment patch #1812924
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@973 7f574dfc-610e-0410-a909-a81674777703
2007-10-17 20:31:27 +00:00
Philip Kovacs
0a7cb47470 fix uninitialized var warning
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@970 7f574dfc-610e-0410-a909-a81674777703
2007-10-03 01:43:40 +00:00
Brenden Matthews
58c1eb36c3 Multiple mailbox patch (thanks Ben Kibbey)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@969 7f574dfc-610e-0410-a909-a81674777703
2007-10-02 23:57:41 +00:00
Brenden Matthews
2d10c4c08d * Small fix for $ibm_volume (thanks Kapil Hari Paranjape)
* Patch so $tail can read from a fifo file descriptor (thanks Ben Kibbey)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@966 7f574dfc-610e-0410-a909-a81674777703
2007-09-28 20:16:16 +00:00
Toni Spets
60f4ea4fb7 OpenBSD cleanups, remove unsupported printf flag and fix non-dynamic cpu_freq
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@964 7f574dfc-610e-0410-a909-a81674777703
2007-09-17 04:40:13 +00:00
Brenden Matthews
965031790a * Zero out imap and pop3 stuff when the connection fails
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@960 7f574dfc-610e-0410-a909-a81674777703
2007-09-02 04:36:09 +00:00
Philip Kovacs
62f8ff9be7 mpd_interval -> music_player_interval
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@957 7f574dfc-610e-0410-a909-a81674777703
2007-09-02 04:26:08 +00:00
Brenden Matthews
87e4c550e4 * Fixed some minor memory leaks associated with SIGUSR1
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@956 7f574dfc-610e-0410-a909-a81674777703
2007-09-02 03:58:22 +00:00
Brenden Matthews
16ea4f6587 * Improved performance slightly
* Added mpd_interval config option to specify an update interval for the
    mpd thread

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@954 7f574dfc-610e-0410-a909-a81674777703
2007-09-02 03:02:33 +00:00
Philip Kovacs
6c052dae9b Fix timed thread race condition, seen esp. on new kernel scheduler (cfs).
Fix $audacious_title not being displayed when no length argument indicated.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@943 7f574dfc-610e-0410-a909-a81674777703
2007-08-31 21:35:30 +00:00
Brenden Matthews
12baf6c0b4 some small fixes for mpd stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@935 7f574dfc-610e-0410-a909-a81674777703
2007-08-31 02:05:02 +00:00
Brenden Matthews
9b71a6cd7b * Fixed issue with SIGPIPE and mpd
* Updated COPYING (with more clarifications)

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@927 7f574dfc-610e-0410-a909-a81674777703
2007-08-27 20:26:58 +00:00
Philip Kovacs
10a5ee6074 hwmon leveraging existing code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@922 7f574dfc-610e-0410-a909-a81674777703
2007-08-13 23:14:01 +00:00
Philip Kovacs
f72122bd06 svn merge -rHEAD:918 .
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@921 7f574dfc-610e-0410-a909-a81674777703
2007-08-13 19:09:33 +00:00
Toni Spets
f296609096 really apply the hwmon patch (tracker item 1650894)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@919 7f574dfc-610e-0410-a909-a81674777703
2007-08-13 17:33:41 +00:00
Philip Kovacs
1b509f9357 platform stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@918 7f574dfc-610e-0410-a909-a81674777703
2007-08-13 00:56:42 +00:00
Philip Kovacs
33943bda7c * Added var $platform which is similar to $i2c and accommodates the conversion
of many devices from /sys/bus/i2c/devices to /sys/bus/platform/devices.
* Removed config item post_21_kernel since it forced all i2c device lookups
    to go to /sys/bus/platform/devices and some people may need a mix of both
    i2c and platform devices.



git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@917 7f574dfc-610e-0410-a909-a81674777703
2007-08-13 00:28:48 +00:00
Toni Spets
dc676df556 That one neither
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@916 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 21:17:53 +00:00
Toni Spets
73869df9af Whoops. Didn't see that coming.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@915 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 21:16:44 +00:00
Toni Spets
116ff7b661 Removed more unused stuff from openbsd.c
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@914 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 21:14:06 +00:00
Toni Spets
fc7c9b5fae Removed ACPI battery code for OpenBSD
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@912 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 21:06:30 +00:00
Toni Spets
8370c19025 Remove deprecated linkstatus completely from conky source
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@909 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 20:51:36 +00:00
Toni Spets
5dbf418c2d Fixed wireless documentation. Fixed wireless quality display when its zero. Added copyright notes.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@907 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 20:38:58 +00:00
Brenden Matthews
27b4c8550c clarifying licensing
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@904 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 19:53:44 +00:00
Toni Spets
772619e99a Probably fixed wireless spacer
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@903 7f574dfc-610e-0410-a909-a81674777703
2007-08-08 08:59:44 +00:00
Toni Spets
6b553ec7de Added spacer for wireless variables. Fixed some tabs. Disabled old wireless code.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@900 7f574dfc-610e-0410-a909-a81674777703
2007-08-07 23:18:02 +00:00
Toni Spets
602998c06d Added wireless_link_qual_perc. Cleaned unused variables from wireless code. Updated prss source. Had 6 hours of sleep.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@898 7f574dfc-610e-0410-a909-a81674777703
2007-08-07 22:05:06 +00:00
Toni Spets
a3e81ae59f RSS was not really disabled when it was supposed to be. Experimental wireless support.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@896 7f574dfc-610e-0410-a909-a81674777703
2007-08-07 12:51:08 +00:00
Toni Spets
3bc35afa30 Fixed major issues with ACPI batteries
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@894 7f574dfc-610e-0410-a909-a81674777703
2007-08-07 06:05:19 +00:00
Roman Bogorodskiy
cf49198176 Remove freebsd wifi stuff since the API seems to be
changed and I have no wifi devices to test it.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@893 7f574dfc-610e-0410-a909-a81674777703
2007-08-06 16:42:48 +00:00
Brenden Matthews
7793867d6b * Updated to libmpdclient 0.13.0
* Added post_21_kernel config param to specify kernels 2.6.22 and newer
    so i2c works properly


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@890 7f574dfc-610e-0410-a909-a81674777703
2007-08-05 22:16:26 +00:00
Brenden Matthews
f95d63bf56 * Fixed potential issue on FreeBSD when nprocs < 10 (thanks zotrix)
* Added support for multiple batteries when using acpi (thanks Phil)
    * a bunch of code cleanups (thanks Psychon)
    * added max length paramater to mpd_title (thinks fow)
    * a number of small bug fixes


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@889 7f574dfc-610e-0410-a909-a81674777703
2007-08-05 04:47:21 +00:00
Toni Spets
906e7e8bfd Removed the first new line in RSS titles
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@888 7f574dfc-610e-0410-a909-a81674777703
2007-07-19 16:32:00 +00:00
Philip Kovacs
c559001bab Fix PID display, patch #1753934. thanks sohalt.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@885 7f574dfc-610e-0410-a909-a81674777703
2007-07-15 18:11:35 +00:00
Philip Kovacs
6c95750cc6 Right-justify top/top_mem vars (pid/cpu/mem} so they align on the decimal.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@881 7f574dfc-610e-0410-a909-a81674777703
2007-06-23 00:29:54 +00:00
Toni Spets
204886795a Fixed crash when RSS feed item didn't have title
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@879 7f574dfc-610e-0410-a909-a81674777703
2007-06-06 14:19:09 +00:00
Philip Kovacs
02960c2c7f fix scan_font nonsense
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@878 7f574dfc-610e-0410-a909-a81674777703
2007-06-05 19:02:51 +00:00
Philip Kovacs
a2cfdd4c67 fix scan_font nonsense
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@877 7f574dfc-610e-0410-a909-a81674777703
2007-06-05 18:54:39 +00:00
Toni Spets
2c8426dcc7 Again fixed things in the RSS code. Removed possible trailing \n from RSS data. Hopefully fixed iconv memory freeing problems. Graps had non-freed malloced data.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@876 7f574dfc-610e-0410-a909-a81674777703
2007-06-03 11:20:47 +00:00
Toni Spets
3872bafeef Fixed memory leaks found with valgrind
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@875 7f574dfc-610e-0410-a909-a81674777703
2007-06-03 09:18:54 +00:00
Toni Spets
b6d1465635 RSS updates: more flexible output and updated prss code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@873 7f574dfc-610e-0410-a909-a81674777703
2007-06-02 08:17:33 +00:00
Toni Spets
3fdb6b7027 New initial RSS code. Parser written by Sisu (Mikko Sysikaski) with more portable libxml2. It is still unstable and in development.\n\nNote: automake and autoconf scripts needs to be updated to support libxml2\!
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@868 7f574dfc-610e-0410-a909-a81674777703
2007-06-01 10:42:57 +00:00
Roman Bogorodskiy
85fdf4bf7e - Remove debug printf's from RSS code
- Don't eat last char of the RSS title


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@865 7f574dfc-610e-0410-a909-a81674777703
2007-05-06 12:33:38 +00:00
Roman Bogorodskiy
3b03ca2a76 Experimental RSS code.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@864 7f574dfc-610e-0410-a909-a81674777703
2007-05-06 12:17:13 +00:00
Toni Spets
a2fbf01fe2 fixed apm_adapter for both openbsd and freebsd and some build warnings cleaned
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@862 7f574dfc-610e-0410-a909-a81674777703
2007-05-06 09:32:21 +00:00
Philip Kovacs
60b842df90 added color[0-9] variable patch (thanks jieryn)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@858 7f574dfc-610e-0410-a909-a81674777703
2007-04-25 17:22:06 +00:00
Brenden Matthews
fc72692cc7 * Added if_existing patch for string matching (thanks cromka)
* Added hwmon support (thanks flitsch)
* Some xmms2 updates (thanks sleipner)
* Added $battery_percent and $battery_bar (thanks akash)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@855 7f574dfc-610e-0410-a909-a81674777703
2007-04-06 06:11:53 +00:00
Brenden Matthews
3d9d260f4c Added if_empty patch (thanks Erik)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@854 7f574dfc-610e-0410-a909-a81674777703
2007-04-06 05:01:48 +00:00
Roman Bogorodskiy
a38ecf286d Not sure if a right fix, but no segault at least.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@851 7f574dfc-610e-0410-a909-a81674777703
2007-03-28 18:43:53 +00:00
Roman Bogorodskiy
164839a299 Fix build on all platforms that doesn't have memrchr() function,
not just workaround it for OpenBSD only.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@850 7f574dfc-610e-0410-a909-a81674777703
2007-03-28 17:53:40 +00:00
Brenden Matthews
0ab1d8b96a * OpenBSD support added to Conky (thanks hifi)
* Updated mboxscan stuff (thanks calmar)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@848 7f574dfc-610e-0410-a909-a81674777703
2007-03-01 01:43:43 +00:00
Philip Kovacs
4f7f4bf11e conky 1.4.6-svn trunk
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@836 7f574dfc-610e-0410-a909-a81674777703
2007-02-25 23:35:53 +00:00
Philip Kovacs
70add5d09d include missing mboxscan.h;
fix signedness warnings


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@832 7f574dfc-610e-0410-a909-a81674777703
2007-02-14 19:45:18 +00:00
Brenden Matthews
45acd5c3b9 * Added buffer_text_size option to change the size of the buffer for
things like $exec, $tail, et cetera
* Added $mboxscan which lets you display the Subject and From fields
from recent email in an mbox file
* Disambiguated (is that a word?) $cpu docs


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@831 7f574dfc-610e-0410-a909-a81674777703
2007-02-12 01:03:10 +00:00
Philip Kovacs
c268b7130e claen up warnings
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@826 7f574dfc-610e-0410-a909-a81674777703
2007-01-08 01:27:30 +00:00
Philip Kovacs
75a8cfc091 fix warnings
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@824 7f574dfc-610e-0410-a909-a81674777703
2006-12-29 23:38:57 +00:00
Brenden Matthews
5cfe6b093d head/tail rewrite patch
diskio read/write patch
added check for zlib to configure script

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@823 7f574dfc-610e-0410-a909-a81674777703
2006-12-29 23:14:31 +00:00
Philip Kovacs
1c35f432e5 Conky 1.5.0 -- client/server prototype
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@818 7f574dfc-610e-0410-a909-a81674777703
2006-12-23 06:01:16 +00:00
Philip Kovacs
5ff932ff21 split battery off into battery and battery_time
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@814 7f574dfc-610e-0410-a909-a81674777703
2006-12-12 23:21:14 +00:00
Philip Kovacs
4e8212d978 close pop3/imap sockets
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@811 7f574dfc-610e-0410-a909-a81674777703
2006-12-11 19:04:58 +00:00
Philip Kovacs
e4713dc790 use GLib GHashTable for port monitors
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@806 7f574dfc-610e-0410-a909-a81674777703
2006-12-09 05:40:08 +00:00
Roman Bogorodskiy
de84fcac2a Fix ${freq} and ${freq_g} on FreeBSD.
Reported by:	Karsten Rothemund <karsten@photor.de>


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@804 7f574dfc-610e-0410-a909-a81674777703
2006-12-03 18:10:21 +00:00
Philip Kovacs
afcae6eba5 add max_length to audacious_title
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@800 7f574dfc-610e-0410-a909-a81674777703
2006-12-01 00:29:12 +00:00
Philip Kovacs
9a016c9377 added , , for crypto freaks
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@797 7f574dfc-610e-0410-a909-a81674777703
2006-11-30 20:46:34 +00:00
Philip Kovacs
57688b94d5 remove sleep() calls from pop2/imap code; remove debug statements on terminal. e.g. hints, thread destruction
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@796 7f574dfc-610e-0410-a909-a81674777703
2006-11-28 07:26:57 +00:00
Philip Kovacs
9609a330d8 add max_specials config item with default 512. really closes bug #1574523
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@793 7f574dfc-610e-0410-a909-a81674777703
2006-11-22 21:53:54 +00:00
Philip Kovacs
a860dd581b fix compile error with --disable-xdamage when Xdamage.h not present
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@784 7f574dfc-610e-0410-a909-a81674777703
2006-11-20 20:17:46 +00:00
Philip Kovacs
b85f8a65bc linkstatus formatting
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@779 7f574dfc-610e-0410-a909-a81674777703
2006-11-15 20:35:32 +00:00
Philip Kovacs
ef3d0a19fe linkstatus now follows use_spacer. closes bug #1577580
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@778 7f574dfc-610e-0410-a909-a81674777703
2006-11-15 20:24:43 +00:00
Philip Kovacs
d9cc831fdd fix reported memory var overflow by using unsigned long long
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@775 7f574dfc-610e-0410-a909-a81674777703
2006-11-15 03:28:37 +00:00
Philip Kovacs
5a91ebca4e convert all thread activity to timed thread abstraction
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@772 7f574dfc-610e-0410-a909-a81674777703
2006-11-15 01:20:49 +00:00
Philip Kovacs
b681774918 fix compile error with --disable-x11
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@769 7f574dfc-610e-0410-a909-a81674777703
2006-11-14 22:10:28 +00:00
Philip Kovacs
4d3891e76d Fixed BadWindow bugs (#1568366, #1588384)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@755 7f574dfc-610e-0410-a909-a81674777703
2006-11-12 04:14:29 +00:00
Philip Kovacs
ad33cf9904 close bug #1591609; remove deprecated vars
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@746 7f574dfc-610e-0410-a909-a81674777703
2006-11-11 01:15:28 +00:00
Philip Kovacs
5c61f80c41 add new config item - max_user_text - to allow for large config files
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@741 7f574dfc-610e-0410-a909-a81674777703
2006-11-09 00:33:46 +00:00
Philip Kovacs
a3b5a1a1c2 comment out imlib2 until brenden finishes it
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@735 7f574dfc-610e-0410-a909-a81674777703
2006-11-07 22:02:50 +00:00
Philip Kovacs
7d71ea09e8 minor macro changes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@733 7f574dfc-610e-0410-a909-a81674777703
2006-11-07 02:19:58 +00:00
Philip Kovacs
4b37a0e158 configure x11/xext/xdamage with pkg-config, etc.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@731 7f574dfc-610e-0410-a909-a81674777703
2006-11-07 01:19:32 +00:00
Philip Kovacs
15fd6d6586 removed all mldonkey and seti code -- totally broken
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@727 7f574dfc-610e-0410-a909-a81674777703
2006-11-05 00:23:18 +00:00
Philip Kovacs
a59cc4d5c5 missing hddtemp #ifdef's
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@724 7f574dfc-610e-0410-a909-a81674777703
2006-11-04 17:55:00 +00:00
Philip Kovacs
03ebbf2cf4 remove infopipe support
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@718 7f574dfc-610e-0410-a909-a81674777703
2006-11-04 00:25:22 +00:00
Philip Kovacs
87953b122b removal of xmms/bmp / addition of audacious/infopipe
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@713 7f574dfc-610e-0410-a909-a81674777703
2006-11-03 20:54:52 +00:00
Philip Kovacs
e2d80ba894 lol
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@710 7f574dfc-610e-0410-a909-a81674777703
2006-10-07 01:42:37 +00:00
Roman Bogorodskiy
18a86d7075 Fix buffer overflow in parsing LC_ALL, LC_CTYPE and LANG environment
variables by using dynamic arrays for storing it. This should fix a
core dumps for users with locale name longer than 10 chars.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@707 7f574dfc-610e-0410-a909-a81674777703
2006-10-05 17:25:23 +00:00
Brenden Matthews
fa2477a8d8 small xdamage fix
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@706 7f574dfc-610e-0410-a909-a81674777703
2006-10-02 08:33:08 +00:00
Philip Kovacs
58c3dd47ce fix last line bug
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@703 7f574dfc-610e-0410-a909-a81674777703
2006-09-28 04:54:46 +00:00
Philip Kovacs
f3fed13727 fix differ in signedness warnings seen under gcc-4.1
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@699 7f574dfc-610e-0410-a909-a81674777703
2006-09-01 17:11:14 +00:00
Philip Kovacs
681fb80260 fixed compilation errors with --disable-x11; bug #1547164
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@697 7f574dfc-610e-0410-a909-a81674777703
2006-08-27 19:03:52 +00:00
Roman Bogorodskiy
78a52eaf0b Loop as much times as we tald to loop.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@696 7f574dfc-610e-0410-a909-a81674777703
2006-08-24 18:14:22 +00:00
Roman Bogorodskiy
a71b2f8c3f Fix build when configured with "--disable-x11" by moving
print_version() out of #ifdef X11.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@695 7f574dfc-610e-0410-a909-a81674777703
2006-08-24 18:01:22 +00:00
Roman Bogorodskiy
031d8d2779 Show info about compiled-in features in conky -v.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@690 7f574dfc-610e-0410-a909-a81674777703
2006-08-12 06:36:58 +00:00
Roman Bogorodskiy
27731c50dc - Comment out NetBSD/SanOS garbage
- Print OS information in `conky -v`


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@688 7f574dfc-610e-0410-a909-a81674777703
2006-08-12 06:10:18 +00:00
Philip Kovacs
37b31512c7 degree sign
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@682 7f574dfc-610e-0410-a909-a81674777703
2006-08-11 00:25:25 +00:00
Philip Kovacs
7b67b4b12d move units left
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@681 7f574dfc-610e-0410-a909-a81674777703
2006-08-11 00:00:16 +00:00
Philip Kovacs
e26a4dd4d5 add hddtemp.c and fix ? display
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@680 7f574dfc-610e-0410-a909-a81674777703
2006-08-10 23:49:59 +00:00
Philip Kovacs
ca79c81374 spock's hddtemp & goto patches
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@679 7f574dfc-610e-0410-a909-a81674777703
2006-08-10 16:56:13 +00:00
Roman Bogorodskiy
fe7ec00729 - Fix build on FreeBSD by moving volage stuff under #ifdef __linux__
and adjusting get_freq() prototype
- Fix Xdamage detection, make it not mandatory


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@678 7f574dfc-610e-0410-a909-a81674777703
2006-08-01 21:24:15 +00:00
Philip Kovacs
16e8431a25 tztime patch
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@677 7f574dfc-610e-0410-a909-a81674777703
2006-07-15 02:18:06 +00:00
Brenden Matthews
1c0acf9f50 tiny gradient fix
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@676 7f574dfc-610e-0410-a909-a81674777703
2006-06-22 04:39:22 +00:00
Philip Kovacs
2783fa94a9 should be in_port_t
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@673 7f574dfc-610e-0410-a909-a81674777703
2006-06-19 00:01:51 +00:00
Brenden Matthews
701783331d font stuff fixed?
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@663 7f574dfc-610e-0410-a909-a81674777703
2006-05-28 07:25:30 +00:00
Brenden Matthews
f9fa7f1d1c fixed font bug
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@662 7f574dfc-610e-0410-a909-a81674777703
2006-05-28 04:25:34 +00:00
Brenden Matthews
2b40f6bc41 * Xdamage support
* Initial Imlib2 support (broken and not implemented correctly yet, im too tired to finish it tonight

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@661 7f574dfc-610e-0410-a909-a81674777703
2006-05-25 07:00:12 +00:00
Brenden Matthews
f95097fe89 experimental Xdamage support
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@660 7f574dfc-610e-0410-a909-a81674777703
2006-05-25 01:00:29 +00:00
Brenden Matthews
a2f6a470d9 experimental Xdamage support
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@659 7f574dfc-610e-0410-a909-a81674777703
2006-05-24 06:34:37 +00:00
Brenden Matthews
536489f676 fixed some errors
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@658 7f574dfc-610e-0410-a909-a81674777703
2006-05-24 00:46:50 +00:00
Brenden Matthews
39d836dcb1 cpu voltage patch
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@657 7f574dfc-610e-0410-a909-a81674777703
2006-05-24 00:23:47 +00:00
Brenden Matthews
a426a15d16 we don't need a warning every time
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@655 7f574dfc-610e-0410-a909-a81674777703
2006-05-22 17:12:39 +00:00
Brenden Matthews
e2c2f22c37 bye bye again possible mem leak
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@654 7f574dfc-610e-0410-a909-a81674777703
2006-05-22 03:29:19 +00:00
Brenden Matthews
843dc8e772 smp support for freq stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@650 7f574dfc-610e-0410-a909-a81674777703
2006-05-22 02:49:22 +00:00
Brenden Matthews
867a657de9 more graph stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@649 7f574dfc-610e-0410-a909-a81674777703
2006-05-19 01:40:37 +00:00
Brenden Matthews
57c08f8209 graph stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@648 7f574dfc-610e-0410-a909-a81674777703
2006-05-19 01:37:45 +00:00
Brenden Matthews
85f75efa31 * Fixed issue with graphs not reaching all the way to the borders
(sf.net bug 1470480)
* Cleaned up units

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@647 7f574dfc-610e-0410-a909-a81674777703
2006-05-18 01:25:03 +00:00
Brenden Matthews
2d016d1daf tiny fix
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@646 7f574dfc-610e-0410-a909-a81674777703
2006-05-18 00:56:18 +00:00
Brenden Matthews
ebc68c0dff better units
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@645 7f574dfc-610e-0410-a909-a81674777703
2006-05-18 00:49:48 +00:00
Brenden Matthews
cda929a1e1 xmms2 patch
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@643 7f574dfc-610e-0410-a909-a81674777703
2006-05-18 00:22:39 +00:00
Brenden Matthews
1e882092e3 things
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@639 7f574dfc-610e-0410-a909-a81674777703
2006-05-16 03:38:02 +00:00
Brenden Matthews
b2bd458834 smarter new mail checking for imap
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@638 7f574dfc-610e-0410-a909-a81674777703
2006-05-14 07:13:55 +00:00
Brenden Matthews
77b9d8e118 better error messages
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@637 7f574dfc-610e-0410-a909-a81674777703
2006-05-14 07:05:05 +00:00
Brenden Matthews
6a64f332e6 fixed pop3 problem? try 2
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@636 7f574dfc-610e-0410-a909-a81674777703
2006-05-14 06:42:35 +00:00
Brenden Matthews
560877d23e fixed pop3 problem?
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@635 7f574dfc-610e-0410-a909-a81674777703
2006-05-14 06:15:23 +00:00
Brenden Matthews
215876c14b ahhh stupid mistake
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@634 7f574dfc-610e-0410-a909-a81674777703
2006-05-14 05:43:16 +00:00
Brenden Matthews
6af9a98aa0 added some mutexes to the threading stuff to be safe
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@633 7f574dfc-610e-0410-a909-a81674777703
2006-05-14 04:49:55 +00:00
Brenden Matthews
f0b0fd7a7e small configure changes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@632 7f574dfc-610e-0410-a909-a81674777703
2006-05-13 20:14:26 +00:00
Brenden Matthews
98f3aa9208 iconv support
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@631 7f574dfc-610e-0410-a909-a81674777703
2006-05-13 19:51:26 +00:00
Brenden Matthews
5ac5aaece1 added memset to make mail stuff prettier
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@630 7f574dfc-610e-0410-a909-a81674777703
2006-05-12 18:06:12 +00:00
Roman Bogorodskiy
ff1404dab2 - Fix BMPx support. BMPx 0.14.0 or newer is required now
- Add forgotten headers for imap stuff to fix build on FreeBSD


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@629 7f574dfc-610e-0410-a909-a81674777703
2006-05-12 12:41:18 +00:00
Brenden Matthews
adbacc9f25 Changed $font behavior so that the font persists past the next newline. It can be set back to the default with $font with no args. (closes bug 1478676 on sf.net)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@628 7f574dfc-610e-0410-a909-a81674777703
2006-05-09 23:08:23 +00:00
Brenden Matthews
8365978b5e cleaned up mail code a bit
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@627 7f574dfc-610e-0410-a909-a81674777703
2006-05-09 22:39:39 +00:00
Brenden Matthews
589602aacf imap and pop3 clients
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@626 7f574dfc-610e-0410-a909-a81674777703
2006-05-08 22:34:38 +00:00
Brenden Matthews
d9d5bb0d72 fixed broken if/else stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@624 7f574dfc-610e-0410-a909-a81674777703
2006-04-23 21:57:04 +00:00
Brenden Matthews
c9502198c9 powerbook battery patch
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@622 7f574dfc-610e-0410-a909-a81674777703
2006-04-23 21:35:31 +00:00
Brenden Matthews
d904c1dba0 xmms2 fixes (sf.net patch 1469523)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@621 7f574dfc-610e-0410-a909-a81674777703
2006-04-16 03:49:49 +00:00
Brenden Matthews
090f757823 - added patch from peter tarjan for ibm acpi\
- updated xft docs

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@620 7f574dfc-610e-0410-a909-a81674777703
2006-04-15 18:00:39 +00:00
Philip Kovacs
952447be94 add REMOTESERVICE to port monitor peekables
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@615 7f574dfc-610e-0410-a909-a81674777703
2006-03-30 18:14:18 +00:00
Brenden Matthews
e8c9f49594 xmms2 patch
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@612 7f574dfc-610e-0410-a909-a81674777703
2006-03-25 21:21:07 +00:00
Roman Bogorodskiy
255931c3b8 Return the blank line between includes and defines
accidentally removed in my last commit.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@604 7f574dfc-610e-0410-a909-a81674777703
2006-03-22 19:35:58 +00:00
Roman Bogorodskiy
abecf3b63d Re-arrange kvm code to fix memory leaks.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@603 7f574dfc-610e-0410-a909-a81674777703
2006-03-22 19:27:31 +00:00
Philip Kovacs
aaa70cf062 added own_window_type override
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@570 7f574dfc-610e-0410-a909-a81674777703
2006-03-09 02:28:38 +00:00
Philip Kovacs
49c9b8d6d5 forward ButtonRelease too
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@569 7f574dfc-610e-0410-a909-a81674777703
2006-03-08 23:02:28 +00:00
Philip Kovacs
b93a28ee61 added own_window_type config item
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@568 7f574dfc-610e-0410-a909-a81674777703
2006-03-08 22:17:27 +00:00
Brenden Matthews
2734bc4d23 fixed bug with graphs resetting colour. sf.net bug 1420473
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@564 7f574dfc-610e-0410-a909-a81674777703
2006-03-08 05:48:34 +00:00
Philip Kovacs
12c36bd8d9 give parent a sec to terminate
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@559 7f574dfc-610e-0410-a909-a81674777703
2006-03-07 20:35:11 +00:00
Philip Kovacs
d7b85bbf02 find_desktop_window() api changes. window parent s/b root, not desktop,
otherwise the window manager may not control the window.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@558 7f574dfc-610e-0410-a909-a81674777703
2006-03-07 19:46:51 +00:00
Brenden Matthews
4f5d0da56f batt fixed? x11 stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@552 7f574dfc-610e-0410-a909-a81674777703
2006-03-07 06:24:58 +00:00
Brenden Matthews
ac23be3d25 sticky hints
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@548 7f574dfc-610e-0410-a909-a81674777703
2006-03-07 04:23:55 +00:00
Philip Kovacs
1d6a4ddde9 added own_window_hints
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@543 7f574dfc-610e-0410-a909-a81674777703
2006-03-06 23:35:41 +00:00
Brenden Matthews
a72572328f fork fix
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@542 7f574dfc-610e-0410-a909-a81674777703
2006-03-06 06:57:30 +00:00
Philip Kovacs
d265a2d05a conky back under WM control for own_window yes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@541 7f574dfc-610e-0410-a909-a81674777703
2006-03-06 05:58:58 +00:00
Philip Kovacs
a41653b74a on_bottom and wm_class_name deprecated
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@533 7f574dfc-610e-0410-a909-a81674777703
2006-02-14 17:33:31 +00:00
Philip Kovacs
741ffe4b6e drastic simplifications for own_window=yes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@532 7f574dfc-610e-0410-a909-a81674777703
2006-02-14 06:15:38 +00:00
Brenden Matthews
a99f1c48e7 getting set for 1.4.0
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@525 7f574dfc-610e-0410-a909-a81674777703
2006-02-13 02:28:46 +00:00
Brenden Matthews
9d54a08e65 stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@524 7f574dfc-610e-0410-a909-a81674777703
2006-02-02 02:23:18 +00:00
Brenden Matthews
d7635e7c1b stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@523 7f574dfc-610e-0410-a909-a81674777703
2006-02-02 01:43:43 +00:00
Brenden Matthews
9d0b2d5fb4 threading stuff resolved?
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@522 7f574dfc-610e-0410-a909-a81674777703
2006-02-01 14:39:23 +00:00
Brenden Matthews
c8e33e9cc3 mpd improvements
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@521 7f574dfc-610e-0410-a909-a81674777703
2006-01-31 03:32:26 +00:00
Brenden Matthews
34592be997 threading stuff resolved?
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@520 7f574dfc-610e-0410-a909-a81674777703
2006-01-31 02:09:00 +00:00
Brenden Matthews
e46de6a07e threading stuff resolved?
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@519 7f574dfc-610e-0410-a909-a81674777703
2006-01-31 01:31:29 +00:00
Brenden Matthews
e085a14b9a preliminary threading changes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@518 7f574dfc-610e-0410-a909-a81674777703
2006-01-28 22:13:23 +00:00
Brenden Matthews
778823cee3 Cleaned up texeci code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@517 7f574dfc-610e-0410-a909-a81674777703
2006-01-28 01:28:23 +00:00
Philip Kovacs
bcfd869379 re-order things in reload_config()
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@516 7f574dfc-610e-0410-a909-a81674777703
2006-01-27 21:30:56 +00:00
Brenden Matthews
08d7a1bc04 graph stuff fixed, sf.net bug 1401338 and 1400854
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@512 7f574dfc-610e-0410-a909-a81674777703
2006-01-26 04:44:19 +00:00
Brenden Matthews
b8890dd061 $if_* fixed now
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@511 7f574dfc-610e-0410-a909-a81674777703
2006-01-26 03:05:12 +00:00
Brenden Matthews
3ad791ff22 $if_* still broken
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@508 7f574dfc-610e-0410-a909-a81674777703
2006-01-25 04:31:00 +00:00
Philip Kovacs
77f3b890c2 removing temperature i2c from default text
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@506 7f574dfc-610e-0410-a909-a81674777703
2006-01-23 01:56:06 +00:00
Philip Kovacs
3dc1345eee xmms more error messages
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@497 7f574dfc-610e-0410-a909-a81674777703
2006-01-12 00:10:40 +00:00
Philip Kovacs
d33c44407f run-time selection of xmms player using xmms_player
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@493 7f574dfc-610e-0410-a909-a81674777703
2006-01-11 17:03:45 +00:00
Philip Kovacs
896a5ce701 xmms work continued
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@488 7f574dfc-610e-0410-a909-a81674777703
2006-01-08 14:51:47 +00:00
Philip Kovacs
6d24365953 xmms/bmp/audacious/infopipe reorgamization
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@487 7f574dfc-610e-0410-a909-a81674777703
2006-01-08 08:02:37 +00:00
Roman Bogorodskiy
773a93b0ec Fix build when configured without xft support.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@483 7f574dfc-610e-0410-a909-a81674777703
2006-01-07 11:26:33 +00:00
Philip Kovacs
d4ab28ae2e audacious support added
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@482 7f574dfc-610e-0410-a909-a81674777703
2006-01-07 07:01:22 +00:00
Brenden Matthews
8cf69f9b25 fixed bmpx crap
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@480 7f574dfc-610e-0410-a909-a81674777703
2006-01-06 23:56:12 +00:00
Brenden Matthews
a53ed0d0ab oops, tail was b0rked
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@477 7f574dfc-610e-0410-a909-a81674777703
2006-01-06 05:11:28 +00:00
Philip Kovacs
b4c6722219 infopipe_bar done
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@469 7f574dfc-610e-0410-a909-a81674777703
2006-01-06 00:18:20 +00:00
Philip Kovacs
287b66d293 added infopipe_bar preliminary
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@468 7f574dfc-610e-0410-a909-a81674777703
2006-01-06 00:02:59 +00:00
Brenden Matthews
387494b56d added draw_graph_borders
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@467 7f574dfc-610e-0410-a909-a81674777703
2006-01-05 23:23:51 +00:00
Philip Kovacs
748849525c infopipe improvements
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@466 7f574dfc-610e-0410-a909-a81674777703
2006-01-05 22:18:12 +00:00
Philip Kovacs
f61b0c7a61 new infopipe support for xmms/bmp
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@462 7f574dfc-610e-0410-a909-a81674777703
2006-01-05 07:06:42 +00:00
Brenden Matthews
2d14e4af68 couple small fixes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@455 7f574dfc-610e-0410-a909-a81674777703
2005-12-31 17:36:16 +00:00
Roman Bogorodskiy
5e91a7d617 Add BMPx (http://beep-media-player.org/) support. Bugs and memleaks are here
for sure, will deal with it a bit later.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@452 7f574dfc-610e-0410-a909-a81674777703
2005-12-30 09:44:40 +00:00
Philip Kovacs
bcd38449fa flush stdout immediately for console output
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@449 7f574dfc-610e-0410-a909-a81674777703
2005-12-16 00:08:42 +00:00
Brenden Matthews
e0e8298713 woops, fixed mem leaks with exec stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@448 7f574dfc-610e-0410-a909-a81674777703
2005-12-15 04:13:32 +00:00
Brenden Matthews
ef0075becd execi issues resolved?
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@447 7f574dfc-610e-0410-a909-a81674777703
2005-12-15 03:05:16 +00:00
Brenden Matthews
f497f4d500 execi issues resolved?
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@446 7f574dfc-610e-0410-a909-a81674777703
2005-12-15 02:30:41 +00:00
Brenden Matthews
ad283f4e91 fixing exec stuff, however there is some serious memory leaking which needs to be resolved
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@445 7f574dfc-610e-0410-a909-a81674777703
2005-12-13 03:36:28 +00:00
Brenden Matthews
04e3c9ec4c fixing execi timing
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@444 7f574dfc-610e-0410-a909-a81674777703
2005-12-12 05:07:08 +00:00
David Carter
aee57175c9 refactored code for the w/ exec/texeci/execi stuff, also made it work with head and tail
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@442 7f574dfc-610e-0410-a909-a81674777703
2005-12-10 21:07:24 +00:00
David Carter
bf99d368ca add ability to have tags in exec and execi output (thanks bleach)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@440 7f574dfc-610e-0410-a909-a81674777703
2005-12-10 14:15:38 +00:00
Brenden Matthews
0633e854c7 sf.net bug 1367745
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@438 7f574dfc-610e-0410-a909-a81674777703
2005-12-06 03:33:59 +00:00
David Carter
1f16e29c84 make conky fs stuff report same as df for ext3 volumes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@436 7f574dfc-610e-0410-a909-a81674777703
2005-12-01 06:32:14 +00:00
Philip Kovacs
cca4732102 added tmpstring overrun guards
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@434 7f574dfc-610e-0410-a909-a81674777703
2005-11-29 17:35:21 +00:00
David Carter
67ab68914a new cpu % routines in top.c and linux.c
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@431 7f574dfc-610e-0410-a909-a81674777703
2005-11-27 06:56:35 +00:00
Philip Kovacs
44e5c1b6a4 changed some heap vars to stacks vars. gentoo bug# 113219
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@429 7f574dfc-610e-0410-a909-a81674777703
2005-11-25 04:17:54 +00:00
Philip Kovacs
b6ead422a2 added #define/#undef SIGNAL_BLOCKING
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@427 7f574dfc-610e-0410-a909-a81674777703
2005-11-24 02:18:42 +00:00
Philip Kovacs
dc61eb3daa synchronous signal processing. fixes gentoo bug# 113219
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@426 7f574dfc-610e-0410-a909-a81674777703
2005-11-23 19:05:23 +00:00
Brenden Matthews
00e60c32d7 get rid of annoying warning
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@416 7f574dfc-610e-0410-a909-a81674777703
2005-11-17 00:32:39 +00:00