1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 04:32:55 +00:00
Commit Graph

64 Commits

Author SHA1 Message Date
Pavel Labath
c9df66f487 Merge remote branch 'origin/master' into lua-config
Conflicts:
	src/conky.cc
	src/logging.h
2010-11-13 20:17:46 +01:00
Pavel Labath
0852aa4fcd Merge remote branch 'origin/master' into lua-config
Conflicts:
	src/ccurl_thread.cc
	src/conky.cc
	src/llua.cc
	src/logging.h
	src/nvidia.cc
2010-11-13 20:05:59 +01:00
Nikolas Garofil
9d7a914515 Make I18N optional 2010-11-13 19:45:04 +01:00
Nikolas Garofil
e918ea4655 Let cmake check whether to build for old or new audacious 2010-11-12 16:49:34 +01:00
Nikolas Garofil
4d157a298b Fix compiling with audacious support (Patch from billie, thanks !) 2010-11-12 12:32:49 +01:00
Nikolas Garofil
b98ebc90ee Internationalization support
This patch adds i18n-support with gettext, all translatable strings in the
code should be placed inside _() to make sure users see them in their own
language (I only did this for print_version() for now)
2010-10-31 00:02:02 +02:00
Nikolas Garofil
89a8456495 Fix x11 check in cmake 2010-10-27 07:37:11 +02:00
Pavel Labath
eeb1a6a0d7 Properly load config file and print the default one
ps: the new implementation no longer requires fopencookie() and co.
2010-09-12 16:23:06 +02:00
Pavel Labath
55282b64d8 Config file handling changes
- changed default config filenames, to avoid conflict with conky-1.x
- specifying "-" as config file reads from stdin
- if a user config file exists but is not readable, report an error instead of falling back to
  the system-wide config.
2010-09-12 14:01:34 +02:00
Pavel Labath
cccbf3b4c0 Add a CMAKE variable for the patch program 2010-06-13 19:09:07 +02:00
Pavel Labath
c80deb2d69 Fix "wrong type of arguments for cairo_set_dash", sf.net #3014648
I am not particularly proud of this solution. If you have a better one, feel free to implement
it.
2010-06-13 18:57:07 +02:00
Pavel Labath
2232641b8e Change the >=gcc-4.4 test from warning into an error
This reverts commit 37355406a8.
2010-06-10 19:19:49 +02:00
Nikolas Garofil
54d4e6518d Add support for out_to_http 2010-06-04 14:41:12 +02:00
Nikolas Garofil
a9b12b3074 Make building with RSS possible 2010-05-06 01:46:07 +02:00
Nikolas Garofil
3f7ecb3a26 Add support for $irc 2010-04-30 19:32:42 +02:00
Nikolas Garofil
aada8c4d26 ical support default off and block compiling if it's requested but not available 2010-04-27 21:14:32 +02:00
Nikolas Garofil
a13c56a7a5 Add support for $ical 2010-04-27 16:42:21 +02:00
Nikolas Garofil
7065ba251e Make it possible for cmake to find mysql.h 2010-04-18 20:30:10 +02:00
Nikolas Garofil
a6e63bcaa0 Add support for MySQL
Warning: Altough the current version works (for me),
the syntax of the configoptions and vars will probably change
over time. Contact me if you have ideas.

The following is a example of how you can use it now:

