Pavel Labath
70da1c8b37
Allow xmms2_smart to display only the title (sf.net #3140371 )
...
In the current implementation of xmms2_smart, when a song being played does not have an artist
name (as is the case with many streams) conky displays an empty space a dash followed by the
title (ex: " - Song Title"). The following patch improves this by only displaying the song title
in xmms2_smart when the song artist is empty. Moreover, the patch also fixes an issue that
existed with the previous xmms2_smart which seemed to be checking the string length of the song
title twice before outputing the url of the song. This seems like a typo and what this line
likely meant to do was check that both the song artist and song title were empty before
displaying the song url.
Patch contributed by Tamim Khan.
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2011-03-04 19:29:52 +01:00
Nikolas Garofil
cb544bd1f7
Check that there is no writing outside the string
2011-02-13 00:10:20 +01:00
Nikolas Garofil
5aaac61f4e
make cast unnecessary
2011-02-12 19:11:01 +01:00
Nikolas Garofil
678d79e6fe
use sscanf() instead of hextobyte()
2011-02-12 18:01:41 +01:00
Nikolas Garofil
723255f142
Use inet_ntop(), thanks to pavelo for telling me about this
2011-02-12 17:18:33 +01:00
Nikolas Garofil
70b6f35a84
fix racecondition in eve, based on a patch from Vasiliy Kulikov, based on a patch from Brandon
2011-02-11 18:30:04 +01:00
Nikolas Garofil
18ce365d16
change reading args of $v6addrs and add docs
2011-02-11 15:43:01 +01:00
Nikolas Garofil
2754fab78d
Support for scope in $v6addrs
2011-02-11 13:05:00 +01:00
Nikolas Garofil
997dcc87d9
fix build without ipv6 support
2011-02-11 00:27:12 +01:00
Nikolas Garofil
b548f476cc
Support for -n in $v6addrs
2011-02-10 23:27:14 +01:00
Nikolas Garofil
ac4a3682ae
Fix security bug in 's getSkillname
2011-02-10 16:20:06 +01:00
Nikolas Garofil
5a5e8f80b1
Support for short-version ipv6-addresses
2011-02-10 16:01:16 +01:00
Nikolas Garofil
2aafb591ee
Add fscanf_no_i18n() to fix sf.net #3154556
2011-02-10 01:08:34 +01:00
Nikolas Garofil
6287b22a3d
Add $v6addrs to increase IPv6 support
...
This is only the beginning of the ipv6 support,
This var isn't documented and only works on Linux.
It should also be patched to show the addresses in compressed format
Some other vars should also be added to see things like netmask, scope, routes, ...
2011-02-09 18:49:52 +01:00
Pavel Labath
41dc5db094
Initialize special_t when allocating it (this should fix sf.net #3138243 )
2011-01-05 13:54:04 +01:00
Pavel Labath
87591f502e
add a $memdirty variable
...
patch contributed by Piotr Karbowski (sf.net #3138195 )
2011-01-04 14:48:33 +01:00
Pavel Labath
5237fe9d23
Revert "$mixer: report more reasonable values for mono devices"
...
the user reports this didn't fix the problem (see sf.net #3131452 )
This reverts commit 540f78f0bd
2011-01-02 14:24:10 +01:00
Pavel Labath
f0d48190ff
$mixer: report more reasonable values for mono devices
2011-01-01 11:37:31 +01:00
Tiago Vale
c5d065d119
Added support for POWER_SUPPLY_POWER_NOW In Linux, apparently POWER_SUPPLY_CURRENT_NOW was deprecated and replaced by POWER_SUPPLY_POWER_NOW. In my system, ever since kernel 2.6.36.1 battery lifetime showed "unknown" in conky. Check http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532000 .
...
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2010-12-30 14:42:16 +01:00
Pavel Labath
29ef75083a
Fix 'comparison between signed and unsigned expressions' warning
2010-12-23 18:25:31 +01:00
Pavel Labath
67b11f84ec
install conky documentation with a configurable path (-DDOC_PATH) (sf.net #3117859 )
...
patch contributed by Daniel Pielmeier (billie)
2010-12-11 13:50:59 +01:00
Pavel Labath
44a30fac3d
kvm_proc needs synchronized access
...
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
Conflicts:
src/conky.c
src/freebsd.cc
src/freebsd.h
2010-12-09 19:22:34 +01:00
Pavel Labath
187dc352c4
apcupsd supposedly works on FreeBSD as well
2010-12-09 18:55:22 +01:00
Nikos Ntarmos
3b5d5f33b3
Build fixes for bmpx
...
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2010-12-09 18:46:51 +01:00
Pavel Labath
f1bc24f199
fclose(3) instead of pclose(3) as the latter seems to leak file descriptors
...
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
Conflicts:
src/exec.c - had to merge manually
2010-12-05 21:16:01 +01:00
Pavel Labath
43d81169f6
Use initializer list for member initialization
2010-11-26 18:03:41 +01:00
Nikolas Garofil
99c359b212
Fix displaying UTF-8 without XFT
2010-11-26 17:59:07 +01:00
Nikolas Garofil
7310bff162
remove TEXT in config_settings.xml and variables.xml
2010-11-25 14:41:24 +01:00
Pavel Labath
25c1b1d919
convert.lua: if the string countains a backslash, don't quote with ''
2010-11-25 13:49:56 +01:00
Nikolas Garofil
f6a4588b3c
Include default values set by cmake in print_version(), Don't set HTTPPORT when BUILD_HTTP is unset
2010-11-24 18:17:53 +01:00
Nikolas Garofil
d48e83e0d4
Bugfix: Shades weren't placed correct after a $goto
2010-11-24 16:47:29 +01:00
Nikolas Garofil
b43e130180
small rewrite print_version()
2010-11-24 00:46:29 +01:00
Pavel Labath
981ed0b609
fix own_window_colour setting name
2010-11-23 23:18:50 +01:00
Pavel Labath
6374a487cc
Merge branch 'master' of git.omp.am:/home/omp/git/conky
2010-11-23 19:29:25 +01:00
Pavel Labath
7df57a9961
Change the default config file back to .conkyrc
...
we have the auto-conversion script now, there is no need for a new name (yet)
2010-11-23 19:18:47 +01:00
Pavel Labath
acbd44856f
install the conversion script with make install
2010-11-23 19:17:42 +01:00
Nikolas Garofil
7b128a9f16
Merge branch 'lua-config'
2010-11-23 18:56:58 +01:00
Nikolas Garofil
c93f9817cb
Merge branch 'master' into lua-config
2010-11-23 18:50:48 +01:00
Nikolas Garofil
687407479f
Make sure template_ in calc_cpu_total() can also be TMPL_LONGPROC
2010-11-23 18:50:40 +01:00
Pavel Labath
5aa59f55fa
Make xmms2 work again (not tested yet)
2010-11-23 18:42:48 +01:00
Nikolas Garofil
1b791ed1c8
Merge branch 'master' into lua-config
2010-11-23 17:42:00 +01:00
Nikolas Garofil
23a193fe89
Complete previous commit
2010-11-23 17:40:53 +01:00
Nikolas Garofil
c1933dc186
Make sure char-arrays filled with read() are null-terminated
2010-11-23 17:33:26 +01:00
Pavel Labath
c9e855060d
Merge remote branch 'origin/master' into lua-config
...
Conflicts:
cmake/ConkyBuildOptions.cmake
src/conky.cc
2010-11-23 16:49:18 +01:00
Pavel Labath
cc98b26119
Fix small error in old config handling
2010-11-23 16:45:42 +01:00
Pavel Labath
4ab7f6d0d1
Replace the if(&l) unused hack with unused attribute
2010-11-23 16:43:14 +01:00
Nikolas Garofil
5781e4f1e7
Fix build with BUILD_X11 but without OWN_WINDOW
2010-11-23 13:58:53 +01:00
Nikolas Garofil
529392aef0
Fix building without BUILD_OLD_CONFIG
2010-11-22 23:45:38 +01:00
Nikolas Garofil
5f76f847dd
Bugfix: choosing BUILD_ARGB without OWN_WINDOW breaks building
2010-11-22 21:14:45 +01:00
Nikolas Garofil
a8d633009d
Bugfix: choosing BUILD_ARGB without OWN_WINDOW breaks building
2010-11-22 21:00:26 +01:00
