From 8a73e67a25fc6035e4fabacaa20a65dee016d659 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini
Date: Thu, 24 Apr 2014 20:29:07 +0200
Subject: [PATCH] merged from plib
---
NEWS.html | 8 +-
po/Makefile.in | 6 +-
po/POTFILES.in | 2 +-
src/cfg.c | 2 +-
src/graph.c | 2 +-
src/lib/Makefile.am | 4 +-
src/lib/Makefile.in | 8 +-
src/lib/hdd_atasmart.c | 2 +-
src/lib/log.c | 157 ------------------------
src/lib/log.h | 42 -------
src/lib/pio.c | 315 +++++++++++++++++++++++++++++++++++++++++++++++--
src/lib/pio.h | 86 +++++++++++---
src/lib/plog.c | 173 +++++++++++++++++++++++++++
src/lib/plog.h | 49 ++++++++
src/lib/psensor.h | 2 +-
src/lib/ptime.c | 84 +++++++++----
src/lib/ptime.h | 11 +-
src/lib/slog.c | 20 +++-
src/server/server.c | 2 +-
src/ui_appindicator.c | 48 ++++++--
src/ui_status.c | 2 +-
tests/Makefile.am | 4 +-
tests/Makefile.in | 49 ++++++--
23 files changed, 791 insertions(+), 287 deletions(-)
delete mode 100644 src/lib/log.c
delete mode 100644 src/lib/log.h
create mode 100644 src/lib/plog.c
create mode 100644 src/lib/plog.h
diff --git a/NEWS.html b/NEWS.html
index d35053d..cba5de7 100644
--- a/NEWS.html
+++ b/NEWS.html
@@ -394,6 +394,12 @@ smaller and more consistent with ubuntu themes appindicator icons.
sensors displayed directly in the top bar.
+
+
+improved status icon in hicolor theme to fit well with white
+ background. (LP: #1310323).
+
+
@@ -2517,7 +2523,7 @@ Fixed BR1: crash when no temperature sensor is available