1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-24 07:38:27 +00:00

Conky 1.4.5

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@815 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Philip Kovacs 2006-12-13 01:57:46 +00:00
parent 5ff932ff21
commit 9405f780d6
4 changed files with 10 additions and 14 deletions

View File

@ -4,6 +4,7 @@
* Split battery variable into two:
battery, e.g. "charging 75%" and
battery_time, e.g. "3h 15m".
* Conky 1.4.5 released.
2006-12-11
* Close pop3/imap sockets.

View File

@ -4,12 +4,7 @@ dnl major, minor and micro version macros.
m4_define([conky_version_major], [1])
m4_define([conky_version_minor], [4])
m4_define([conky_version_micro], [5])
dnl [svn] for versions with svn revision numbers, e.g. 1.4.5-svn-r00790
dnl [rc1] for release candidates, e.g. 1.4.5-rc1
dnl [] for releases, e.g. 1.4.5
m4_define([conky_version_tag], [svn])
m4_define([conky_version_tag], []) dnl [] for releases
m4_define([conky_version_revision],[r@REVISION@])
m4_define([conky_version],
[conky_version_major().conky_version_minor().conky_version_micro()ifelse(

View File

@ -383,7 +383,7 @@ int peek_tcp_port_monitor(
case REMOTEHOST:
p_hostent = gethostbyaddr( (const char *)&p_monitor->p_peek[ connection_index ]->remote_addr,
p_hostent = gethostbyaddr( (const void *)&p_monitor->p_peek[ connection_index ]->remote_addr,
sizeof(in_addr_t), AF_INET);
/* if no host name found, just use ip address. */
if ( !p_hostent || !p_hostent->h_name )
@ -419,7 +419,7 @@ int peek_tcp_port_monitor(
case LOCALHOST:
p_hostent = gethostbyaddr( (const char *)&p_monitor->p_peek[ connection_index ]->local_addr,
p_hostent = gethostbyaddr( (const void *)&p_monitor->p_peek[ connection_index ]->local_addr,
sizeof(in_addr_t), AF_INET);
/* if no host name found, just use ip address. */
if ( !p_hostent || !p_hostent->h_name )

View File

@ -108,12 +108,12 @@ typedef struct _tcp_connection_list_t {
* A port monitor
* -------------- */
typedef struct _tcp_port_monitor_t {
gchar key[TCP_PORT_MONITOR_HASH_KEY_SIZE]; /* monitor's key in collection hash */
in_port_t port_range_begin; /* start of monitor port range */
in_port_t port_range_end; /* begin = end to monitor a single port */
tcp_connection_list_t connection_list; /* list of connections for this monitor */
GHashTable *hash; /* hash table of pointers into monitor's connection list */
tcp_connection_t **p_peek; /* array of connection pointers for O(1) peeking by index */
gchar key[TCP_PORT_MONITOR_HASH_KEY_SIZE]; /* monitor's key in collection hash */
in_port_t port_range_begin; /* start of monitor port range */
in_port_t port_range_end; /* begin = end to monitor a single port */
tcp_connection_list_t connection_list; /* list of connections for this monitor */
GHashTable *hash; /* hash table of pointers into connection list */
tcp_connection_t **p_peek; /* array of connection pointers for O(1) peeking */
unsigned int max_port_monitor_connections; /* max number of connections */
} tcp_port_monitor_t;