diff --git a/AUTHORS b/AUTHORS index 3c0e089d..f96e6ef5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -238,7 +238,7 @@ Petr Holub Philip Kovacs tcp port monitor with hashing functionality - + Audacious, Xmms, BMP, Infopipe stuff Various Xlib changes, e.g. own_window hints, etc. diff --git a/README.svn-version b/README.svn-version index ea041fb3..5bf4d5e7 100644 --- a/README.svn-version +++ b/README.svn-version @@ -27,7 +27,7 @@ Fresh from a SVN checkout: You can also try using the autogen.sh script, like so: $ sh autogen.sh - + * After that, it's the familiar $ ./configure diff --git a/doc/conky.conf b/doc/conky.conf index df96def2..df7dd4e5 100644 --- a/doc/conky.conf +++ b/doc/conky.conf @@ -178,7 +178,7 @@ ${color #ddaa00} ${top_mem name 1} ${top_mem pid 1} ${top_mem cpu 1} ${top_mem m ${color lightgrey} ${top_mem name 2} ${top_mem pid 2} ${top_mem cpu 2} ${top_mem mem 2} ${color lightgrey} ${top_mem name 3} ${top_mem pid 3} ${top_mem cpu 3} ${top_mem mem 3} $stippled_hr -${color #ddaa00}Port(s)${alignr}#Connections +${color #ddaa00}Port(s)${alignr}#Connections $color Inbound: ${tcp_portmon 1 32767 count} Outbound: ${tcp_portmon 32768 61000 count}${alignr}ALL: ${tcp_portmon 1 65535 count} ${color #ddaa00}Inbound Connection ${alignr} Local Service/Port$color ${tcp_portmon 1 32767 rhost 0} ${alignr} ${tcp_portmon 1 32767 lservice 0} diff --git a/doc/docs.xml b/doc/docs.xml index 9808da88..85655d1d 100644 --- a/doc/docs.xml +++ b/doc/docs.xml @@ -50,7 +50,7 @@ Conky has more than 250 built in objects, including support for a plethora of OS stats (uname, uptime, CPU usage, mem usage, disk usage, "top" like process stats, and network monitoring, just to name a few), - built in IMAP and POP3 support, built in support for many popular + built in IMAP and POP3 support, built in support for many popular music players (MPD, XMMS2, BMPx, Audacious), and much much more. Conky can display this info either as text, or using simple progress bars and graph widgets, with different fonts and colours. @@ -69,12 +69,12 @@ Compiling For users compiling from source on a binary distro, make sure you have the X development - libraries installed. This should be a package along the lines of "libx11-dev" or + libraries installed. This should be a package along the lines of "libx11-dev" or "xorg-x11-dev" for X11 libs, and similar "-dev" format for the other libs required (depending on your configure options). - Conky has (for some time) been available in the repositories of most popular distributions. + Conky has (for some time) been available in the repositories of most popular distributions. Here are some installation instructions for a few: @@ -151,7 +151,7 @@ Configuration Settings - Default configuration file location is $HOME/.conkyrc or + Default configuration file location is $HOME/.conkyrc or ${sysconfdir}/conky/conky.conf. On most systems, sysconfdir is /etc, and you can find the sample config file there (/etc/conky/conky.conf). diff --git a/doc/variables.xml b/doc/variables.xml index c8cbf569..224d5669 100644 --- a/doc/variables.xml +++ b/doc/variables.xml @@ -1193,7 +1193,7 @@ Bar that shows amount of memory in use - + diff --git a/src/Makefile.am b/src/Makefile.am index 859db102..72a3e152 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -117,9 +117,9 @@ conky_SOURCES = \ mboxscan.h \ $(x11) \ $(xmms2) \ - $(smapi) + $(smapi) -AM_LDFLAGS = $(PTHREAD_LIBS) -lm +AM_LDFLAGS = $(PTHREAD_LIBS) -lm EXTRA_DIST = \ audacious.c \ @@ -143,7 +143,7 @@ EXTRA_DIST = \ x11.c \ xmms2.c \ smapi.c \ - users.c - + users.c + # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/src/conky.c b/src/conky.c index 8664ee26..2bd6b426 100644 --- a/src/conky.c +++ b/src/conky.c @@ -1040,7 +1040,7 @@ static void human_readable(long long num, char *buf, int size, const char *func_ suffix++; fnum = num / 1024.0; - + precision = 3; do { precision--; @@ -2279,7 +2279,7 @@ static void free_text_objects(unsigned int count, struct text_object *objs) #endif #ifdef NVIDIA case OBJ_nvidia: - break; + break; #endif #ifdef MPD case OBJ_mpd_title: @@ -3887,7 +3887,7 @@ static struct text_object *construct_text_object(const char *s, END OBJ(entropy_poolsize, INFO_ENTROPY) END OBJ(entropy_bar, INFO_ENTROPY) scan_bar(arg, &obj->a, &obj->b); -#ifdef NVIDIA +#ifdef NVIDIA END OBJ(nvidia, 0) if (!arg){ CRIT_ERR("nvidia needs one argument " @@ -4984,7 +4984,7 @@ static void generate_text_internal(char *p, int p_max_size, if (length > 0 && output[length - 1] == '\n') { output[length - 1] = '\0'; } - + text_objects = parse_conky_vars(obj->data.execi.buffer, p, my_info); obj->data.execi.last_update = current_update_time; } @@ -6281,10 +6281,10 @@ head: int hol = (strcmp((char*)&obj->data.nvidia.arg, "gpufreq")) ? 1 : 0; if(!(obj->data.nvidia.value = get_nvidia_value(obj->data.nvidia.type, display, hol))) snprintf(p, p_max_size, "value unavailible"); - else + else spaced_print(p, p_max_size, "%*d", 4, "nvidia", 4, obj->data.nvidia.value); - + } #endif /* NVIDIA */ diff --git a/src/conky.h b/src/conky.h index e75e5988..a0db3306 100644 --- a/src/conky.h +++ b/src/conky.h @@ -80,7 +80,7 @@ char *strndup(const char *s, size_t n); #ifdef NVIDIA #include "nvidia.h" #endif - + #include "mboxscan.h" #include "timed_thread.h" #include "top.h" diff --git a/src/diskio.c b/src/diskio.c index e0c65d80..e8fa96b0 100644 --- a/src/diskio.c +++ b/src/diskio.c @@ -95,7 +95,7 @@ struct diskio_stat *prepare_diskio_stat(const char *s) /* * check that device actually exists */ - + if (!(fp = open_file("/proc/diskstats", &rep))) { ERR("cannot read from /proc/diskstats"); return 0; diff --git a/src/linux.c b/src/linux.c index 351845d3..f9543a98 100644 --- a/src/linux.c +++ b/src/linux.c @@ -1572,30 +1572,30 @@ void get_battery_stuff(char *buffer, unsigned int n, const char *bat, int item) memset(last_battery_time_str[idx], 0, sizeof(last_battery_time_str[idx])); /* first try SYSFS if that fails try ACPI */ - + if (sysfs_bat_fp[idx] == NULL && acpi_bat_fp[idx] == NULL && apm_bat_fp[idx] == NULL) { sysfs_bat_fp[idx] = open_file(sysfs_path, &rep); rep = 0; } - + if (sysfs_bat_fp[idx] == NULL && acpi_bat_fp[idx] == NULL && apm_bat_fp[idx] == NULL) { acpi_bat_fp[idx] = open_file(acpi_path, &rep); } - + if (sysfs_bat_fp[idx] != NULL) { /* SYSFS */ int present_rate = -1; int remaining_capacity = -1; char charging_state[64]; char present[4]; - + strcpy(charging_state, "unknown"); - + while (!feof(sysfs_bat_fp[idx])) { char buf[256]; if (fgets(buf, 256, sysfs_bat_fp[idx]) == NULL) break; - + /* let's just hope units are ok */ if (strncmp (buf, "POWER_SUPPLY_PRESENT=1", 22) == 0) strcpy(present, "yes"); @@ -1618,14 +1618,14 @@ void get_battery_stuff(char *buffer, unsigned int n, const char *bat, int item) else if (strncmp(buf, "POWER_SUPPLY_CHARGE_FULL=", 25) == 0) sscanf(buf, "POWER_SUPPLY_CHARGE_FULL=%d", &acpi_last_full[idx]); } - + fclose(sysfs_bat_fp[idx]); sysfs_bat_fp[idx] = NULL; - + /* Hellf[i]re notes that remaining capacity can exceed acpi_last_full */ if (remaining_capacity > acpi_last_full[idx]) acpi_last_full[idx] = remaining_capacity; /* normalize to 100% */ - + /* not present */ if (strcmp(present, "No") == 0) { strncpy(last_battery_str[idx], "not present", 64); diff --git a/src/nvidia.h b/src/nvidia.h index c3d31af3..9dfffe9b 100644 --- a/src/nvidia.h +++ b/src/nvidia.h @@ -46,6 +46,6 @@ struct nvidia_s { int value; char arg[20]; QUERY_ID type; -}; +}; #endif diff --git a/src/smapi.c b/src/smapi.c index 1d24224a..14bac0c1 100644 --- a/src/smapi.c +++ b/src/smapi.c @@ -1,7 +1,7 @@ /* smapi.c: conky support for IBM Thinkpad smapi * * Copyright (C) 2007 Phil Sutter - * + * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/smapi.h b/src/smapi.h index c1b6ae6d..5ab489b5 100644 --- a/src/smapi.h +++ b/src/smapi.h @@ -1,7 +1,7 @@ /* smapi.h: conky support for IBM Thinkpad smapi * * Copyright (C) 2007 Phil Sutter - * + * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/xmms2.c b/src/xmms2.c index 8f5503e6..4c6c4a50 100644 --- a/src/xmms2.c +++ b/src/xmms2.c @@ -248,7 +248,7 @@ void handle_playback_state_change(xmmsc_result_t *res, void *p) } void handle_playlist_loaded(xmmsc_result_t *res, void *p) { - struct information *ptr = p; + struct information *ptr = p; if (ptr->xmms2.playlist == NULL) { ptr->xmms2.playlist = malloc(text_buffer_size);