Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-23 19:39:06 +00:00
Code Issues Releases Activity

close bug #1591609; remove deprecated vars

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@746 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Philip Kovacs 2006-11-11 01:15:28 +00:00
parent 1bcf2b0409
commit ad33cf9904
5 changed files with 15 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
# $Id$
2006-11-10
* Remove on_bottom and xmms_player completely.
* Closed bug #1591609 by adding a check for arguments with ibm_temps.
2006-11-09
* Updated vim and nano syntax coloring scripts.
* Added extras/ dir with syntax stuff to distribution tarball.

4
README
View File

@ -152,10 +152,6 @@ CONFIGURATION SETTINGS
started
on_bottom
Set Conky on the bottom of all other applications
border_margin
Border margin in pixels

7
doc/config_settings.xml
View File

@ -13,13 +13,6 @@
<para></para></listitem>
</varlistentry>
<varlistentry>
<term><command><option>on_bottom</option></command></term>
<listitem>
Set Conky on the bottom of all other applications
<para></para></listitem>
</varlistentry>
<varlistentry>
<term><command><option>border_margin</option></command></term>
<listitem>

4
doc/conky.1
View File

@ -143,10 +143,6 @@ Aligned position on screen, may be top_left, top_right, bottom_left, bottom_righ
\fB\*(T<\fBbackground\fR\*(T>\fR
Boolean value, if true, Conky will be forked to background when started
.TP
\fB\*(T<\fBon_bottom\fR\*(T>\fR
Set Conky on the bottom of all other applications
.TP
\fB\*(T<\fBborder_margin\fR\*(T>\fR
Border margin in pixels

37
src/conky.c
View File

@ -282,9 +282,6 @@ static int cpu_avg_samples, net_avg_samples;
#ifdef X11
/* Always on bottom */
static int on_bottom;
/* Position on the screen */
static int text_alignment;
static int gap_x, gap_y;
@ -2142,6 +2139,9 @@ static struct text_object *construct_text_object(const char *s, const char *arg,
END OBJ(i8k_buttons_status, INFO_I8K)
END OBJ(ibm_fan, 0)
END OBJ(ibm_temps, 0)
if (!arg) {
CRIT_ERR("ibm_temps: needs an argument");
}
if (!isdigit(arg[0])
|| strlen(arg) >=2
|| atoi(&arg[0]) >=8)
@ -6152,7 +6152,6 @@ static void set_default_configurations(void)
border_margin = 3;
border_width = 1;
text_alignment = BOTTOM_LEFT;
on_bottom = 1;
#endif /* X11 */
free(current_mail_spool);
@ -6237,24 +6236,14 @@ else if (strcasecmp(name, a) == 0 || strcasecmp(name, b) == 0)
#ifdef X11
CONF2("alignment") {
if (value) {
int a = string_to_alignment(value);
if (a <= 0)
CONF_ERR;
else
text_alignment = a;
} else
CONF_ERR;
}
CONF("on_bottom") {
if(value)
ERR("on_bottom is deprecated. use own_window_hints below");
on_bottom = string_to_bool(value);
if (on_bottom)
SET_HINT(window.hints,HINT_BELOW);
else
if (value) {
int a = string_to_alignment(value);
if (a <= 0)
CONF_ERR;
else
text_alignment = a;
} else
CONF_ERR;
}
CONF("background") {
fork_to_background = string_to_bool(value);
@ -6262,7 +6251,7 @@ else if (strcasecmp(name, a) == 0 || strcasecmp(name, b) == 0)
#else
CONF2("background") {
fork_to_background = string_to_bool(value);
fork_to_background = string_to_bool(value);
}
#endif /* X11 */
#ifdef X11
@ -6297,10 +6286,6 @@ else if (strcasecmp(name, a) == 0 || strcasecmp(name, b) == 0)
CONF_ERR;
}
#endif /* X11 */
CONF("xmms_player") {
if (value)
ERR("xmms_player is deprecated. see ./configure --help");
}
CONF("imap") {
if (value) {
info.mail = parse_mail_args(IMAP, value);