Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 12:42:41 +00:00
Code Issues Releases Activity

Merge branch '1.8.0' into 1.8.1

Browse Source
This commit is contained in:
Pavel Labath 2010-03-13 01:15:33 +01:00
commit 516ffa41b7
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac.in
View File

@ -544,8 +544,9 @@ AC_ARG_ENABLE([wlan],
AM_CONDITIONAL(BUILD_WLAN, test x$want_wlan = xyes) AM_CONDITIONAL(BUILD_WLAN, test x$want_wlan = xyes)
if test x$want_wlan = xyes; then if test x$want_wlan = xyes; then
AC_CHECK_HEADERS([iwlib.h], [], AC_MSG_ERROR([iwlib.h header not found])) AC_CHECK_HEADERS([iwlib.h], [], AC_MSG_ERROR([iwlib.h header not found]))
AC_CHECK_LIB([iw], [iw_sockets_open], [conky_LIBS="$conky_LIBS -liw"], AC_MSG_ERROR([iw_sockets_open not found])) AC_CHECK_LIB([iw], [iw_sockets_open], [conky_LIBS="-liw $conky_LIBS"],
AC_DEFINE(HAVE_IWLIB, 1, [Define if you want wireless support]) AC_MSG_ERROR([iw_sockets_open not found]), [$conky_LIBS])
AC_DEFINE(HAVE_IWLIB, 1, [Define if you want wireless support])
fi fi
dnl dnl

8
src/conky.c
View File

@ -4508,7 +4508,7 @@ static int do_config_step(int *line, FILE *fp, char *buf, char **name, char **va
} }
#ifdef X11 #ifdef X11
void setalignment(int* text_alignment, unsigned int windowtype, const char* value, const char *f, int line, char setbyconffile) { void setalignment(int* ltext_alignment, unsigned int windowtype, const char* value, const char *f, int line, char setbyconffile) {
#ifdef OWN_WINDOW #ifdef OWN_WINDOW
if (windowtype == TYPE_DOCK) { if (windowtype == TYPE_DOCK) {
NORM_ERR("alignment is disabled when own_window_type is dock"); NORM_ERR("alignment is disabled when own_window_type is dock");
@ -4522,7 +4522,7 @@ void setalignment(int* text_alignment, unsigned int windowtype, const char* valu
CONF_ERR; CONF_ERR;
} else NORM_ERR("'%s' is not a alignment setting", value); } else NORM_ERR("'%s' is not a alignment setting", value);
} else { } else {
*text_alignment = a; *ltext_alignment = a;
} }
} else if(setbyconffile == true) { } else if(setbyconffile == true) {
CONF_ERR; CONF_ERR;
@ -5587,7 +5587,9 @@ static const struct option longopts[] = {
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
void set_current_config() { void set_current_config(void);
void set_current_config(void)
{
/* check if specified config file is valid */ /* check if specified config file is valid */
if (current_config) { if (current_config) {
struct stat sb; struct stat sb;

4
src/i8k.c
View File

@ -32,9 +32,9 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "logging.h"
#include "temphelper.h"
#include "text_object.h" #include "text_object.h"
#include "temphelper.h"
#include "logging.h"
struct { struct {
char *version; char *version;

2
src/iconv_tools.c
View File

@ -29,8 +29,8 @@
*/ */
#include "config.h" #include "config.h"
#include "logging.h"
#include "text_object.h" #include "text_object.h"
#include "logging.h"
#include <iconv.h> #include <iconv.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

2
src/proc.c
View File

@ -28,8 +28,8 @@
* *
*/ */
#include <logging.h>
#include "conky.h" #include "conky.h"
#include "logging.h"
#include "proc.h" #include "proc.h"
#include <unistd.h> #include <unistd.h>
#include <ctype.h> #include <ctype.h>

2
src/user.c
View File

@ -28,11 +28,11 @@
* *
*/ */
#include <logging.h>
#include <pwd.h> #include <pwd.h>
#include <grp.h> #include <grp.h>
#include <errno.h> #include <errno.h>
#include "conky.h" #include "conky.h"
#include "logging.h"
void print_uid_name(struct text_object *obj, char *p, int p_max_size) { void print_uid_name(struct text_object *obj, char *p, int p_max_size) {
struct passwd *pw; struct passwd *pw;