Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-03 20:48:31 +00:00
Code Issues Releases Activity

whitespace cleanup

Browse Source
This commit is contained in:
Phil Sutter 2009-02-22 18:35:47 +01:00
parent 2c44e6dccf
commit e3ed9c62fb
3 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/Makefile.am
View File

@ -111,38 +111,38 @@ if BUILD_NVIDIA
nvidia = nvidia.c nvidia.h nvidia = nvidia.c nvidia.h
endif endif
conky_SOURCES = \ conky_SOURCES = \
$(config_output) \ $(config_output) \
$(config_cookie) \ $(config_cookie) \
$(audacious) \ $(audacious) \
$(bmpx) \ $(bmpx) \
colours.c \ colours.c \
colours.h \ colours.h \
common.c \ common.c \
conky.c \ conky.c \
conky.h \ conky.h \
$(freebsd) \ $(freebsd) \
fs.c \ fs.c \
$(hddtemp) \ $(hddtemp) \
$(linux) \ $(linux) \
logging.h \ logging.h \
$(nvidia) \ $(nvidia) \
mail.c \ mail.c \
mixer.c \ mixer.c \
$(mpd) \ $(mpd) \
$(moc) \ $(moc) \
$(netbsd) \ $(netbsd) \
$(openbsd) \ $(openbsd) \
$(port_monitors) \ $(port_monitors) \
$(eve) \ $(eve) \
$(rss) \ $(rss) \
$(solaris) \ $(solaris) \
timed_thread.c \ timed_thread.c \
timed_thread.h \ timed_thread.h \
mboxscan.c \ mboxscan.c \
mboxscan.h \ mboxscan.h \
$(x11) \ $(x11) \
$(xmms2) \ $(xmms2) \
$(ibm) \ $(ibm) \
specials.c \ specials.c \
specials.h \ specials.h \
@ -155,56 +155,56 @@ conky_SOURCES = \
algebra.h \ algebra.h \
algebra.c algebra.c
conky_LDFLAGS = \ conky_LDFLAGS = \
$(PTHREAD_LIBS) \ $(PTHREAD_LIBS) \
-lm -lm
EXTRA_DIST = \ EXTRA_DIST = \
$(config_output) \ $(config_output) \
$(config_cookie) \ $(config_cookie) \
audacious.c \ audacious.c \
audacious.h \ audacious.h \
bmpx.c \ bmpx.c \
colours.c \ colours.c \
colours.h \ colours.h \
common.h \ common.h \
fonts.c \ fonts.c \
fonts.h \ fonts.h \
freebsd.c \ freebsd.c \
freebsd.h \ freebsd.h \
fs.h \ fs.h \
hddtemp.c \ hddtemp.c \
hddtemp.h \ hddtemp.h \
linux.c \ linux.c \
linux.h \ linux.h \
libmpdclient.c \ libmpdclient.c \
libmpdclient.h \ libmpdclient.h \
libtcp-portmon.c \ libtcp-portmon.c \
libtcp-portmon.h \ libtcp-portmon.h \
rss.h \ rss.h \
mail.h \ mail.h \
mixer.h \ mixer.h \
moc.h \ moc.h \
moc.c \ moc.c \
mpd.c \ mpd.c \
mpd.h \ mpd.h \
netbsd.c \ netbsd.c \
nvidia.c \ nvidia.c \
nvidia.h \ nvidia.h \
openbsd.c \ openbsd.c \
openbsd.h \ openbsd.h \
solaris.c \ solaris.c \
specials.c \ specials.c \
specials.h \ specials.h \
tailhead.c \ tailhead.c \
tailhead.h \ tailhead.h \
top.h \ top.h \
diskio.h \ diskio.h \
x11.c \ x11.c \
x11.h \ x11.h \
xmms2.c \ xmms2.c \
xmms2.h \ xmms2.h \
smapi.c \ smapi.c \
smapi.h \ smapi.h \
ibm.c \ ibm.c \
ibm.h \ ibm.h \

2
src/audacious.c
View File

@ -232,7 +232,7 @@ void *audacious_thread_func(void *pvoid)
/* Main volume */ /* Main volume */
vol = audacious_remote_get_main_volume(session); vol = audacious_remote_get_main_volume(session);
snprintf(items[AUDACIOUS_MAIN_VOLUME], snprintf(items[AUDACIOUS_MAIN_VOLUME],
sizeof(items[AUDACIOUS_MAIN_VOLUME]) - 1, "%d", vol); sizeof(items[AUDACIOUS_MAIN_VOLUME]) - 1, "%d", vol);
} while (0); } while (0);
/* Deliver the refreshed items array to audacious_items. */ /* Deliver the refreshed items array to audacious_items. */

4
src/conky.c
View File

@ -819,7 +819,7 @@ static void free_text_objects(struct text_object *root)
case OBJ_battery: case OBJ_battery:
free(data.s); free(data.s);
break; break;
case OBJ_battery_short: case OBJ_battery_short:
free(data.s); free(data.s);
break; break;
case OBJ_battery_time: case OBJ_battery_time:
@ -4007,7 +4007,7 @@ static void generate_text_internal(char *p, int p_max_size,
/* mixer stuff */ /* mixer stuff */
OBJ(mixer) { OBJ(mixer) {
spaced_print(p, p_max_size, "%*d", 4, spaced_print(p, p_max_size, "%*d", 4,
pad_percents, mixer_get_avg(obj->data.l)); pad_percents, mixer_get_avg(obj->data.l));
} }
OBJ(mixerl) { OBJ(mixerl) {