[Xfce4-commits] [panel-plugins/xfce4-sensors-plugin] 01/01: Remove further files that should not be committed

noreply at xfce.org noreply at xfce.org
Sat Feb 4 11:45:39 CET 2017


This is an automated email from the git hooks/post-receive script.

timystery pushed a commit to branch master
in repository panel-plugins/xfce4-sensors-plugin.

commit fe6399c837c9ad6cec7e8e5a5cdfc8c2822f7213
Author: Fabian <timystery at arcor.de>
Date:   Sat Feb 4 11:40:32 2017 +0100

    Remove further files that should not be committed
---
 panel-plugin/Makefile.in           |  829 -------------
 panel-plugin/sensors-plugin.c.orig | 2361 ------------------------------------
 po/Makefile.in                     |  222 ----
 po/POTFILES                        |   16 -
 po/stamp-it                        |    0
 5 files changed, 3428 deletions(-)

diff --git a/panel-plugin/Makefile.in b/panel-plugin/Makefile.in
deleted file mode 100644
index 0e7c529..0000000
--- a/panel-plugin/Makefile.in
+++ /dev/null
@@ -1,829 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = panel-plugin
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(cssfiledir)" \
-	"$(DESTDIR)$(desktopdir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-libxfce4_sensors_plugin_la_DEPENDENCIES =  \
-	$(top_builddir)/lib/libxfce4sensors.la
-am_libxfce4_sensors_plugin_la_OBJECTS =  \
-	libxfce4_sensors_plugin_la-sensors-plugin.lo
-libxfce4_sensors_plugin_la_OBJECTS =  \
-	$(am_libxfce4_sensors_plugin_la_OBJECTS)
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-libxfce4_sensors_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(libxfce4_sensors_plugin_la_CFLAGS) $(CFLAGS) \
-	$(libxfce4_sensors_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_ at AM_V@)
-am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_ at AM_V@)
-am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_ at AM_V@)
-am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_ at AM_V@)
-am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-SOURCES = $(libxfce4_sensors_plugin_la_SOURCES)
-DIST_SOURCES = $(libxfce4_sensors_plugin_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DATA = $(cssfile_DATA) $(desktop_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
-	$(top_srcdir)/mkinstalldirs
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
-GLIB_VERSION = @GLIB_VERSION@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
-GTK_VERSION = @GTK_VERSION@
-HDDTEMP_PORT = @HDDTEMP_PORT@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBM = @LIBM@
-LIBNOTIFY4_CFLAGS = @LIBNOTIFY4_CFLAGS@
-LIBNOTIFY4_LIBS = @LIBNOTIFY4_LIBS@
-LIBNOTIFY4_REQUIRED_VERSION = @LIBNOTIFY4_REQUIRED_VERSION@
-LIBNOTIFY4_VERSION = @LIBNOTIFY4_VERSION@
-LIBNOTIFY7_CFLAGS = @LIBNOTIFY7_CFLAGS@
-LIBNOTIFY7_LIBS = @LIBNOTIFY7_LIBS@
-LIBNOTIFY7_REQUIRED_VERSION = @LIBNOTIFY7_REQUIRED_VERSION@
-LIBNOTIFY7_VERSION = @LIBNOTIFY7_VERSION@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@
-LIBSENSORS_LDFLAGS = @LIBSENSORS_LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LIBXFCE4PANEL_CFLAGS = @LIBXFCE4PANEL_CFLAGS@
-LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@
-LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@
-LIBXFCE4PANEL_VERSION = @LIBXFCE4PANEL_VERSION@
-LIBXFCE4SENSORS_VERINFO = @LIBXFCE4SENSORS_VERINFO@
-LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@
-LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@
-LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@
-LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NETCAT_HOST = @NETCAT_HOST@
-NETCAT_PATH = @NETCAT_PATH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NVIDIA_CFLAGS = @NVIDIA_CFLAGS@
-NVIDIA_LIBS = @NVIDIA_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_HDDTEMP = @PATH_HDDTEMP@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PLATFORM_CFLAGS = @PLATFORM_CFLAGS@
-PLATFORM_LDFLAGS = @PLATFORM_LDFLAGS@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SOLLIBS = @SOLLIBS@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_ARGS = @XGETTEXT_ARGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-hddtemp = @hddtemp@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-nc = @nc@
-netcat = @netcat@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugindir = $(libdir)/xfce4/panel/plugins
-plugin_LTLIBRARIES = libxfce4-sensors-plugin.la
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include											\
-	-I$(top_srcdir)/lib
-
-libxfce4_sensors_plugin_la_SOURCES = \
-	sensors-plugin.c												\
-	sensors-plugin.h
-
-libxfce4_sensors_plugin_la_CFLAGS = \
-	@LIBXFCE4PANEL_CFLAGS@										 	\
-	@LIBXFCE4UI_CFLAGS@												\
-	@PLATFORM_CFLAGS@												\
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"							\
-	-DDATADIR=\"$(datadir)\"                                        \
-	@LIBSENSORS_CFLAGS@
-
-libxfce4_sensors_plugin_la_LIBADD = \
-	$(top_builddir)/lib/libxfce4sensors.la							\
-	@LIBXFCE4PANEL_LIBS@											\
-	@LIBXFCE4UI_LIBS@												\
-	@SOLLIBS@														\
-	@LIBSENSORS_LDFLAGS@											\
-	@LIBM@
-
-libxfce4_sensors_plugin_la_LDFLAGS = \
-	-avoid-version 													\
-	-module 														\
-	-no-undefined 													\
-	-export-dynamic													\
-	-export-symbols-regex "^[^_].*"									\
-	$(PLATFORM_LDFLAGS)
-
-
-#	-export-symbols-regex '^xfce_panel_module_(preinit|init|construct)'
-
-# .desktop file
-#
-desktop_in_files = xfce4-sensors-plugin.desktop.in
-desktopdir = $(datadir)/xfce4/panel/plugins
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-cssfiledir = $(desktopdir)
-cssfile_DATA = xfce4-sensors-plugin.css
-EXTRA_DIST = \
-	$(desktop_in_files)												\
-	$(cssfile_DATA)
-
-DISTCLEANFILES = \
-	$(desktop_DATA)
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu panel-plugin/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu panel-plugin/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
-libxfce4-sensors-plugin.la: $(libxfce4_sensors_plugin_la_OBJECTS) $(libxfce4_sensors_plugin_la_DEPENDENCIES) $(EXTRA_libxfce4_sensors_plugin_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libxfce4_sensors_plugin_la_LINK) -rpath $(plugindir) $(libxfce4_sensors_plugin_la_OBJECTS) $(libxfce4_sensors_plugin_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libxfce4_sensors_plugin_la-sensors-plugin.Plo at am__quote@
-
-.c.o:
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-libxfce4_sensors_plugin_la-sensors-plugin.lo: sensors-plugin.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4_sensors_plugin_la_CFLAGS) $(CFLAGS) -MT libxfce4_sensors_plugin_la-sensors-plugin.lo -MD -MP -MF $(DEPDIR)/libxfce4_sensors_plugin_la-sensors-plugin.Tpo -c -o libxfce4_sensors_plugin_la-sensors-plugin.lo `test -f 'sensors-plugin.c' || echo '$(srcdir)/'`sensors-plugin.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4_sensors_plugin_la-sensors-plugin.Tpo $(DEPDIR)/libxfce4_sensors_plugin_la-sensors-plugin.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='sensors-plugin.c' object='libxfce4_sensors_plugin_la-sensors-plugin.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4_sensors_plugin_la_CFLAGS) $(CFLAGS) -c -o libxfce4_sensors_plugin_la-sensors-plugin.lo `test -f 'sensors-plugin.c' || echo '$(srcdir)/'`sensors-plugin.c
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-cssfileDATA: $(cssfile_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(cssfile_DATA)'; test -n "$(cssfiledir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(cssfiledir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(cssfiledir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(cssfiledir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(cssfiledir)" || exit $$?; \
-	done
-
-uninstall-cssfileDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(cssfile_DATA)'; test -n "$(cssfiledir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(cssfiledir)'; $(am__uninstall_files_from_dir)
-install-desktopDATA: $(desktop_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
-	done
-
-uninstall-desktopDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(cssfiledir)" "$(DESTDIR)$(desktopdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-cssfileDATA install-desktopDATA \
-	install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-cssfileDATA uninstall-desktopDATA \
-	uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-cssfileDATA \
-	install-data install-data-am install-desktopDATA install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-cssfileDATA \
-	uninstall-desktopDATA uninstall-pluginLTLIBRARIES
-
-.PRECIOUS: Makefile
-
- at INTLTOOL_DESKTOP_RULE@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/panel-plugin/sensors-plugin.c.orig b/panel-plugin/sensors-plugin.c.orig
deleted file mode 100644
index 59d4af5..0000000
--- a/panel-plugin/sensors-plugin.c.orig
+++ /dev/null
@@ -1,2361 +0,0 @@
-/* $Id$ */
-/*  Copyright 2004-2010 Fabian Nowak (timystery at arcor.de)
- *
- *  This program 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
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/* This plugin requires libsensors-3 and its headers in order to monitor
- * ordinary mainboard sensors!
- *
- * It also works with solely ACPI or hddtemp, but then with more limited
- * functionality.
- */
-
-/* Note for programmers and editors: Try to use 4 spaces instead of Tab! */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-/* Global includes */
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* Gtk/Glib includes */
-#include <glib.h>
-#include <glib/gprintf.h> /* ain't included in glib.h! */
-
-/* Xfce includes */
-#include <libxfce4util/libxfce4util.h>
-//#include <libxfcegui4/libxfcegui4.h>
-#include <libxfce4ui/libxfce4ui.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
-
-/* Package includes */
-#include <configuration.h>
-#include <sensors-interface.h>
-#include <sensors-interface-plugin.h> // includes sensors-interface-common.h
-#include <middlelayer.h>
-#include <cpu.h>
-
-/* Local includes */
-#include "sensors-plugin.h"
-
-
-/*
- * Tooltips to display for any part of this plugin
- */
-extern GtkTooltips *tooltips;
-
-
-static void
-sensors_set_bar_size (GtkWidget *bar, int size, int orientation)
-{
-    //TRACE ("enters sensors_set_bar_size");
-
-    /* check arguments */
-    g_return_if_fail (G_IS_OBJECT(bar));
-
-    if (orientation == GTK_ORIENTATION_HORIZONTAL) {
-        gtk_widget_set_size_request (bar, BORDER, size-BORDER);
-    } else {
-        gtk_widget_set_size_request (bar, size-BORDER, BORDER);
-    }
-
-    //TRACE ("leaves sensors_set_bar_size");
-}
-
-
-static void
-sensors_set_bar_color (GtkWidget *bar, double fraction, gchar* user_bar_color,
-                       t_sensors *sensors)
-{
-    GdkColor color;
-
-    //TRACE ("enters sensors_set_bar_color");
-
-    g_return_if_fail (G_IS_OBJECT(bar));
-
-    if (fraction >= 1 || fraction<=0)
-        gdk_color_parse(COLOR_ERROR, &color);
-
-    else if ((fraction < .2) || (fraction > .8))
-        gdk_color_parse(COLOR_WARN, &color);
-
-    else {
-        if (sensors->show_colored_bars)
-            gdk_color_parse(user_bar_color, &color);
-        else
-            gdk_color_parse(COLOR_NORMAL, &color);
-    }
-
-    gtk_widget_modify_bg (bar, GTK_STATE_PRELIGHT, &color);
-    gtk_widget_modify_bg (bar, GTK_STATE_SELECTED, &color);
-    gtk_widget_modify_base (bar, GTK_STATE_SELECTED, &color);
-
-    //TRACE ("leaves sensors_set_bar_color");
-}
-
-static double
-sensors_get_percentage (t_chipfeature *chipfeature)
-{
-    double value, min, max, percentage;
-
-    //TRACE ("enters sensors_get_percentage");
-
-    value = chipfeature->raw_value;
-    min = chipfeature->min_value;
-    max = chipfeature->max_value;
-    percentage = (value - min) / (max - min);
-
-    if (percentage > 1.0)
-        percentage = 1.0;
-
-    else if (percentage <= 0.0)
-        percentage = 0.0;
-
-    //TRACE ("leaves sensors_get_percentage with %f", percentage);
-    return percentage;
-}
-
-
-static void
-sensors_remove_graphical_panel (t_sensors *sensors)
-{
-    int chipNum, feature;
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-    t_barpanel *panel;
-
-    TRACE ("enters sensors_remove_graphical_panel");
-
-    for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) {
-        chip = (t_chip *) g_ptr_array_index(sensors->chips, chipNum);
-        g_assert (chip != NULL);
-
-        for (feature=0; feature<chip->num_features; feature++) {
-            chipfeature = g_ptr_array_index(chip->chip_features, feature);
-            g_assert (chipfeature != NULL);
-
-            if (chipfeature->show == TRUE) {
-                panel = (t_barpanel*) sensors->panels[chipNum][feature];
-
-        if (sensors->show_labels == TRUE) /* FN: FIXME; this value is already updated! */
-                    gtk_widget_destroy (panel->label);
-
-                gtk_widget_destroy (panel->progressbar);
-                gtk_widget_destroy (panel->databox);
-
-                g_free (panel);
-            }
-        }
-    }
-    sensors->bars_created = FALSE;
-    gtk_widget_hide (sensors->panel_label_text);
-
-    TRACE ("leaves sensors_remove_graphical_panel");
-}
-
-static void
-sensors_remove_tacho_panel (t_sensors *sensors)
-{
-    int chipNum, feature;
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-
-    TRACE ("enters sensors_remove_tacho_panel");
-
-    for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) 
-    {
-        chip = (t_chip *) g_ptr_array_index(sensors->chips, chipNum);
-        g_assert (chip != NULL);
-
-        for (feature=0; feature<chip->num_features; feature++) 
-        {
-            chipfeature = g_ptr_array_index(chip->chip_features, feature);
-            g_assert (chipfeature != NULL);
-
-            if (chipfeature->show == TRUE) 
-            {
-                gtk_widget_hide (sensors->tachos[chipNum][feature]);
-                gtk_widget_destroy (sensors->tachos[chipNum][feature]); /* automatically frees structure as I find it much more sensible for widget-destroy to behave that way */
-                sensors->tachos[chipNum][feature] = NULL;
-            }
-        }
-    }
-    sensors->tachos_created = FALSE;
-    gtk_widget_hide (sensors->panel_label_text);
-
-    TRACE ("leaves sensors_remove_tacho_panel");
-}
-
-static void
-sensors_update_graphical_panel (t_sensors *sensors)
-{
-    int chipNum, feature;
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-    double fraction;
-    t_barpanel *panel;
-    GtkWidget *bar;
-
-    //TRACE("enters sensors_update_graphical_panel");
-
-    for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) {
-        chip = (t_chip *) g_ptr_array_index(sensors->chips, chipNum);
-        g_assert (chip != NULL);
-
-        for (feature=0; feature<chip->num_features; feature++) {
-            chipfeature = g_ptr_array_index(chip->chip_features, feature);
-            g_assert (chipfeature != NULL);
-
-            if (chipfeature->show == TRUE) {
-                panel = (t_barpanel*) sensors->panels[chipNum][feature];
-
-                bar = panel->progressbar;
-                g_return_if_fail (G_IS_OBJECT(bar));
-
-                sensors_set_bar_size (bar, (int) sensors->panel_size,
-                                      sensors->orientation);
-                fraction = sensors_get_percentage (chipfeature);
-                sensors_set_bar_color (bar, fraction, chipfeature->color,
-                                       sensors);
-                gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(bar),
-                                               fraction);
-            }
-        }
-    }
-
-    //TRACE("leaves sensors_update_graphical_panel");
-}
-
-
-
-static void
-sensors_update_tacho_panel (t_sensors *sensors)
-{
-    int chipNum, feature;
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-    GtkWidget *tacho;
-    double fraction;
-
-    TRACE("enters sensors_update_tacho_panel");
-
-    for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) {
-        chip = (t_chip *) g_ptr_array_index(sensors->chips, chipNum);
-        g_assert (chip != NULL);
-
-        for (feature=0; feature<chip->num_features; feature++) {
-            chipfeature = g_ptr_array_index(chip->chip_features, feature);
-            g_assert (chipfeature != NULL);
-
-            if (chipfeature->show == TRUE) {
-                tacho = sensors->tachos[chipNum][feature];
-
-                fraction = sensors_get_percentage (chipfeature);
-                gtk_cpu_set_value(GTK_CPU(tacho), fraction);
-                gtk_cpu_set_color(GTK_CPU(tacho), chipfeature->color);
-            }
-        }
-    }
-
-    TRACE("leaves sensors_update_tacho_panel");
-}
-
-
-static void
-sensors_add_graphical_display (t_sensors *sensors)
-{
-    int chipNum, feature;
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-    t_barpanel *panel;
-    gboolean has_bars = FALSE;
-    GtkWidget *progbar, *databox, *label;
-    gchar *caption, *text;
-
-    TRACE ("enters sensors_add_graphical_display");
-
-    text = g_strdup (_("<span foreground=\"#000000\">"
-                                     "<b>Sensors</b></span>"));
-    gtk_label_set_markup (GTK_LABEL(sensors->panel_label_text), text);
-    g_free (text);
-
-    gtk_container_set_border_width (GTK_CONTAINER(sensors->widget_sensors), 0);
-    for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) {
-        chip = (t_chip *) g_ptr_array_index(sensors->chips, chipNum);
-        g_assert (chip != NULL);
-
-        for (feature=0; feature<chip->num_features; feature++) {
-            chipfeature = g_ptr_array_index (chip->chip_features, feature);
-            g_assert (chipfeature != NULL);
-
-            if (chipfeature->show == TRUE) {
-                has_bars = TRUE;
-
-                progbar = gtk_progress_bar_new();
-
-                if (sensors->orientation == GTK_ORIENTATION_HORIZONTAL)
-                    gtk_progress_bar_set_orientation (
-                                                GTK_PROGRESS_BAR (progbar),
-                                                GTK_PROGRESS_BOTTOM_TO_TOP);
-                else
-                    gtk_progress_bar_set_orientation (
-                                                GTK_PROGRESS_BAR (progbar),
-                                                GTK_PROGRESS_LEFT_TO_RIGHT);
-
-                sensors_set_bar_size (progbar, (int) sensors->panel_size,
-                                      sensors->orientation);
-                gtk_widget_show (progbar);
-
-                if (sensors->orientation == GTK_ORIENTATION_HORIZONTAL)
-                    databox = gtk_hbox_new (FALSE, 0);
-
-                else
-                    databox = gtk_vbox_new (FALSE, 0);
-
-                gtk_widget_show (databox);
-
-                /* save the panel elements */
-                panel = g_new (t_barpanel, 1);
-                panel->progressbar = progbar;
-
-                /* create the label stuff only if needed - saves some memory! */
-                if (sensors->show_labels == TRUE) {
-                    caption = g_strdup (chipfeature->name);
-                    label = gtk_label_new (caption);
-                    g_free(caption);
-                    gtk_label_set_max_width_chars (GTK_LABEL(label), 12);
-                    gtk_label_set_ellipsize (GTK_LABEL(label),
-                                             PANGO_ELLIPSIZE_END);
-                    gtk_widget_show (label);
-                    panel->label = label;
-
-                    gtk_box_pack_start (GTK_BOX(databox), label, FALSE, FALSE, INNER_BORDER);
-                }
-                else
-                    panel->label = NULL;
-
-                gtk_box_pack_start (GTK_BOX(databox), progbar, FALSE, FALSE, 0);
-
-                panel->databox = databox;
-                sensors->panels[chipNum][feature] = (GtkWidget*) panel;
-
-                gtk_box_pack_start (GTK_BOX (sensors->widget_sensors),
-                                    databox, FALSE, FALSE, INNER_BORDER);
-            }
-        }
-    }
-    if (has_bars && !sensors->show_title)
-        gtk_widget_hide (sensors->panel_label_text);
-    else
-        gtk_widget_show (sensors->panel_label_text);
-
-    gtk_widget_hide (sensors->panel_label_data);
-
-    sensors->bars_created = TRUE;
-    sensors_update_graphical_panel (sensors);
-
-    TRACE ("leaves sensors_add_graphical_display");
-}
-
-
-static void
-sensors_add_tacho_display (t_sensors *sensors)
-{
-    int chipNum, feature;
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-    //t_barpanel *panel;
-    gboolean has_tachos = FALSE;
-    GtkWidget *tacho;
-    gchar *text;
-
-    TRACE ("enters sensors_add_tacho_display");
-
-    text = g_strdup (_("<span foreground=\"#000000\">"
-                                     "<b>Sensors</b></span>"));
-    gtk_label_set_markup (GTK_LABEL(sensors->panel_label_text), text);
-    g_free (text);
-
-    
-    gtk_container_set_border_width (GTK_CONTAINER(sensors->widget_sensors), 0);
-    for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) {
-        chip = (t_chip *) g_ptr_array_index(sensors->chips, chipNum);
-        g_assert (chip != NULL);
-
-        for (feature=0; feature<chip->num_features; feature++) {
-            chipfeature = g_ptr_array_index (chip->chip_features, feature);
-            g_assert (chipfeature != NULL);
-
-            if (chipfeature->show == TRUE) {
-                has_tachos = TRUE;
-
-                tacho = gtk_cpu_new();
-                DBG("1");
-
-                gtk_widget_show (tacho);
-
-                /* create the label stuff only if needed - saves some memory! */
-                if (sensors->show_labels == TRUE) {
-                    //gtk_cpu_set_text(GTK_CPU(tacho), chipfeature->name);
-                    if (GTK_CPU(tacho)->text != NULL)
-                        g_free (GTK_CPU(tacho)->text);
-                    DBG("2");
-                    
-                    GTK_CPU(tacho)->text = g_strdup(chipfeature->name);
-                    DBG("3");
-                    //gtk_cpu_set_color(GTK_CPU(tacho), chipfeature->color);
-                    
-                    if (GTK_CPU(tacho)->color != NULL)
-                        g_free (GTK_CPU(tacho)->color);
-                    DBG("4");
-                    GTK_CPU(tacho)->color = g_strdup(chipfeature->color);
-                    DBG("5");
-                }
-                else {
-                    //gtk_cpu_unset_text(GTK_CPU(tacho));
-                    if (GTK_CPU(tacho)->text != NULL)
-                        g_free (GTK_CPU(tacho)->text);
-                    DBG("6");
-                    GTK_CPU(tacho)->text = NULL;
-                    DBG("7");
-                }
-
-                sensors->tachos[chipNum][feature] = (GtkWidget*) tacho;
-                DBG("8");
-
-                gtk_box_pack_start (GTK_BOX (sensors->widget_sensors),
-                                    tacho, TRUE, TRUE, INNER_BORDER);
-                DBG("10");
-            }
-        }
-    }
-    if (has_tachos && !sensors->show_title)
-        gtk_widget_hide (sensors->panel_label_text);
-    else
-        gtk_widget_show (sensors->panel_label_text);
-
-    DBG("11");
-    gtk_widget_hide (sensors->panel_label_data);
-
-    DBG("12");
-    sensors->tachos_created = TRUE;
-    sensors_update_tacho_panel (sensors);
-
-    TRACE ("leaves sensors_add_tacho_display");
-}
-
-
-static gboolean
-sensors_show_graphical_display (t_sensors *sensors)
-{
-    TRACE ("enters sensors_show_graphical_display");
-
-    if (sensors->bars_created == TRUE)
-        sensors_update_graphical_panel (sensors);
-    else
-        sensors_add_graphical_display (sensors);
-
-    TRACE ("leaves sensors_show_graphical_display");
-
-    return TRUE;
-}
-
-
-static gboolean
-sensors_show_tacho_display (t_sensors *sensors)
-{
-    TRACE ("enters sensors_show_tacho_display");
-
-    if (sensors->tachos_created == TRUE)
-        sensors_update_tacho_panel (sensors);
-    else
-        sensors_add_tacho_display (sensors);
-
-    TRACE ("leaves sensors_show_tacho_display");
-
-    return TRUE;
-}
-
-
-static int
-determine_number_of_rows (t_sensors *sensors)
-{
-    gint numRows, gtk_font_size, additional_offset, avail_height;
-    gdouble divisor;
-    GtkStyle *style;
-    PangoFontDescription *descr;
-    PangoFontMask mask;
-    gboolean is_absolute;
-
-    TRACE ("enters determine_number_of_rows");
-
-    style = gtk_widget_get_style (sensors->panel_label_data);
-
-    descr = style->font_desc; /* Note that stupid GTK guys forgot the 'r' */
-
-    is_absolute = FALSE;
-    mask = pango_font_description_get_set_fields (descr);
-    if (mask>=PANGO_FONT_MASK_SIZE) {
-        is_absolute = pango_font_description_get_size_is_absolute (descr);
-        if (!is_absolute) {
-            gtk_font_size = pango_font_description_get_size (descr) / 1000;
-        }
-    }
-
-    if (mask<PANGO_FONT_MASK_SIZE || is_absolute) {
-        gtk_font_size = 10; /* not many people will want a bigger font size,
-                                and so only few rows are gonna be displayed. */
-    }
-
-    g_assert (gtk_font_size!=0);
-
-    if (sensors->orientation == GTK_ORIENTATION_HORIZONTAL) {
-        switch (gtk_font_size) {
-            case 8:
-                switch (sensors->font_size_numerical) {
-                    case 0: additional_offset=10; divisor = 12; break;
-                    case 1: additional_offset=11; divisor = 12; break;
-                    case 2: additional_offset=12; divisor = 12; break;
-                    case 3: additional_offset=13; divisor = 13; break;
-                    default: additional_offset=16; divisor = 17;
-                }
-                break;
-
-            case 9:
-                switch (sensors->font_size_numerical) {
-                    case 0: additional_offset=12; divisor = 13; break;
-                    case 1: additional_offset=13; divisor = 13; break;
-                    case 2: additional_offset=14; divisor = 14; break;
-                    case 3: additional_offset=14; divisor = 17; break;
-                    default: additional_offset=16; divisor = 20;
-                }
-                break;
-
-            default: /* case 10 */
-                 switch (sensors->font_size_numerical) {
-                    case 0: additional_offset=13; divisor = 14; break;
-                    case 1: additional_offset=14; divisor = 14; break;
-                    case 2: additional_offset=14; divisor = 14; break;
-                    case 3: additional_offset=16; divisor = 17; break;
-                    default: additional_offset=20; divisor = 20;
-                }
-        }
-        avail_height = sensors->panel_size - additional_offset;
-        if (avail_height < 0)
-            avail_height = 0;
-
-        numRows = (int) floor (avail_height / divisor);
-        if (numRows < 0)
-            numRows = 0;
-
-        numRows++;
-    }
-    else numRows = 1 << 30; /* that's enough, MAXINT would be nicer */
-
-    /* fail-safe */
-    if (numRows<=0)
-        numRows = 1;
-
-    TRACE ("leaves determine_number_of_rows with rows=%d", numRows);
-
-    return numRows;
-}
-
-
-static int
-determine_number_of_cols (gint numRows, gint itemsToDisplay)
-{
-    gint numCols;
-
-    TRACE ("enters determine_number_of_cols");
-
-    if (numRows > 1) {
-        if (itemsToDisplay > numRows)
-            numCols = (gint) ceil (itemsToDisplay/ (float)numRows);
-        else
-            numCols = (gint) 1;
-    }
-    else
-        numCols = itemsToDisplay;
-
-    TRACE ("leaves determine_number_of_cols width cols=%d", numCols);
-
-    return numCols;
-}
-
-
-static void
-sensors_set_text_panel_label (t_sensors *sensors, gint numCols, gint itemsToDisplay)
-{
-    gint currentColumn, chipNum, feature;
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-    gchar *myLabelText, *tmpstring;
-
-    TRACE ("enters sensors_set_text_panel_label");
-
-    if (itemsToDisplay==0) {
-        gtk_widget_hide (sensors->panel_label_data);
-        return;
-    }
-
-    currentColumn = 0;
-    myLabelText = g_strdup (""); /* don't use NULL because of g_strconcat */
-
-    for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) {
-        chip = (t_chip *) g_ptr_array_index (sensors->chips, chipNum);
-        g_assert (chip != NULL);
-
-        for (feature=0; feature<chip->num_features; feature++) {
-            chipfeature = g_ptr_array_index (chip->chip_features, feature);
-            g_assert (chipfeature != NULL);
-            
-            if (chipfeature->show == TRUE) {
-                if(sensors->show_labels==TRUE) {
-                  tmpstring = g_strconcat (myLabelText, "<span size=\"", sensors->font_size, "\">",chipfeature->name, ":</span> ", NULL);
-                  g_free(myLabelText);
-                  myLabelText = tmpstring;
-                }
-                
-                if (sensors->show_units) {
-                    tmpstring = g_strconcat (myLabelText,
-                                            "<span foreground=\"",
-                                            chipfeature->color, "\" size=\"",
-                                            sensors->font_size, "\">",
-                                            chipfeature->formatted_value,
-                                            "</span>", NULL);
-                }
-                else {
-                    tmpstring = g_strdup_printf("%s<span foreground=\"%s\" size=\"%s\">%.1f</span>", myLabelText,
-                            chipfeature->color, sensors->font_size,
-                            chipfeature->raw_value);
-                    //myLabelText = g_strconcat (myLabelText, tmpstring, NULL);
-                }
-
-                g_free (myLabelText);
-
-                myLabelText = tmpstring;
-
-                if (sensors->orientation == GTK_ORIENTATION_VERTICAL) {
-                    if (itemsToDisplay > 1) {
-                        tmpstring = g_strconcat (myLabelText, "\n", NULL);
-                        g_free(myLabelText);
-                        myLabelText = tmpstring;
-                    }
-                }
-                else if (currentColumn < numCols-1) {
-                    if (sensors->show_smallspacings) {
-                        tmpstring = g_strconcat (myLabelText, "  ", NULL);
-                        g_free(myLabelText);
-                        myLabelText = tmpstring;
-                    }
-                    else {
-                        tmpstring = g_strconcat (myLabelText, " \t", NULL);
-                        g_free(myLabelText);
-                        myLabelText = tmpstring;
-                    }
-                    currentColumn++;
-                }
-                else if (itemsToDisplay > 1) { /* do NOT add \n if last item */
-                    tmpstring = g_strconcat (myLabelText, " \n", NULL);
-                    g_free(myLabelText);
-                    myLabelText = tmpstring;
-                    currentColumn = 0;
-                }
-                itemsToDisplay--;
-            }
-        }
-    }
-
-    g_assert (itemsToDisplay==0);
-
-    gtk_label_set_markup (GTK_LABEL(sensors->panel_label_data), myLabelText);
-    /* if (sensors->show_units) */
-        g_free(myLabelText);
-    /* else: with sprintf, we cannot free the string. how bad. */
-
-    if (sensors->orientation== GTK_ORIENTATION_HORIZONTAL)
-        gtk_misc_set_alignment(GTK_MISC(sensors->panel_label_data), 0.0, 0.5);
-    else
-        gtk_misc_set_alignment(GTK_MISC(sensors->panel_label_data), 0.5, 0.5);
-
-    gtk_widget_show (sensors->panel_label_data);
-
-    TRACE ("leaves sensors_set_text_panel_label");
-}
-
-
-static int
-count_number_checked_sensor_features (t_sensors *sensors)
-{
-    gint chipNum, feature, itemsToDisplay;
-    t_chipfeature *chipfeature;
-    t_chip *chip;
-
-    TRACE ("enters count_number_checked_sensor_features");
-
-    itemsToDisplay = 0;
-
-
-    for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) {
-        chip = (t_chip *) g_ptr_array_index (sensors->chips, chipNum);
-        g_assert (chip!=NULL);
-
-        for (feature=0; feature<chip->num_features; /* none */ ) {
-            chipfeature = g_ptr_array_index (chip->chip_features, feature);
-            g_assert (chipfeature!=NULL);
-
-            if (chipfeature->show == TRUE)
-                itemsToDisplay++;
-
-            if (chipfeature->valid == TRUE)
-                feature++;
-        }
-    }
-
-    TRACE ("leaves count_number_checked_sensor_features with %d", itemsToDisplay);
-
-    return itemsToDisplay;
-}
-
-
-/* draw label with sensor values into panel's vbox */
-static gboolean
-sensors_show_text_display (t_sensors *sensors)
-{
-    gint itemsToDisplay, numRows, numCols;
-
-    TRACE ("enters sensors_show_text_display");
-
-    /* count number of checked sensors to display.
-       this could also be done by every toggle/untoggle action
-       by putting this variable into t_sensors */
-    itemsToDisplay = count_number_checked_sensor_features (sensors);
-
-    numRows = sensors->lines_size; /* determine_number_of_rows (sensors); */
-
-    if (sensors->show_title == TRUE || itemsToDisplay==0)
-        gtk_widget_show (sensors->panel_label_text);
-    else
-        gtk_widget_hide (sensors->panel_label_text);
-
-    numCols = determine_number_of_cols (numRows, itemsToDisplay);
-
-    sensors_set_text_panel_label (sensors, numCols, itemsToDisplay);
-
-    TRACE ("leaves sensors_show_text_display\n");
-
-    return TRUE;
-}
-
-
-/* create tooltip
-Updates the sensor values, see lines 440 and following */
-static gboolean
-sensors_create_tooltip (gpointer data)
-{
-    t_sensors *sensors;
-    //GtkWidget *widget;
-    int i, index_feature, res;
-    double sensorFeature;
-    gboolean first, prependedChipName;
-    gchar *myToolTipText, *myToolTipText2, *tmp;
-    t_chipfeature *chipfeature;
-    t_chip *chip;
-    
-    TRACE ("enters sensors_create_tooltip");
-
-    g_return_val_if_fail (data != NULL, FALSE);
-    TRACE ("data!=NULL");
-
-    sensors = (t_sensors *) data;
-    //widget = sensors->eventbox;
-    myToolTipText = g_strdup (_("No sensors selected!"));
-    first = TRUE;
-
-    for (i=0; i < sensors->num_sensorchips; i++) {
-        chip = (t_chip *) g_ptr_array_index (sensors->chips, i);
-        g_assert (chip!=NULL);
-
-        prependedChipName = FALSE;
-
-        for (index_feature = 0; index_feature<chip->num_features; index_feature++) {
-            chipfeature = g_ptr_array_index (chip->chip_features, index_feature);
-            g_assert (chipfeature!=NULL);
-
-            if ( chipfeature->valid == TRUE && chipfeature->show == TRUE ) {
-
-                if (prependedChipName != TRUE) {
-
-                    if (first == TRUE) {
-                        g_free (myToolTipText);
-                        myToolTipText = g_strdup (chip->sensorId);
-                        first = FALSE;
-                    }
-                    else {
-                        myToolTipText2 = g_strconcat (myToolTipText, " \n",
-                                                     chip->sensorId, NULL);
-                        TRACE ("freeing myToolTipText");
-                        g_free (myToolTipText);
-                        myToolTipText = myToolTipText2;
-                    }
-
-                    prependedChipName = TRUE;
-                }
-
-                res = sensor_get_value (chip, chipfeature->address,
-                                                    &sensorFeature,
-                                                    &(sensors->suppressmessage));
-
-                if ( res!=0 ) {
-                    /* FIXME: either print nothing, or undertake appropriate action,
-                     * or pop up a message box. */
-                    g_printf ( _("Sensors Plugin:\n"
-                    "Seems like there was a problem reading a sensor feature "
-                    "value.\nProper proceeding cannot be guaranteed.\n") );
-                    break;
-                }
-                tmp = g_new (gchar, 0);
-                format_sensor_value (sensors->scale, chipfeature,
-                                     sensorFeature, &tmp);
-
-                myToolTipText2 = g_strconcat (myToolTipText, "\n  ",
-                                             chipfeature->name, ": ", tmp,
-                                             NULL);
-                TRACE ("freeing myToolTipText");
-                g_free (myToolTipText);
-                myToolTipText = myToolTipText2;
-
-                TRACE ("freeing chipfeature->formatted_value");
-                g_free (chipfeature->formatted_value);
-                chipfeature->formatted_value = g_strdup (tmp);
-                chipfeature->raw_value = sensorFeature;
-
-                TRACE ("freeing tmp");
-                g_free (tmp);
-            } /* end if chipfeature->valid */
-        }
-    }
-
-    if (!tooltips)
-      tooltips = gtk_tooltips_new();
-
-    /* #if GTK_VERSION < 2.11 */
-    gtk_tooltips_set_tip (tooltips, GTK_WIDGET(sensors->eventbox),
-                          myToolTipText, NULL);
-    DBG("tooltip text: %s.\n", myToolTipText);
-    TRACE ("freeing myToolTipText");
-    g_free (myToolTipText);
-
-    TRACE ("leaves sensors_create_tooltip");
-
-    return TRUE;
-}
-
-
-static gboolean
-sensors_show_panel (gpointer data)
-{
-    t_sensors *sensors;
-    gboolean result;
-
-    TRACE ("enters sensors_show_panel");
-
-    g_return_val_if_fail (data != NULL, FALSE);
-
-    sensors = (t_sensors *) data;
-
-    sensors_create_tooltip ((gpointer) sensors);
-
-    switch (sensors->display_values_type)
-    {
-      case DISPLAY_TACHO: 
-        result = sensors_show_tacho_display (sensors);
-        break;
-      case DISPLAY_BARS:
-        result = sensors_show_graphical_display (sensors);
-        break;
-      default:
-        result = sensors_show_text_display (sensors);
-    }
-    TRACE ("leaves sensors_show_panel\n");
-    return result;
-}
-
-
-static void
-sensors_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation,
-                         t_sensors *sensors)
-{
-    GtkWidget *newBox;
-    int i, feature;
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-    t_barpanel *panel;
-
-    TRACE ("enters sensors_set_orientation: %d", orientation);
-
-    if (orientation == sensors->orientation) // || !sensors->display_values_graphically)
-        return;
-
-    sensors->orientation = orientation; /* now assign the new orientation */
-
-    newBox = orientation==GTK_ORIENTATION_HORIZONTAL ? gtk_hbox_new(FALSE, 0) : gtk_vbox_new(FALSE, 0);
-    gtk_widget_show (newBox);
-
-    gtk_widget_reparent (sensors->panel_label_text, newBox);
-    gtk_widget_reparent (sensors->panel_label_data, newBox);
-
-    if (sensors->display_values_type != DISPLAY_TEXT)
-    {
-        for (i=0; i < sensors->num_sensorchips; i++) {
-            chip = (t_chip *) g_ptr_array_index (sensors->chips, i);
-            g_assert (chip!=NULL);
-
-            for (feature = 0; feature<chip->num_features; feature++)
-            {
-                chipfeature = g_ptr_array_index (chip->chip_features, feature);
-                g_assert (chipfeature!=NULL);
-
-                if (chipfeature->show == TRUE) {
-                    panel = (t_barpanel*) sensors->panels[i][feature];
-                    gtk_widget_reparent (panel->databox, newBox);
-                }
-            }
-        }
-    }
-    else
-    {
-        /* we don't need a separate function for just one call. */
-    }
-
-    gtk_widget_destroy (sensors->widget_sensors);
-    sensors->widget_sensors = newBox;
-
-    gtk_container_add (GTK_CONTAINER (sensors->eventbox),
-                   sensors->widget_sensors);
-
-    if (sensors->display_values_type == DISPLAY_BARS)
-        sensors_remove_graphical_panel (sensors);
-    else if (sensors->display_values_type == DISPLAY_TACHO)
-        sensors_remove_tacho_panel (sensors);
-
-    sensors_show_panel (sensors);
-
-    TRACE ("leaves sensors_set_orientation");
-}
-
-
-
-
-/* initialize box and label to pack them together */
-static void
-create_panel_widget (t_sensors * sensors)
-{
-    gchar *myLabelText;
-    TRACE ("enters create_panel_widget");
-
-    /* initialize a new vbox widget */
-    if (sensors->orientation == GTK_ORIENTATION_HORIZONTAL)
-        sensors->widget_sensors = gtk_hbox_new (FALSE, 0);
-    else
-        sensors->widget_sensors = gtk_vbox_new (FALSE, 0);
-
-    gtk_widget_show (sensors->widget_sensors);
-
-    /* initialize value label widget */
-    sensors->panel_label_text = gtk_label_new (NULL);
-    gtk_misc_set_padding (GTK_MISC(sensors->panel_label_text), INNER_BORDER, 0);
-    gtk_misc_set_alignment(GTK_MISC(sensors->panel_label_text), 0.0, 0.5);
-
-    myLabelText = g_strdup (_("<span foreground=\"#000000\"><b>Sensors"
-                                    "</b></span>"));
-    gtk_label_set_markup(GTK_LABEL(sensors->panel_label_text), myLabelText);
-    gtk_widget_show (sensors->panel_label_text);
-    g_free(myLabelText);
-
-    sensors->panel_label_data = gtk_label_new (NULL);
-    gtk_widget_show (sensors->panel_label_data);
-
-    /* create 'valued' label */
-    sensors_show_panel (sensors);
-
-    /* add newly created label to box */
-    gtk_box_pack_start (GTK_BOX (sensors->widget_sensors),
-                        sensors->panel_label_text, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (sensors->widget_sensors),
-                        sensors->panel_label_data, TRUE, TRUE, 0);
-
-
-    TRACE ("leaves create_panel_widget");
-}
-
-
-/* double-click improvement */
-static gboolean
-execute_command (GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-    t_sensors *sensors;
-
-    TRACE ("enters execute_command");
-
-    g_return_val_if_fail (data != NULL, FALSE);
-
-    if (event->type == GDK_2BUTTON_PRESS) {
-
-        sensors = (t_sensors *) data;
-
-        g_return_val_if_fail ( sensors->exec_command, FALSE);
-
-        // screen NULL, command, terminal=no, startup=yes, error=NULL
-        xfce_spawn_command_line_on_screen (NULL, sensors->command_name, FALSE, TRUE, NULL);
-
-        TRACE ("leaves execute_command with TRUE");
-
-        return TRUE;
-    }
-    else {
-        TRACE ("leaves execute_command with FALSE");
-        return FALSE;
-    }
-}
-
-
-
-/* #if GTK_VERSION >= 2.11
- * static gboolean
-handle_tooltip_query (GtkWidget  *widget,
-                                         gint        x, gint        y,
-                                         GtkTooltip *tooltip,
-                                         gpointer    data)
-{
-    t_sensors *sensors;
-    gchar *buffer;
-
-    g_assert (data!=NULL);
-
-    sensors = (t_sensors *) data;
-
-    buffer = g_strdup("Tooltip placeholder");
-
-    gtk_tooltip_set_markup (tooltip, buffer);
-
-    return TRUE;
-} */
-
-
-
-
-static void
-sensors_free (XfcePanelPlugin *plugin, t_sensors *sensors)
-{
-    TRACE ("enters sensors_free");
-
-    g_return_if_fail (sensors != NULL);
-
-    /* stop association to libsensors and others*/
-    sensor_interface_cleanup();
-
-    /* remove timeout functions */
-    if (sensors->timeout_id)
-        g_source_remove (sensors->timeout_id);
-
-    /* double-click improvement */
-    g_source_remove (sensors->doubleclick_id);
-
-    /* free structures and arrays */
-    g_ptr_array_foreach (sensors->chips, free_chip, NULL);
-    g_ptr_array_free (sensors->chips, TRUE);
-
-    g_free (sensors->plugin_config_file);
-    g_free (sensors->command_name);
-/*
-    g_free (sensors->font);
-*/
-    g_free (sensors->font_size);
-    g_free (sensors);
-
-    TRACE ("leaves sensors_free");
-}
-
-
-static void
-sensors_set_size (XfcePanelPlugin *plugin, int size, t_sensors *sensors)
-{
-    TRACE ("enters sensors_set_size");
-
-    sensors->panel_size = (gint) size;
-
-    /* update the panel widget */
-    sensors_show_panel ((gpointer) sensors);
-
-    TRACE ("leaves sensors_set_size");
-}
-
-
-static void
-show_title_toggled (GtkWidget *widget, t_sensors_dialog *sd)
-{
-    TRACE ("enters show_title_toggled");
-
-    if (sd->sensors->display_values_type == DISPLAY_BARS) {
-        sensors_remove_graphical_panel (sd->sensors);
-    }
-    else if (sd->sensors->display_values_type == DISPLAY_TACHO) {
-        sensors_remove_tacho_panel (sd->sensors);
-    }
-    sd->sensors->show_title = gtk_toggle_button_get_active
-        ( GTK_TOGGLE_BUTTON(widget) );
-
-    sensors_show_panel ((gpointer) sd->sensors);
-
-    TRACE ("leaves show_title_toggled");
-}
-
-
-static void
-show_labels_toggled (GtkWidget *widget, t_sensors_dialog *sd)
-{
-    TRACE ("enters show_labels_toggled");
-
-     if (sd->sensors->display_values_type == DISPLAY_BARS) {
-        sensors_remove_graphical_panel (sd->sensors);
-    }
-    else if (sd->sensors->display_values_type == DISPLAY_TACHO) {
-        sensors_remove_tacho_panel (sd->sensors);
-    }
-
-    sd->sensors->show_labels = gtk_toggle_button_get_active
-        ( GTK_TOGGLE_BUTTON(widget) );
-
-    sensors_show_panel ((gpointer) sd->sensors);
-
-    TRACE ("leaves show_labels_toggled");
-}
-
-static void
-show_colored_bars_toggled (GtkWidget *widget, t_sensors_dialog *sd)
-{
-    TRACE ("enters show_colored_bars_toggled");
-
-    if (sd->sensors->display_values_type == DISPLAY_BARS) {
-        sensors_remove_graphical_panel (sd->sensors);
-    }
-    //else if (sd->sensors->display_values_type == DISPLAY_TACHO) {
-        //sensors_remove_tacho_panel (sd->sensors);
-    //}
-
-    sd->sensors->show_colored_bars = gtk_toggle_button_get_active
-        ( GTK_TOGGLE_BUTTON(widget) );
-
-    sensors_show_panel ((gpointer) sd->sensors);
-
-    TRACE ("leaves show_colored_bars_toggled");
-}
-
-static void
-display_style_changed_text (GtkWidget *widget, t_sensors_dialog *sd)
-{
-    TRACE ("enters display_style_changed_text");
-    
-    if (!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget) ))
-      return;
-
-    if (sd->sensors->display_values_type == DISPLAY_BARS)
-      sensors_remove_graphical_panel(sd->sensors);
-    else if (sd->sensors->display_values_type == DISPLAY_TACHO)
-      sensors_remove_tacho_panel (sd->sensors);
-      
-    //gtk_widget_hide(sd->labels_Box);
-    gtk_widget_hide(sd->coloredBars_Box);
-    gtk_widget_hide(sd->fontSettings_Box);
-    gtk_widget_show(sd->font_Box);
-    gtk_widget_show(sd->Lines_Box);
-    gtk_widget_show (sd->unit_checkbox);
-    gtk_widget_show (sd->smallspacing_checkbox);
-
-    sd->sensors->display_values_type = DISPLAY_TEXT;
-    //gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widget) );
-
-    sensors_show_panel ((gpointer) sd->sensors);
-
-    TRACE ("leaves display_style_changed_text");
-}
-
-static void
-display_style_changed_bars (GtkWidget *widget, t_sensors_dialog *sd)
-{
-    TRACE ("enters display_style_changed_bars");
-    
-    if (!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget) ))
-      return;
-      
-    if (sd->sensors->display_values_type == DISPLAY_TACHO)
-      sensors_remove_tacho_panel (sd->sensors);
-
-    //gtk_widget_show(sd->labels_Box);
-    gtk_widget_show(sd->coloredBars_Box);
-    gtk_widget_hide(sd->fontSettings_Box);
-    gtk_widget_hide(sd->font_Box);
-    gtk_widget_hide(sd->Lines_Box);
-    gtk_widget_hide (sd->unit_checkbox);
-    gtk_widget_hide (sd->smallspacing_checkbox);
-    
-    sd->sensors->display_values_type = DISPLAY_BARS;
-    //gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widget) );
-
-    sensors_show_panel ((gpointer) sd->sensors);
-
-    TRACE ("leaves display_style_changed_bars");
-}
-
-static void
-display_style_changed_tacho (GtkWidget *widget, t_sensors_dialog *sd)
-{
-    TRACE ("enters display_style_changed_tacho");
-    
-    if (!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget) ))
-      return;
-      
-    if (sd->sensors->display_values_type == DISPLAY_BARS)
-      sensors_remove_graphical_panel(sd->sensors);
-
-    //gtk_widget_show(sd->labels_Box);
-    gtk_widget_hide(sd->coloredBars_Box);
-    gtk_widget_show(sd->fontSettings_Box);
-    gtk_widget_hide(sd->font_Box);
-    gtk_widget_hide(sd->Lines_Box);
-    gtk_widget_hide (sd->unit_checkbox);
-    gtk_widget_hide (sd->smallspacing_checkbox);
-
-    sd->sensors->display_values_type = DISPLAY_TACHO;
-    //gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widget) );
-
-    sensors_show_panel ((gpointer) sd->sensors);
-
-    TRACE ("leaves display_style_changed_tacho");
-}
-
-void
-sensor_entry_changed (GtkWidget *widget, t_sensors_dialog *sd)
-{
-    gint gtk_combo_box_active;
-    t_chip *chip;
-
-    TRACE ("enters sensor_entry_changed");
-
-    gtk_combo_box_active = gtk_combo_box_get_active(GTK_COMBO_BOX (widget));
-
-    chip = (t_chip *) g_ptr_array_index (sd->sensors->chips,
-                                         gtk_combo_box_active);
-    gtk_label_set_label (GTK_LABEL(sd->mySensorLabel), chip->description);
-
-    gtk_tree_view_set_model (GTK_TREE_VIEW (sd->myTreeView),
-                    GTK_TREE_MODEL ( sd->myListStore[gtk_combo_box_active] ) );
-
-    TRACE ("leaves sensor_entry_changed");
-}
-
-
-static void
-font_size_change (GtkWidget *widget, t_sensors_dialog *sd)
-{
-    int rows;
-    TRACE ("enters font_size_change");
-    
-    g_free(sd->sensors->font_size);
-    switch ( gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) ) {
-
-        case 0: sd->sensors->font_size = g_strdup("x-small"); break;
-        case 1: sd->sensors->font_size = g_strdup("small"); break;
-        case 3: sd->sensors->font_size = g_strdup("large"); break;
-        case 4: sd->sensors->font_size = g_strdup("x-large"); break;
-        default: sd->sensors->font_size = g_strdup("medium");
-    }
-
-    sd->sensors->font_size_numerical =
-        gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
-
-    rows = determine_number_of_rows (sd->sensors);
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(sd->Lines_Spin_Box), (gdouble) rows);
-
-    /* refresh the panel content */
-    sensors_show_panel ((gpointer) sd->sensors);
-
-    TRACE ("leaves font_size_change");
-}
-
-
-static void
-lines_size_change (GtkWidget *widget, t_sensors_dialog *sd)
-{
-    TRACE ("enters font_size_change");
-
-    sd->sensors->lines_size = (int) gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget));
-
-    /* refresh the panel content */
-    sensors_show_panel ((gpointer) sd->sensors);
-
-    TRACE ("leaves font_size_change");
-}
-
-
-void
-temperature_unit_change (GtkWidget *widget, t_sensors_dialog *sd)
-{
-    TRACE ("enters temperature_unit_change ");
-
-    /* toggle celsius-fahrenheit by use of mathematics ;) */
-    sd->sensors->scale = 1 - sd->sensors->scale;
-
-    /* refresh the panel content */
-    sensors_show_panel ((gpointer) sd->sensors);
-
-    reload_listbox (sd);
-
-    TRACE ("laeves temperature_unit_change ");
-}
-
-
-void
-adjustment_value_changed (GtkWidget *widget, t_sensors_dialog* sd)
-{
-    TRACE ("enters adjustment_value_changed ");
-
-    sd->sensors->sensors_refresh_time =
-        (gint) gtk_adjustment_get_value ( GTK_ADJUSTMENT (widget) );
-
-    /* stop the timeout functions ... */
-    g_source_remove (sd->sensors->timeout_id);
-    /* ... and start them again */
-    sd->sensors->timeout_id  = g_timeout_add (
-        sd->sensors->sensors_refresh_time * 1000,
-        (GtkFunction) sensors_show_panel, (gpointer) sd->sensors);
-
-    TRACE ("leaves adjustment_value_changed ");
-}
-
-
-static void
-draw_units_changed (GtkWidget *widget, t_sensors_dialog* sd)
-{
-    TRACE ("enters draw_units_changed");
-
-    sd->sensors->show_units = ! sd->sensors->show_units;
-
-    sensors_show_text_display (sd->sensors);
-
-    TRACE ("leaves draw_units_changed");
-}
-
-
-static void
-draw_smallspacings_changed (GtkWidget *widget, t_sensors_dialog* sd)
-{
-    TRACE ("enters draw_smallspacings_changed");
-
-    sd->sensors->show_smallspacings = ! sd->sensors->show_smallspacings;
-
-    sensors_show_text_display (sd->sensors);
-
-    TRACE ("leaves draw_smallspacings_changed");
-}
-
-
-static void
-suppressmessage_changed (GtkWidget *widget, t_sensors_dialog* sd)
-{
-    TRACE ("enters suppressmessage_changed");
-
-    sd->sensors->suppressmessage = ! sd->sensors->suppressmessage;
-
-    TRACE ("leaves suppressmessage_changed");
-}
-
-
-/* double-click improvement */
-static void
-execCommand_toggled (GtkWidget *widget, t_sensors_dialog* sd)
-{
-    TRACE ("enters execCommand_toggled");
-
-    sd->sensors->exec_command =
-        gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (widget) );
-
-    if ( sd->sensors->exec_command )
-        g_signal_handler_unblock (sd->sensors->eventbox,
-            sd->sensors->doubleclick_id);
-    else
-        g_signal_handler_block (sd->sensors->eventbox,
-            sd->sensors->doubleclick_id );
-
-    TRACE ("leaves execCommand_toggled");
-}
-
-
-void
-minimum_changed (GtkCellRendererText *cellrenderertext, gchar *path_str,
-                 gchar *new_value, t_sensors_dialog *sd)
-{
-    gint gtk_combo_box_active;
-    float  value;
-    GtkTreeModel *model;
-    GtkTreePath *path;
-    GtkTreeIter iter;
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-
-    TRACE ("enters minimum_changed");
-
-    value = atof (new_value);
-
-    gtk_combo_box_active =
-        gtk_combo_box_get_active(GTK_COMBO_BOX (sd->myComboBox));
-
-    /* get model and path */
-    model = (GtkTreeModel *) sd->myListStore
-        [gtk_combo_box_active];
-    path = gtk_tree_path_new_from_string (path_str);
-
-    /* get model iterator */
-    gtk_tree_model_get_iter (model, &iter, path);
-
-    /* set new value according to chosen scale */
-    gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 4, value, -1);
-    chip = (t_chip *) g_ptr_array_index(sd->sensors->chips, gtk_combo_box_active);
-
-    chipfeature = (t_chipfeature *) g_ptr_array_index(chip->chip_features, atoi(path_str));
-    if (sd->sensors->scale==FAHRENHEIT)
-      value = (value -32 ) * 5/9;
-    chipfeature->min_value = value;
-
-    /* clean up */
-    gtk_tree_path_free (path);
-
-    if (sd->sensors->display_values_type == DISPLAY_BARS) {
-        sensors_remove_graphical_panel (sd->sensors);
-    }
-    else  if (sd->sensors->display_values_type == DISPLAY_TACHO) {
-        sensors_remove_tacho_panel (sd->sensors);
-    }
-
-    /* update panel */
-    sensors_show_panel ((gpointer) sd->sensors);
-
-    TRACE ("leaves minimum_changed");
-}
-
-
-void
-maximum_changed (GtkCellRendererText *cellrenderertext, gchar *path_str,
-            gchar *new_value, t_sensors_dialog *sd)
-{
-    gint gtk_combo_box_active;
-    float value;
-    GtkTreeModel *model;
-    GtkTreePath *path;
-    GtkTreeIter iter;
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-
-    TRACE ("enters maximum_changed");
-
-    value = atof (new_value);
-
-    gtk_combo_box_active =
-        gtk_combo_box_get_active(GTK_COMBO_BOX (sd->myComboBox));
-
-    /* get model and path */
-    model = (GtkTreeModel *) sd->myListStore
-        [gtk_combo_box_active];
-    path = gtk_tree_path_new_from_string (path_str);
-
-    /* get model iterator */
-    gtk_tree_model_get_iter (model, &iter, path);
-
-    /* set new value according to chosen scale */
-    gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 5, value, -1);
-    chip = (t_chip *) g_ptr_array_index(sd->sensors->chips, gtk_combo_box_active);
-
-    chipfeature = (t_chipfeature *) g_ptr_array_index(chip->chip_features, atoi(path_str));
-    if (sd->sensors->scale==FAHRENHEIT)
-      value = (value -32 ) * 5/9;
-    chipfeature->max_value = value;
-
-    /* clean up */
-    gtk_tree_path_free (path);
-
-    if (sd->sensors->display_values_type == DISPLAY_BARS) {
-        sensors_remove_graphical_panel (sd->sensors);
-    }
-    else  if (sd->sensors->display_values_type == DISPLAY_TACHO) {
-        sensors_remove_tacho_panel (sd->sensors);
-    }
-
-    /* update panel */
-    sensors_show_panel ((gpointer) sd->sensors);
-
-    TRACE ("leaves maximum_changed");
-}
-
-
-void
-list_cell_color_edited (GtkCellRendererText *cellrenderertext, gchar *path_str,
-                       gchar *new_color, t_sensors_dialog *sd)
-{
-    gint gtk_combo_box_active;
-    GtkTreeModel *model;
-    GtkTreePath *path;
-    GtkTreeIter iter;
-    gboolean hexColor;
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-
-    TRACE ("enters list_cell_color_edited");
-
-    /* store new color in appropriate array */
-    hexColor = g_str_has_prefix (new_color, "#");
-
-    if (hexColor && strlen(new_color) == 7) {
-        int i;
-        for (i=1; i<7; i++) {
-            /* only save hex numbers! */
-            if ( ! g_ascii_isxdigit (new_color[i]) )
-                return;
-        }
-
-        gtk_combo_box_active =
-            gtk_combo_box_get_active(GTK_COMBO_BOX (sd->myComboBox));
-
-        /* get model and path */
-        model = (GtkTreeModel *) sd->myListStore
-            [gtk_combo_box_active];
-        path = gtk_tree_path_new_from_string (path_str);
-
-        /* get model iterator */
-        gtk_tree_model_get_iter (model, &iter, path);
-
-        /* set new value */
-        gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 3, new_color, -1);
-        chip = (t_chip *) g_ptr_array_index(sd->sensors->chips, gtk_combo_box_active);
-
-        chipfeature = (t_chipfeature *) g_ptr_array_index(chip->chip_features, atoi(path_str));
-        g_free (chipfeature->color);
-        chipfeature->color = g_strdup(new_color);
-
-        /* clean up */
-        gtk_tree_path_free (path);
-
-        /* update panel */
-        sensors_show_panel ((gpointer) sd->sensors);
-    }
-
-    TRACE ("leaves list_cell_color_edited");
-}
-
-
-void
-list_cell_text_edited (GtkCellRendererText *cellrenderertext,
-                      gchar *path_str, gchar *new_text, t_sensors_dialog *sd)
-{
-    gint gtk_combo_box_active;
-    GtkTreeModel *model;
-    GtkTreePath *path;
-    GtkTreeIter iter;
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-
-    TRACE ("enters list_cell_text_edited");
-
-    
-    if (sd->sensors->display_values_type == DISPLAY_BARS) {
-        sensors_remove_graphical_panel (sd->sensors);
-    }
-    else  if (sd->sensors->display_values_type == DISPLAY_TACHO) {
-        sensors_remove_tacho_panel (sd->sensors);
-    }
-    gtk_combo_box_active =
-        gtk_combo_box_get_active(GTK_COMBO_BOX (sd->myComboBox));
-
-    model =
-        (GtkTreeModel *) sd->myListStore [gtk_combo_box_active];
-    path = gtk_tree_path_new_from_string (path_str);
-
-    /* get model iterator */
-    gtk_tree_model_get_iter (model, &iter, path);
-
-    /* set new value */
-    gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 0, new_text, -1);
-    chip = (t_chip *) g_ptr_array_index(sd->sensors->chips, gtk_combo_box_active);
-
-    /* if (chip->type!=ACPI) { */ /* No Bug. The cryptic filesystem names are
-                                  needed for the update in ACPI and hddtemp. */
-        chipfeature = (t_chipfeature *) g_ptr_array_index (chip->chip_features,
-                                                            atoi(path_str));
-        g_free(chipfeature->name);
-        chipfeature->name = g_strdup (new_text);
-    /* } */
-
-    /* clean up */
-    gtk_tree_path_free (path);
-
-    /* update panel */
-    sensors_show_panel ((gpointer) sd->sensors);
-
-    TRACE ("leaves list_cell_text_edited");
-}
-
-
-void
-list_cell_toggle (GtkCellRendererToggle *cell, gchar *path_str,
-                  t_sensors_dialog *sd)
-{
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-    gint gtk_combo_box_active;
-    GtkTreeModel *model;
-    GtkTreePath *path;
-    GtkTreeIter iter;
-    gboolean toggle_item;
-    GtkWidget *tacho;
-
-    TRACE ("enters list_cell_toggle");
-
-    
-    if (sd->sensors->display_values_type == DISPLAY_BARS) {
-        sensors_remove_graphical_panel (sd->sensors);
-    }
-    else  if (sd->sensors->display_values_type == DISPLAY_TACHO) {
-        sensors_remove_tacho_panel (sd->sensors);
-    }
-    gtk_combo_box_active =
-        gtk_combo_box_get_active(GTK_COMBO_BOX (sd->myComboBox));
-
-    model = (GtkTreeModel *) sd->myListStore[gtk_combo_box_active];
-    path = gtk_tree_path_new_from_string (path_str);
-
-    /* get toggled iter */
-    gtk_tree_model_get_iter (model, &iter, path);
-    gtk_tree_model_get (model, &iter, 2, &toggle_item, -1);
-
-    /* do something with the value */
-    toggle_item ^= 1;
-    
-    if (toggle_item==FALSE)
-    {
-      tacho = sd->sensors->tachos [gtk_combo_box_active][atoi(path_str)];
-      gtk_container_remove(GTK_CONTAINER(sd->sensors->widget_sensors), tacho);
-      gtk_widget_destroy(tacho);
-      sd->sensors->tachos [gtk_combo_box_active][atoi(path_str)] = NULL;
-     }
-
-    /* set new value */
-    gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 2, toggle_item, -1);
-    chip = (t_chip *) g_ptr_array_index(sd->sensors->chips, gtk_combo_box_active);
-
-    chipfeature = (t_chipfeature *) g_ptr_array_index(chip->chip_features, atoi(path_str));
-
-    /* help = chip->sensorAddress [ gtk_combo_box_active ] [atoi(path_str)];
-       chipfeature = (t_chipfeature *) g_ptr_array_index(chip->chip_features, help); */
-
-    chipfeature->show = toggle_item;
-
-    /* clean up */
-    gtk_tree_path_free (path);
-
-    /* update tooltip and panel widget */
-    sensors_show_panel ((gpointer) sd->sensors);
-
-    TRACE ("leaves list_cell_toggle");
-}
-
-static void
-on_font_set (GtkWidget *widget, gpointer data)
-{
-        t_sensors *sensors;
-        sensors = (t_sensors *) data;
-        g_assert (sensors!=NULL);
-        
-        if (font)
-                g_free (font);
-        
-        font = g_strdup(gtk_font_button_get_font_name(GTK_FONT_BUTTON(widget)));
-        
-        if (sensors->display_values_type!=DISPLAY_TACHO)
-                return;
-
-        /* refresh the panel content */
-        //sensors_show_panel ((gpointer) sd->sensors);
-        sensors_update_tacho_panel (sensors);
-}
-
-
-static void
-add_ui_style_box (GtkWidget * vbox, t_sensors_dialog * sd)
-{
-    GtkWidget *hbox, *label, *radioText, *radioBars, *radioTachos; /* *checkButton,  */
-
-    TRACE ("enters add_ui_style_box");
-
-    hbox = gtk_hbox_new (FALSE, BORDER);
-    gtk_widget_show (hbox);
-
-    label = gtk_label_new (_("UI style:"));
-    radioText = gtk_radio_button_new_with_mnemonic(NULL, _("_text"));
-    radioBars = gtk_radio_button_new_with_mnemonic(
-           gtk_radio_button_group(GTK_RADIO_BUTTON(radioText)), _("_progress bars"));
-    radioTachos = gtk_radio_button_new_with_mnemonic(
-           gtk_radio_button_group(GTK_RADIO_BUTTON(radioText)), _("_tachos"));
-           
-    gtk_widget_show(radioText);
-    gtk_widget_show(radioBars);
-    gtk_widget_show(radioTachos);
-    gtk_widget_show(label);
-
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radioText),
-                    sd->sensors->display_values_type == DISPLAY_TEXT);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radioBars),
-                    sd->sensors->display_values_type == DISPLAY_BARS);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radioTachos),
-                    sd->sensors->display_values_type == DISPLAY_TACHO);
-
-    gtk_box_pack_start(GTK_BOX (hbox), label, FALSE, FALSE, 0);
-    gtk_box_pack_start(GTK_BOX (hbox), radioText, FALSE, FALSE, 0);
-    gtk_box_pack_start(GTK_BOX (hbox), radioBars, FALSE, FALSE, 0);
-    gtk_box_pack_start(GTK_BOX (hbox), radioTachos, FALSE, FALSE, 0);
-
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
-
-    g_signal_connect (G_OBJECT (radioText), "toggled",
-                      G_CALLBACK (display_style_changed_text), sd );
-    g_signal_connect (G_OBJECT (radioBars), "toggled",
-                      G_CALLBACK (display_style_changed_bars), sd );
-    g_signal_connect (G_OBJECT (radioTachos), "toggled",
-                      G_CALLBACK (display_style_changed_tacho), sd );
-                      
-    TRACE ("leaves add_ui_style_box");
-}
-
-
-static void
-add_labels_box (GtkWidget * vbox, t_sensors_dialog * sd)
-{
-    GtkWidget *hbox, *checkButton;
-
-    TRACE ("enters add_labels_box");
-
-    hbox = gtk_hbox_new (FALSE, BORDER);
-    gtk_widget_show (hbox);
-    sd->labels_Box = hbox;
-    /* gtk_widget_set_sensitive(hbox, sd->sensors->display_values_graphically); */
-
-    checkButton = gtk_check_button_new_with_mnemonic (
-         _("Show _labels"));
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkButton),
-                                  sd->sensors->show_labels);
-    gtk_widget_show (checkButton);
-
-    gtk_box_pack_start (GTK_BOX (hbox), checkButton, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
-
-    //if (sd->sensors->display_values_graphically==FALSE)
-        //gtk_widget_hide(sd->labels_Box);
-
-    g_signal_connect (G_OBJECT (checkButton), "toggled",
-                      G_CALLBACK (show_labels_toggled), sd );
-
-    TRACE ("leaves add_labels_box");
-}
-
-static void
-add_colored_bars_box (GtkWidget *vbox, t_sensors_dialog *sd)
-{
-    GtkWidget *hbox, *checkButton;
-
-    TRACE ("enters add_colored_bars_box");
-
-    hbox = gtk_hbox_new (FALSE, BORDER);
-
-    gtk_widget_show (hbox);
-    sd->coloredBars_Box = hbox;
-
-    checkButton = gtk_check_button_new_with_mnemonic (
-         _("Show colored _bars"));
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkButton),
-                                  sd->sensors->show_colored_bars);
-
-    gtk_widget_show (checkButton);
-
-    gtk_box_pack_start (GTK_BOX (hbox), checkButton, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
-
-    if (sd->sensors->display_values_type != DISPLAY_BARS)
-        gtk_widget_hide(sd->coloredBars_Box);
-
-    g_signal_connect (G_OBJECT (checkButton), "toggled",
-                      G_CALLBACK (show_colored_bars_toggled), sd );
-
-    TRACE ("leaves add_colored_bars_box");
-}
-
-static void
-add_title_box (GtkWidget * vbox, t_sensors_dialog * sd)
-{
-    GtkWidget *hbox, *checkButton;
-
-    TRACE ("enters add_title_box");
-
-    hbox = gtk_hbox_new (FALSE, BORDER);
-    gtk_widget_show (hbox);
-
-    checkButton = gtk_check_button_new_with_mnemonic (_("_Show title"));
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkButton),
-                                  sd->sensors->show_title);
-    gtk_widget_show (checkButton);
-
-    gtk_box_pack_start (GTK_BOX (hbox), checkButton, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
-
-    g_signal_connect (G_OBJECT (checkButton), "toggled",
-                      G_CALLBACK (show_title_toggled), sd );
-
-    TRACE ("leaves add_title_box");
-}
-
-
-static void
-add_lines_box (GtkWidget * vbox, t_sensors_dialog * sd)
-{
-    GtkWidget *myLinesLabel;
-    GtkWidget *myLinesBox;
-    GtkWidget *myLinesSizeSpinBox;
-
-    TRACE ("enters add_Lines_size_box");
-
-    myLinesLabel = gtk_label_new_with_mnemonic (_("_Number of text lines:"));
-    myLinesBox = gtk_hbox_new(FALSE, BORDER);
-    myLinesSizeSpinBox = gtk_spin_button_new_with_range  (1.0, 10.0, 1.0);
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(myLinesSizeSpinBox), (gdouble) sd->sensors->lines_size);
-
-    sd->Lines_Box = myLinesBox;
-    sd->Lines_Spin_Box = myLinesSizeSpinBox;
-
-    gtk_box_pack_start (GTK_BOX (myLinesBox), myLinesLabel, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (myLinesBox), myLinesSizeSpinBox, FALSE, FALSE,
-        0);
-    gtk_box_pack_start (GTK_BOX (vbox), myLinesBox, FALSE, FALSE, 0);
-
-    gtk_widget_show (myLinesLabel);
-    gtk_widget_show (myLinesSizeSpinBox);
-    gtk_widget_show (myLinesBox);
-
-    if (sd->sensors->display_values_type != DISPLAY_TEXT)
-        gtk_widget_hide(sd->Lines_Box);
-
-    g_signal_connect   (G_OBJECT (myLinesSizeSpinBox), "value-changed",
-                        G_CALLBACK (lines_size_change), sd );
-
-    TRACE ("leaves add_Lines_size_box");
-}
-
-static void
-add_font_size_box (GtkWidget * vbox, t_sensors_dialog * sd)
-{
-    GtkWidget *myFontLabel;
-    GtkWidget *myFontBox;
-    GtkWidget *myFontSizeComboBox;
-
-    TRACE ("enters add_font_size_box");
-
-    myFontLabel = gtk_label_new_with_mnemonic (_("F_ont size:"));
-    myFontBox = gtk_hbox_new(FALSE, BORDER);
-    myFontSizeComboBox = gtk_combo_box_new_text();
-
-    sd->font_Box = myFontBox;
-    /* gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically); */
-
-    gtk_combo_box_append_text (GTK_COMBO_BOX(myFontSizeComboBox), _("x-small"));
-    gtk_combo_box_append_text (GTK_COMBO_BOX(myFontSizeComboBox), _("small")  );
-    gtk_combo_box_append_text (GTK_COMBO_BOX(myFontSizeComboBox), _("medium") );
-    gtk_combo_box_append_text (GTK_COMBO_BOX(myFontSizeComboBox), _("large")  );
-    gtk_combo_box_append_text (GTK_COMBO_BOX(myFontSizeComboBox), _("x-large"));
-    gtk_combo_box_set_active  (GTK_COMBO_BOX(myFontSizeComboBox),
-        sd->sensors->font_size_numerical);
-
-    gtk_box_pack_start (GTK_BOX (myFontBox), myFontLabel, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (myFontBox), myFontSizeComboBox, FALSE, FALSE,
-        0);
-    gtk_box_pack_start (GTK_BOX (vbox), myFontBox, FALSE, FALSE, 0);
-
-    gtk_widget_show (myFontLabel);
-    gtk_widget_show (myFontSizeComboBox);
-    gtk_widget_show (myFontBox);
-
-    if (sd->sensors->display_values_type != DISPLAY_TEXT)
-        gtk_widget_hide(sd->font_Box);
-
-    g_signal_connect   (G_OBJECT (myFontSizeComboBox), "changed",
-                        G_CALLBACK (font_size_change), sd );
-
-    TRACE ("leaves add_font_size_box");
-}
-
-static void
-add_font_settings_box (GtkWidget * vbox, t_sensors_dialog * sd)
-{
-    GtkWidget *myFontLabel;
-    GtkWidget *myFontSettingsBox;
-    GtkWidget *myFontSettingsButton;
-
-    TRACE ("enters add_font_settings_box");
-
-    myFontLabel = gtk_label_new_with_mnemonic (_("F_ont:"));
-    myFontSettingsBox = gtk_hbox_new (FALSE, BORDER);
-    myFontSettingsButton = gtk_font_button_new_with_font(font);
-    //gtk_font_button_set_font_name(GTK_FONT_BUTTON(myFontSettingsButton), font);
-    gtk_font_button_set_use_font(GTK_FONT_BUTTON(myFontSettingsButton), TRUE);
-
-    sd->fontSettings_Box = myFontSettingsBox;
-    /* gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically); */
-
-    gtk_box_pack_start (GTK_BOX (myFontSettingsBox), myFontLabel, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (myFontSettingsBox), myFontSettingsButton, FALSE, FALSE,
-        0);
-    gtk_box_pack_start (GTK_BOX (vbox), myFontSettingsBox, FALSE, FALSE, 0);
-
-    gtk_widget_show (myFontLabel);
-    gtk_widget_show (myFontSettingsButton);
-    gtk_widget_show (myFontSettingsBox);
-
-    if (sd->sensors->display_values_type != DISPLAY_TACHO)
-        gtk_widget_hide(sd->fontSettings_Box);
-
-    g_signal_connect (G_OBJECT(myFontSettingsButton), "font-set", G_CALLBACK(on_font_set), sd->sensors);
-    //g_signal_connect   (G_OBJECT (myFontSettingsComboBox), "changed",
-                        //G_CALLBACK (font_settings_change), sd );
-
-    TRACE ("leaves add_font_settings_box");
-}
-
-
-static void
-add_units_box (GtkWidget * vbox, t_sensors_dialog * sd)
-{
-    TRACE ("enters add_units_box");
-
-    sd->unit_checkbox = gtk_check_button_new_with_mnemonic(_("Show _Units"));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sd->unit_checkbox), sd->sensors->show_units);
-
-    gtk_widget_show (sd->unit_checkbox);
-
-    gtk_box_pack_start (GTK_BOX (vbox), sd->unit_checkbox, FALSE, TRUE, 0);
-
-    if (sd->sensors->display_values_type!=DISPLAY_TEXT)
-        gtk_widget_hide(sd->unit_checkbox);
-
-    g_signal_connect   (G_OBJECT (sd->unit_checkbox), "toggled",
-                        G_CALLBACK (draw_units_changed), sd );
-
-    TRACE ("leaves add_units_box");
-}
-
-static void
-add_smallspacings_box (GtkWidget * vbox, t_sensors_dialog * sd)
-{
-    TRACE ("enters add_smallspacings_box");
-
-    sd->smallspacing_checkbox  = gtk_check_button_new_with_mnemonic(_("Small horizontal s_pacing"));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sd->smallspacing_checkbox), sd->sensors->show_smallspacings);
-
-    gtk_widget_show (sd->smallspacing_checkbox);
-
-    gtk_box_pack_start (GTK_BOX (vbox), sd->smallspacing_checkbox, FALSE, TRUE, 0);
-
-    if (sd->sensors->display_values_type!=DISPLAY_TEXT)
-        gtk_widget_hide(sd->smallspacing_checkbox);
-
-    g_signal_connect   (G_OBJECT (sd->smallspacing_checkbox), "toggled",
-                        G_CALLBACK (draw_smallspacings_changed), sd );
-
-    TRACE ("leaves add_smallspacings_box");
-}
-
-
-static void
-add_suppressmessage_box (GtkWidget * vbox, t_sensors_dialog * sd)
-{
-    TRACE ("enters add_suppressmessage_box");
-
-    sd->suppressmessage_checkbox  = gtk_check_button_new_with_mnemonic(_("Suppress messages"));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sd->suppressmessage_checkbox), sd->sensors->suppressmessage);
-
-    gtk_widget_show (sd->suppressmessage_checkbox);
-
-    gtk_box_pack_start (GTK_BOX (vbox), sd->suppressmessage_checkbox, FALSE, TRUE, 0);
-
-    g_signal_connect   (G_OBJECT (sd->suppressmessage_checkbox), "toggled",
-                        G_CALLBACK (suppressmessage_changed), sd );
-
-    TRACE ("leaves add_suppressmessage_box");
-}
-
-
-/* double-click improvement */
-static void
-add_command_box (GtkWidget * vbox,  t_sensors_dialog * sd)
-{
-    GtkWidget *myBox;
-
-    TRACE ("enters add_command_box");
-
-    myBox = gtk_hbox_new(FALSE, BORDER);
-
-    sd->myExecCommand_CheckBox = gtk_check_button_new_with_mnemonic
-        (_("E_xecute on double click:"));
-    gtk_toggle_button_set_active
-        ( GTK_TOGGLE_BUTTON (sd->myExecCommand_CheckBox),
-        sd->sensors->exec_command );
-
-    sd->myCommandName_Entry = gtk_entry_new ();
-    gtk_widget_set_size_request (sd->myCommandName_Entry, 160, 25);
-
-
-    gtk_entry_set_text( GTK_ENTRY(sd->myCommandName_Entry),
-        sd->sensors->command_name );
-
-    gtk_box_pack_start (GTK_BOX (myBox), sd->myExecCommand_CheckBox, FALSE,
-                        FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (myBox), sd->myCommandName_Entry, FALSE,
-                        FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), myBox, FALSE, FALSE, 0);
-
-    gtk_widget_show (sd->myExecCommand_CheckBox);
-    gtk_widget_show (sd->myCommandName_Entry);
-    gtk_widget_show (myBox);
-
-    g_signal_connect  (G_OBJECT (sd->myExecCommand_CheckBox), "toggled",
-                    G_CALLBACK (execCommand_toggled), sd );
-
-    /* g_signal_connect  (G_OBJECT (sd->myCommandNameEntry), "focus-out-event",
-                    G_CALLBACK (execCommandName_activate), sd ); */
-
-    TRACE ("leaves add_command_box");
-}
-
-
-static void
-add_view_frame (GtkWidget * notebook, t_sensors_dialog * sd)
-{
-    GtkWidget *_vbox, *_label;
-
-    TRACE ("enters add_view_frame");
-
-    _vbox = gtk_vbox_new (FALSE, 4);
-    //gtk_container_set_border_width (GTK_CONTAINER(_vbox), 4);
-    gtk_widget_show (_vbox);
-
-    _label = gtk_label_new_with_mnemonic(_("_View"));
-    gtk_widget_show (_label);
-
-    gtk_container_set_border_width (GTK_CONTAINER (_vbox), BORDER<<1);
-
-    gtk_notebook_append_page (GTK_NOTEBOOK(notebook), _vbox, _label);
-
-    add_title_box (_vbox, sd);
-
-    add_ui_style_box (_vbox, sd);
-    add_labels_box (_vbox, sd);
-    add_font_size_box (_vbox, sd);
-    add_font_settings_box (_vbox, sd);
-    add_lines_box (_vbox, sd);
-    add_colored_bars_box (_vbox, sd);
-    add_units_box (_vbox, sd);
-    add_smallspacings_box(_vbox, sd);
-
-    TRACE ("leaves add_view_frame");
-}
-
-
-
-static void
-add_miscellaneous_frame (GtkWidget * notebook, t_sensors_dialog * sd)
-{
-    GtkWidget *_vbox, *_label;
-
-    TRACE ("enters add_miscellaneous_frame");
-
-    _vbox = gtk_vbox_new (FALSE, 4);
-    //gtk_container_set_border_width (GTK_CONTAINER(_vbox), 4);
-    gtk_widget_show (_vbox);
-
-    _label = gtk_label_new_with_mnemonic (_("_Miscellaneous"));
-    gtk_widget_show (_label);
-
-    gtk_container_set_border_width (GTK_CONTAINER (_vbox), BORDER<<1);
-
-    gtk_notebook_append_page (GTK_NOTEBOOK(notebook), _vbox, _label);
-
-    add_update_time_box (_vbox, sd);
-
-    add_suppressmessage_box(_vbox, sd);
-
-    add_command_box (_vbox, sd);
-
-    TRACE ("leaves add_miscellaneous_frame");
-}
-
-
-static void
-on_optionsDialog_response (GtkWidget *dlg, int response, t_sensors_dialog *sd)
-{
-    TRACE ("enters on_optionsDialog_response");
-
-    if (response==GTK_RESPONSE_OK) {
-        /* FIXME: save most of the content in this function,
-           remove those toggle functions where possible. NYI */
-        /* sensors_apply_options (sd); */
-        g_free(sd->sensors->command_name);
-        sd->sensors->command_name =
-            g_strdup ( gtk_entry_get_text(GTK_ENTRY(sd->myCommandName_Entry)) );
-
-            if (! sd->sensors->plugin_config_file)
-                sd->sensors->plugin_config_file = xfce_panel_plugin_save_location (sd->sensors->plugin, TRUE);
-
-            if (sd->sensors->plugin_config_file)
-                sensors_write_config (sd->sensors->plugin, sd->sensors);
-    }
-    gtk_window_get_size ( GTK_WINDOW(dlg), &(sd->sensors->preferred_width), &(sd->sensors->preferred_height));
-    gtk_widget_destroy (sd->dialog);
-
-    xfce_panel_plugin_unblock_menu (sd->sensors->plugin);
-
-    /* g_free(sd->coloredBars_Box);
-    g_free(sd->font_Box);
-    g_free(sd->labels_Box);
-    g_free(sd->myComboBox);
-    g_free(sd->myCommandName_Entry);
-    g_free(sd->myExecCommand_CheckBox);
-    g_free(sd->mySensorLabel);
-    g_free(sd->smallspacing_checkbox);
-    g_free(sd->suppressmessage_checkbox);
-    g_free(sd->temperature_radio_group);
-    g_free(sd->unit_checkbox); */
-
-    g_free(sd);
-
-    TRACE ("leaves on_optionsDialog_response");
-}
-
-
-/* create sensor options box */
-static void
-sensors_create_options (XfcePanelPlugin *plugin, t_sensors *sensors)
-{
-    GtkWidget *dlg, *vbox, *notebook;
-    t_sensors_dialog *sd;
-    gchar *myToolTipText;
-
-    TRACE ("enters sensors_create_options");
-
-    xfce_panel_plugin_block_menu (plugin);
-
-    //dlg = gtk_dialog_new_with_buttons (
-    dlg = xfce_titled_dialog_new_with_buttons(
-                _("Sensors Plugin"),
-                GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
-                GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
-                GTK_STOCK_CLOSE,
-                GTK_RESPONSE_OK,
-                NULL
-            );
-    gtk_window_set_icon_name(GTK_WINDOW(dlg),"xfce-sensors");
-
-    gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
-
-    /*header = xfce_create_header (NULL, _("Sensors Plugin"));
-    gtk_widget_set_size_request (GTK_BIN (header)->child, -1, 32);
-    gtk_container_set_border_width (GTK_CONTAINER (header), BORDER-2);
-    gtk_widget_show (header);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header,
-                        FALSE, TRUE, 0);*/
-
-    vbox = GTK_DIALOG (dlg)->vbox;
-
-    sd = g_new0 (t_sensors_dialog, 1);
-
-    sd->sensors = sensors;
-    sd->dialog = dlg;
-    sd->plugin_dialog = TRUE;
-
-    sd->myComboBox = gtk_combo_box_new_text();
-
-    init_widgets (sd);
-
-    gtk_combo_box_set_active (GTK_COMBO_BOX(sd->myComboBox), 0);
-
-    notebook = gtk_notebook_new ();
-
-    gtk_box_pack_start (GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
-    gtk_widget_show(notebook);
-
-    add_sensors_frame (notebook, sd);
-
-    if (!tooltips)
-      tooltips = gtk_tooltips_new();
-
-    /* #if GTK_VERSION < 2.11 */
-    myToolTipText = g_strdup(_("You can change a feature's properties such as name, colours, min/max value by double-clicking the entry, editing the content, and pressing \"Return\" or selecting a different field."));
-    gtk_tooltips_set_tip (tooltips, GTK_WIDGET(sd->myTreeView),
-                          myToolTipText, NULL);
-    g_free (myToolTipText);
-    /* g_signal_connect (G_OBJECT (sd->myComboBox), "changed",
-                      //G_CALLBACK (sensor_entry_changed), sd ); */
-
-    add_view_frame (notebook, sd);
-    add_miscellaneous_frame (notebook, sd);
-
-    //gtk_widget_set_size_request (vbox, 400, 400);
-    gtk_window_set_default_size (GTK_WINDOW(dlg), sensors->preferred_width, sensors->preferred_height);
-
-    g_signal_connect (dlg, "response",
-            G_CALLBACK(on_optionsDialog_response), sd);
-
-    gtk_widget_show (dlg);
-
-    TRACE ("leaves sensors_create_options");
-}
-
-
-/**
- * Add event box to sensors panel
- * @param sensors Pointer to t_sensors structure
- */
-static void
-add_event_box (t_sensors *sensors)
-{
-    /* create eventbox to catch events on widget */
-    sensors->eventbox = gtk_event_box_new ();
-    gtk_widget_set_name (sensors->eventbox, "xfce_sensors");
-    gtk_widget_show (sensors->eventbox);
-
-    /* double-click improvement */
-    sensors->doubleclick_id = g_signal_connect (G_OBJECT(sensors->eventbox),
-                                                 "button-press-event",
-                                                 G_CALLBACK (execute_command),
-                                                 (gpointer) sensors);
-}
-
-
-/**
- * Create sensors panel control
- * @param plugin Panel plugin proxy to create sensors plugin in
- */
-static t_sensors *
-create_sensors_control (XfcePanelPlugin *plugin)
-{
-    t_sensors *sensors;
-    gchar *tmp;
-
-    TRACE ("enters create_sensors_control");
-
-    tmp = xfce_panel_plugin_lookup_rc_file(plugin);
-
-    sensors = sensors_new (plugin, tmp);
-    /* need/want to encapsulate/wrap that ? */
-    sensors->orientation = xfce_panel_plugin_get_orientation (plugin);
-    sensors->panel_size = xfce_panel_plugin_get_size (plugin);
-
-    add_event_box (sensors);
-
-        /* Add tooltip to show extended current sensors status */
-    sensors_create_tooltip ((gpointer) sensors);
-
-    /* fill panel widget with boxes, strings, values, ... */
-    create_panel_widget (sensors);
-
-    /* finally add panel "sensors" to eventbox */
-    gtk_container_add (GTK_CONTAINER (sensors->eventbox),
-                       sensors->widget_sensors);
-
-    /* #if GTK_VERSION >= 2.11
-     * g_signal_connect(G_OBJECT(sensors->eventbox),
-                                    "query-tooltip",
-                                    G_CALLBACK(handle_tooltip_query),
-                                    (gpointer) sensors); */
-
-    /* sensors_set_size (control, settings.size); */
-
-    TRACE ("leaves create_sensors_control");
-
-    return sensors;
-}
-
-
-static void
-sensors_plugin_construct (XfcePanelPlugin *plugin)
-{
-    t_sensors *sensors;
-
-    TRACE ("enters sensors_plugin_construct");
-
-    xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
-
-    sensors = create_sensors_control (plugin);
-
-    sensors->plugin_config_file = xfce_panel_plugin_lookup_rc_file(plugin);
-    sensors_read_config (plugin, sensors);
-    
-    //if (font)
-            //g_free (font);
-    //font = g_strdup(sensors->font);
-
-    /* Try to resize the sensors to fit the user settings.
-       Do also modify the tooltip text. */
-    sensors_show_panel ((gpointer) sensors);
-
-    sensors->timeout_id = g_timeout_add (sensors->sensors_refresh_time * 1000,
-                                         (GtkFunction) sensors_show_panel,
-                                         (gpointer) sensors);
-
-    g_signal_connect (plugin, "free-data", G_CALLBACK (sensors_free), sensors);
-
-    sensors->plugin_config_file = xfce_panel_plugin_save_location (plugin, TRUE);
-    g_signal_connect (plugin, "save", G_CALLBACK (sensors_write_config),
-                      sensors);
-
-    xfce_panel_plugin_menu_show_configure (plugin);
-
-    g_signal_connect (plugin, "configure-plugin",
-                      G_CALLBACK (sensors_create_options), sensors);
-
-    g_signal_connect (plugin, "size-changed", G_CALLBACK (sensors_set_size),
-                         sensors);
-
-    g_signal_connect (plugin, "orientation-changed",
-                      G_CALLBACK (sensors_set_orientation), sensors);
-
-    gtk_container_add (GTK_CONTAINER(plugin), sensors->eventbox);
-
-    xfce_panel_plugin_add_action_widget (plugin, sensors->eventbox);
-
-    TRACE ("leaves sensors_plugin_construct");
-}
-
-XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (sensors_plugin_construct);
-
diff --git a/po/Makefile.in b/po/Makefile.in
deleted file mode 100644
index f5991d0..0000000
--- a/po/Makefile.in
+++ /dev/null
@@ -1,222 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
-# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
-#
-# This file may be copied and used freely without restrictions.  It may
-# be used in projects which are not available under a GNU Public License,
-# but which still want to provide support for the GNU gettext functionality.
-#
-# - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob at ximian.com> to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = xfce4-sensors-plugin
-PACKAGE = xfce4-sensors-plugin
-VERSION = 1.2.95
-
-SHELL = /bin/bash
-
-srcdir = .
-top_srcdir = ..
-top_builddir = ..
-
-
-prefix = /usr/local
-exec_prefix = ${prefix}
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-libdir = ${exec_prefix}/lib
-localedir = ${datarootdir}/locale
-subdir = po
-install_sh = ${SHELL} /home/tim/install/xfce47/goodies/xfce4-sensors-plugin/install-sh
-# Automake >= 1.8 provides $(MKDIR_P).
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
-
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-
-GMSGFMT = /usr/bin/msgfmt
-MSGFMT = /usr/bin/msgfmt
-XGETTEXT_ARGS = --keyword=Q_ --from-code=UTF-8
-XGETTEXT = /usr/bin/xgettext $(XGETTEXT_ARGS)
-INTLTOOL_UPDATE = /usr/bin/intltool-update
-INTLTOOL_EXTRACT = /usr/bin/intltool-extract
-MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = ar ast bg ca cs de el en_AU en_GB es eu fi fr gl he hu id is it ja ko lv ms nb nl pl pt_BR pt ru sk sq sr sv th tr ug uk ur_PK ur vi zh_CN zh_TW 
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
-DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-# This comment gets stripped out
-
-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-
-.SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-AM_DEFAULT_VERBOSITY = 1
-INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
-INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
-INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
-
-.po.pox:
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
-	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	$(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && gencat $@ $*.msg
-
-
-all: all-yes
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(GENPOT)
-
-install: install-data
-install-data: install-data-yes
-install-data-no: all
-install-data-yes: all
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $$dir; \
-	  if test -r $$lang.gmo; then \
-	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $(srcdir)/$$lang.gmo as" \
-		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-	  fi; \
-	  if test -r $$lang.gmo.m; then \
-	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	  else \
-	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
-
-# Empty stubs to satisfy archaic automake needs
-dvi info ctags tags CTAGS TAGS ID:
-
-# Define this as empty until I found a useful application.
-install-exec installcheck:
-
-uninstall:
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-	done
-
-check: all $(GETTEXT_PACKAGE).pot
-	rm -f missing notexist
-	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-	if [ -r missing -o -r notexist ]; then \
-	  exit 1; \
-	fi
-
-mostlyclean:
-	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-	rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES stamp-it
-	rm -f *.mo *.msg *.cat *.cat.m *.gmo
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f Makefile.in.in
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	extra_dists="$(EXTRA_DISTFILES)"; \
-	for file in $$extra_dists; do \
-	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-	done; \
-	for file in $$dists; do \
-	  test -f $$file || file="$(srcdir)/$$file"; \
-	  ln $$file $(distdir) 2> /dev/null \
-	    || cp -p $$file $(distdir); \
-	done
-
-update-po: Makefile
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	tmpdir=`pwd`; \
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  echo "$$lang:"; \
-	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-	  if $$result; then \
-	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	      rm -f $$tmpdir/$$lang.new.po; \
-            else \
-	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	        :; \
-	      else \
-	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	        rm -f $$tmpdir/$$lang.new.po; \
-	        exit 1; \
-	      fi; \
-	    fi; \
-	  else \
-	    echo "msgmerge for $$lang.gmo failed!"; \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  fi; \
-	done
-
-Makefile POTFILES: stamp-it
-	@if test ! -f $@; then \
-	  rm -f stamp-it; \
-	  $(MAKE) stamp-it; \
-	fi
-
-stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-	       $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/POTFILES b/po/POTFILES
deleted file mode 100644
index a6843b7..0000000
--- a/po/POTFILES
+++ /dev/null
@@ -1,16 +0,0 @@
-	../panel-plugin/sensors-plugin.c \
-	../panel-plugin/sensors-plugin.h \
-	../lib/configuration.c \
-	../lib/acpi.c \
-	../lib/nvidia.c \
-	../lib/hddtemp.c \
-	../lib/lmsensors.c \
-	../lib/middlelayer.c \
-	../lib/sensors-interface.c \
-	../lib/sensors-interface-common.c \
-	../src/main.c \
-	../src/interface.c \
-	../src/callbacks.c \
-	../src/actions.c \
-	../src/xfce4-sensors.desktop.in \
-	../panel-plugin/xfce4-sensors-plugin.desktop.in
diff --git a/po/stamp-it b/po/stamp-it
deleted file mode 100644
index e69de29..0000000

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list