Brenden Matthews
ecfcfacce3
Fix compiler warning.
2009-08-03 12:54:21 -06:00
Brenden Matthews
aa142b0941
Revert "Compilation fix for weather stuff."
...
This reverts commit 63229dac63
.
2009-08-03 12:52:10 -06:00
Brenden Matthews
63229dac63
Compilation fix for weather stuff.
2009-08-03 12:48:52 -06:00
Brenden Matthews
05330f24a3
Merge branch 'master' of git.omp.am:/home/omp/git/conky
...
Conflicts:
src/conky.c
2009-08-03 12:41:07 -06:00
Brenden Matthews
51ddee12dd
Fix imlib2 context.
2009-08-03 12:39:44 -06:00
Cesare Tirabassi
2118fc5889
Merge branch 'master' into weather-forecast
2009-08-03 19:59:36 +02:00
Cesare Tirabassi
36ae626ab8
Add parser initialisation and cleanup
2009-08-03 19:58:21 +02:00
Nikolas Garofil
4990f25791
Support for $color in ncurses
2009-08-03 19:39:37 +02:00
Nikolas Garofil
37e2bb471b
Support for in ncurses
2009-08-03 19:36:47 +02:00
Cesare Tirabassi
008fdb3d54
Updated ChangeLog with weather_forecast
2009-08-03 13:38:53 +02:00
Cesare Tirabassi
ea8e737f4f
weather_forecast: corrected variables.xml formatting
2009-08-03 11:58:01 +02:00
Cesare Tirabassi
4fe70ad0e6
weather: change hardcoded constant 5 to FORECAST_DAYS macro
2009-08-03 11:49:26 +02:00
Cesare Tirabassi
d707d536bb
Fix bad memory allocation
2009-08-03 00:24:39 +02:00
Cesare Tirabassi
14b7acdab6
Add weather_forecast object
2009-08-02 23:54:44 +02:00
Brenden Matthews
dbf3448031
Update conky_window Lua table when it changes.
2009-08-01 15:11:18 -06:00
Brenden Matthews
f5c1347123
Merge branch 'master' of git.omp.am:/home/omp/git/conky
2009-08-01 15:01:09 -06:00
Brenden Matthews
47b2869028
Code formatting.
2009-08-01 15:01:00 -06:00
Nikolas Garofil
945da94b95
Fix minor spelling mistake
2009-08-01 22:46:10 +02:00
Brenden Matthews
358a2b989e
Add lua_startup_hook.
2009-08-01 14:36:38 -06:00
Brenden Matthews
a3e4b3dd41
Merge branch 'master' of git.omp.am:/home/omp/git/conky
2009-08-01 14:30:27 -06:00
Brenden Matthews
41aed41e35
Add lua_shutdown_hook.
2009-08-01 14:30:14 -06:00
Nikolas Garofil
46df53a361
Fix minor spelling mistake
2009-08-01 22:15:09 +02:00
Brenden Matthews
bb89efee5b
Doc cleanup.
2009-08-01 13:15:53 -06:00
Nikolas Garofil
44b82311b9
Added support for out_to_ncurses
...
All ERR()'s are renamed to NORM_ERR() and box to mbox so that they don't
clash with things in ncurses.h .
Ncurses is enabled by default when building conky but can be disabled with
--disable-ncurses .
At the moment configure doesn't check if ncurses is actually available.
I'm adding support for ncurses so that we can make as much things as possible
that are only available in X11 also available in console in the future.
2009-08-01 20:45:43 +02:00
Nikolas Garofil
763ae568a7
Fix reloading config after 7ff2a71aa0
2009-08-01 12:14:10 +02:00
Cesare Tirabassi
01e66c7f8c
Bug fix: make -X,--display actually work, improve error message if display not found
2009-08-01 09:34:21 +02:00
Nikolas Garofil
7ff2a71aa0
Added $include var to load configfiles inside of other configfiles
2009-07-31 15:28:55 +02:00
Cesare Tirabassi
8af1f24624
minor fix to allow out-of-tree builds
2009-07-31 13:50:33 +02:00
Brenden Matthews
be145bd55d
Removed alias config option due to brokenness.
...
The alias option was broken by fb8ccd7a05
,
and it seems like trying to make it work again will only result in
breakage for env var substitution anyway.
2009-07-31 00:33:06 -06:00
Brenden Matthews
932131f7eb
Actually fix Lua extra compiler includes.
...
I did it wrong with 1a86405cd9
.
2009-07-30 23:41:33 -06:00
Brenden Matthews
17298fee2f
Undo some automake brain damage.
2009-07-30 23:19:48 -06:00
Brenden Matthews
46effdcbc4
Fix Lua extra compiler includes.
2009-07-30 22:21:09 -06:00
Brenden Matthews
985a72b444
Couple minor automake fixes.
2009-07-30 13:55:25 -06:00
Cesare Tirabassi
165eeb0fd6
Add missing changelog entry.
2009-07-30 21:22:27 +02:00
Brenden Matthews
150ddeaf5e
Add missing changelog entry.
2009-07-30 00:08:48 -06:00
Cesare Tirabassi
38e544ee25
weather: add icon data_type for xoap
2009-07-29 22:22:24 +02:00
Nikolas Garofil
8f3150d8f6
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
2009-07-29 21:27:19 +02:00
Nikolas Garofil
9ad3b9d8bc
Fix: make sure 51c928a8ef
works when programs terminate by themselves
2009-07-29 21:27:00 +02:00
Cesare Tirabassi
7bfff20e5d
Merge branch 'master' of git.omp.am:/home/omp/git/conky
2009-07-29 18:04:57 +02:00
Cesare Tirabassi
580fa3a52d
correct typo in error message
2009-07-29 18:04:34 +02:00
Nikolas Garofil
51c928a8ef
Fix: kill zombies without breaking b963c2827f
2009-07-29 11:43:16 +02:00
Cesare Tirabassi
81c691d15a
add emacs indentation variables to source files in line with current vim settings
2009-07-28 23:44:22 +02:00
Brenden Matthews
ec517ecb26
Remove deprecated stuff from docs and conky.c (for 1.7.3).
2009-07-28 12:43:45 -06:00
Brenden Matthews
da4b542ae6
Added some Lua API stuff.
...
Added conky_set_update_interval() API call, which allows you to change
Conky's update interval from a Lua script. Added the 'conky_info' table
to global Lua context, which still needs populating with stuff (right
now it only contains the current update interval and the system uptime).
2009-07-28 12:38:43 -06:00
Nikolas Garofil
e124064892
Fix: Always include stuff that used to use popen because it's now using pid_popen
2009-07-28 15:59:17 +02:00
Brenden Matthews
6c6711aa6d
Fix problem with invalid window props?
...
We should check to make sure the atom actually exists before trying to
retrieve the property.
2009-07-27 21:01:55 -06:00
Brenden Matthews
73eaf0cfc3
Clean up x11.c a bit.
2009-07-27 15:34:06 -06:00
Brenden Matthews
7de7c60923
Make configure opts for Lua extras more concise.
2009-07-27 15:28:40 -06:00
Cesare Tirabassi
da06200e43
Fix user_times bug (launchpad #405188 ).
2009-07-27 15:09:18 -06:00
Brenden Matthews
dd6133b055
Fix linking error with Lua extras disabled.
2009-07-27 15:03:21 -06:00