mysql_host someserver.com
mysql_db my_database
mysql_user loginname
mysql_password "s3cr3t"
TEXT
${mysql select var1 from some_table}${mysql select var2 from some_table}
2010-04-18 17:52:41 +02:00
Nikolas Garofil
08ea4391d4 Deprecated max_specials, made it unlimited by changing the data structure for specials 2010-04-14 16:59:50 +02:00
Nikolas Garofil
d91214e290 Fix using the wireless-vars 2010-02-20 17:59:51 +01:00
Nikolas Garofil
0627946ca1 Make hiding ncurses memleaks optional and disable it by default 2010-02-19 13:21:40 +01:00
Nikolas Garofil
4793655974 Link with devstat when building in FreeBSD 2010-02-14 21:35:13 +01:00
Nikolas Garofil
da4e9349f8 Link with kvm when building in FreeBSD 2010-02-14 20:20:45 +01:00
Nikolas Garofil
96bf9d0d72 Also set curl when rss is requested 2010-02-09 19:14:14 +01:00
Nikolas Garofil
0c19282eee Let cmake check for and include xext when building with xdbe 2010-01-25 00:08:06 +01:00
Pavel Labath
6e89ed7e2d Get $iconv vars working again 2010-01-20 18:17:30 +01:00
Pavel Labath
926af1041e Make building with LUA and MAINTAINER_MODE work
apparently, it was just a name conflict.
2010-01-19 16:33:05 +01:00
Nikolas Garofil
122f82ff16 disable dependencies in UI when disabling X11 2010-01-17 20:40:40 +01:00
Nikolas Garofil
e840dcdd5b When building without x11, also disable xdamage, own_window, xdbe, xft, imlib2, argb and remove x11-related options from the builtin config 2010-01-17 16:15:59 +01:00
Nikolas Garofil
287c38a0b9 Added support for builtin config in cmake 2010-01-17 03:00:51 +01:00
Pavel Labath
0f3a56ccbe An attempt at making wifi work
Someone who has iwlib should really test this.
2010-01-11 01:13:42 +01:00
Pavel Labath
47509b38bd An attempt at making lua bindings work 2010-01-11 00:35:22 +01:00
Phil Sutter
b4a73e166e add missing BUILD_IBM define to config.h.in 2010-01-10 22:01:04 +01:00
Brenden Matthews
7e78f036f0 Use consistent naming for build option macros.
Probably have broken some build features with this commit.
2010-01-06 18:39:44 -08:00
Pavel Labath
79be66b15a Fix building of iostats. 2010-01-06 21:11:58 +01:00
Brenden Matthews
7ff762e4af Resolve issues with timed_thread rewrite WIP. 2010-01-04 19:21:12 -08:00
Brenden Matthews
620e9876a4 C++ conversions WIP.
Currently stuck on an issue with g++ and using '%lli' with printf/scanf.
2010-01-04 19:21:12 -08:00
Brenden Matthews
01ac47d082 Implement timed_thread rewrite in C++.
Rewrote timed_thread library in C++ using fancy new C++0x features.  The
main reason for this is to phase out poor encapsulation and C-style
function pointers.
2010-01-04 19:21:12 -08:00
Brenden Matthews
58cbbf57a3 Coulpe minor build fixes. 2010-01-04 18:43:40 -08:00
Cesare Tirabassi
c73f320798 There is no need to have glib for rss 2010-01-03 18:46:09 +01:00
Ben Kibbey
29f833ee05 Fix nvidia support with CMake.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2010-01-02 11:49:43 -08:00
Brenden Matthews
2951f5571c Add missing copyright notices. 2010-01-01 15:49:41 -08:00
Brenden Matthews
cf9e498b24 Update copyright notices. 2010-01-01 15:46:17 -08:00
Brenden Matthews
1ff8b3ee4b CMake support for 6c5fa44660. 2010-01-01 15:06:54 -08:00
Brenden Matthews
b3270cd8ba Apply 42d2e90ba1 to cmake. 2010-01-01 14:54:56 -08:00
Brenden Matthews
d7f008e868 tolua++ has different naming convention on FreeBSD 2010-01-01 14:33:42 -08:00
Brenden Matthews
d92c2e6dab Minor CMake fixes.
- Only enable pedantic flags with MAINTAINER_MODE enabled
 - Hide APP_* vars.
2010-01-01 13:50:12 -08:00
Brenden Matthews
4d7d2b27f3 Minor build fix. 2010-01-01 13:45:16 -08:00
Phil Sutter
0d2770ab33 fix check for iwlib and output some more detailed errors 2009-12-28 03:02:06 +01:00