From cdca1bda09530ade2535d4194c5359ff5daa7e4d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Thu, 14 Aug 2014 01:03:47 +0200
Subject: [PATCH] slog-enabled cbk use gsettings. removed all remaining usage
 of gconf. removed gconf required by the build.

---
 Makefile.in                                   |   5 -
 README                                        |   3 +-
 README.html                                   |  77 +++++-----
 aclocal.m4                                    |  45 ------
 config.h.in                                   |   3 -
 configure                                     | 211 --------------------------
 configure.ac                                  |  12 --
 doc/Makefile.in                               |   5 -
 doc/faq.html                                  |   2 +-
 icons/hicolor/14x14/Makefile.in               |   5 -
 icons/hicolor/16x16/Makefile.in               |   5 -
 icons/hicolor/22x22/Makefile.in               |   5 -
 icons/hicolor/24x24/Makefile.in               |   5 -
 icons/hicolor/32x32/Makefile.in               |   5 -
 icons/hicolor/48x48/Makefile.in               |   5 -
 icons/hicolor/64x64/Makefile.in               |   5 -
 icons/hicolor/scalable/Makefile.in            |   5 -
 icons/ubuntu-mono-dark/apps/22/Makefile.in    |   5 -
 icons/ubuntu-mono-dark/status/22/Makefile.in  |   5 -
 icons/ubuntu-mono-light/status/22/Makefile.in |   5 -
 src/Makefile.am                               |  12 --
 src/Makefile.in                               |  89 ++++-------
 src/cfg.c                                     |  47 +++---
 src/cfg.h                                     |   4 +-
 src/glade/Makefile.in                         |   5 -
 src/lib/Makefile.in                           |   5 -
 src/lib/slog.c                                |   2 +-
 src/server/Makefile.in                        |   5 -
 src/ui.c                                      |   5 +-
 tests/Makefile.in                             |   5 -
 www/Makefile.in                               |   5 -
 31 files changed, 92 insertions(+), 510 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 2245422..76f0766 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -186,11 +186,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/README b/README
index 43123c8..1ed9ae5 100644
--- a/README
+++ b/README
@@ -114,7 +114,6 @@ The compilation of +psensor+ requires:
  * lm-sensors
  * library sensors4
  * library gtk3 >=3.4
- * library gconf2
  * help2man 
  * asciidoc (optional, required to produce the html version of the
    faq)
@@ -135,7 +134,7 @@ The specific requirements for +psensor-server+:
 For Debian 7.0:
 -----------------------------------------------------------------
 sudo apt-get install asciidoc cppcheck gcc gettext libgtk-3-dev
-libgconf2-dev libnotify-dev libsensors4-dev help2man
+libnotify-dev libsensors4-dev help2man
 libcurl4-openssl-dev libjson0-dev libmicrohttpd-dev libgtop2-dev
 libatasmart-dev make
 -----------------------------------------------------------------
diff --git a/README.html b/README.html
index 7b1b294..14610eb 100644
--- a/README.html
+++ b/README.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.7" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
 <title>Psensor README</title>
 <style type="text/css">
 
@@ -177,6 +177,8 @@ table {
     -webkit-box-shadow: 0 2px 2px 0 #C2C2C2;
     box-shadow: 0 2px 2px 0 #C2C2C2;
 }
+
+
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -427,26 +429,26 @@ red under alert and a menu for quickly check all sensors.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-start <tt>psensor-server</tt> on the remote computer.
+start <code>psensor-server</code> on the remote computer.
 </p>
 </li>
 <li>
 <p>
-start <tt>psensor</tt> using: <tt>psensor --url=http://hostname:3131</tt>.
+start <code>psensor</code> using: <code>psensor --url=http://hostname:3131</code>.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p><tt>psensor-server</tt> is a minimal Web server, a Web browser can be used to
+<div class="paragraph"><p><code>psensor-server</code> is a minimal Web server, a Web browser can be used to
 monitor the remote computer by opening the URL:
-<tt>http://hostname:3131</tt>.</p></div>
+<code>http://hostname:3131</code>.</p></div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <div class="title">Warning</div>
 </td>
-<td class="content"><tt>psensor-server</tt> does not provide any way to restrict the connection
+<td class="content"><code>psensor-server</code> does not provide any way to restrict the connection
 to the HTTP server, worst, no effort has been made against malicious
-HTTP attacks.  You should make the <tt>psensor-server</tt> port available
+HTTP attacks.  You should make the <code>psensor-server</code> port available
 only to a network or computer you trust by using the usual network
 security tools of the system (for example:
 <a href="http://www.netfilter.org/projects/iptables/index.html">iptables</a>).</td>
@@ -466,18 +468,18 @@ Wheezy, unstable and testing repositories.</p></div>
 <div class="paragraph"><p>To do the installation:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><tt>sudo apt-get install psensor psensor-server</tt></pre>
+<pre><code>sudo apt-get install psensor psensor-server</code></pre>
 </div></div>
 </div>
 <div class="sect2">
 <h3 id="_ubuntu">2.2. Ubuntu</h3>
 <div class="paragraph"><p>Since Ubuntu Oneiric (11.10), psensor is available in the universe
 repository of Ubuntu.</p></div>
-<div class="paragraph"><p>To install <tt>psensor</tt> or <tt>psensor-server</tt>:</p></div>
+<div class="paragraph"><p>To install <code>psensor</code> or <code>psensor-server</code>:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><tt>sudo apt-get install psensor
-sudo apt-get install psensor-server</tt></pre>
+<pre><code>sudo apt-get install psensor
+sudo apt-get install psensor-server</code></pre>
 </div></div>
 <div class="paragraph"><p>Or search them in the Ubuntu Software Center.</p></div>
 <div class="paragraph"><p>For other Ubuntu releases or user the more recent release, the easiest
@@ -485,27 +487,27 @@ way is to use the dedicated PPA.</p></div>
 <div class="paragraph"><p>Last stable version:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><tt>sudo apt-get apt-add-repository ppa:/jfi/psensor
+<pre><code>sudo apt-get apt-add-repository ppa:/jfi/psensor
 sudo apt-get update
 sudo apt-get install psensor
-sudo apt-get install psensor-server</tt></pre>
+sudo apt-get install psensor-server</code></pre>
 </div></div>
 <div class="paragraph"><p>Last development version which should not contain major bugs:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><tt>sudo apt-get apt-add-repository ppa:/jfi/psensor-unstable
+<pre><code>sudo apt-get apt-add-repository ppa:/jfi/psensor-unstable
 sudo apt-get update
 sudo apt-get install psensor
-sudo apt-get install psensor-server</tt></pre>
+sudo apt-get install psensor-server</code></pre>
 </div></div>
 <div class="paragraph"><p>Daily trunk build which may contain major bugs and partialy
 implemented features:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><tt>sudo apt-get apt-add-repository ppa:/jfi/psensor-daily-trunk
+<pre><code>sudo apt-get apt-add-repository ppa:/jfi/psensor-daily-trunk
 sudo apt-get update
 sudo apt-get install psensor
-sudo apt-get install psensor-server</tt></pre>
+sudo apt-get install psensor-server</code></pre>
 </div></div>
 </div>
 </div>
@@ -513,11 +515,11 @@ sudo apt-get install psensor-server</tt></pre>
 <div class="sect1">
 <h2 id="_installation_from_source_archive">3. Installation From Source Archive</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><tt>psensor</tt> and <tt>psensor-server</tt> can be compiled and installed on any
+<div class="paragraph"><p><code>psensor</code> and <code>psensor-server</code> can be compiled and installed on any
 modern GNU/Linux distribution.</p></div>
 <div class="sect2">
 <h3 id="_compilation_prerequisites">3.1. Compilation Prerequisites</h3>
-<div class="paragraph"><p>The compilation of <tt>psensor</tt> requires:</p></div>
+<div class="paragraph"><p>The compilation of <code>psensor</code> requires:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -546,11 +548,6 @@ library gtk3 &gt;=3.4
 </li>
 <li>
 <p>
-library gconf2
-</p>
-</li>
-<li>
-<p>
 help2man
 </p>
 </li>
@@ -601,7 +598,7 @@ library atasmart (optional, for disk monitoring)
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>The specific requirements for <tt>psensor-server</tt>:</p></div>
+<div class="paragraph"><p>The specific requirements for <code>psensor-server</code>:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -617,26 +614,26 @@ library json0
 <div class="paragraph"><p>For Debian 7.0:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><tt>sudo apt-get install asciidoc cppcheck gcc gettext libgtk-3-dev
-libgconf2-dev libnotify-dev libsensors4-dev help2man
+<pre><code>sudo apt-get install asciidoc cppcheck gcc gettext libgtk-3-dev
+libnotify-dev libsensors4-dev help2man
 libcurl4-openssl-dev libjson0-dev libmicrohttpd-dev libgtop2-dev
-libatasmart-dev make</tt></pre>
+libatasmart-dev make</code></pre>
 </div></div>
 <div class="paragraph"><p>For Fedora 17:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><tt>sudo yum install gcc gtk3-devel GConf2-devel lm_sensors-devel cppcheck
+<pre><code>sudo yum install gcc gtk3-devel GConf2-devel lm_sensors-devel cppcheck
 libatasmart-devel libcurl-devel json-c-devel libmicrohttpd-devel
-help2man libnotify-devel libgtop2-devel make</tt></pre>
+help2man libnotify-devel libgtop2-devel make</code></pre>
 </div></div>
 <div class="paragraph"><p>For Ubuntu 12.10:</p></div>
 <div class="listingblock">
 <div class="content">
-<pre><tt>sudo apt-get install asciidoc autoconf automake autopoint
+<pre><code>sudo apt-get install asciidoc autoconf automake autopoint
 debhelper (&gt;= 9) cppcheck gettext help2man libappindicator3-dev
 libatasmart-dev libcurl4-gnutls-dev libgconf2-dev libgtk-3-dev
 libgtop2-dev libjson0-dev libmicrohttpd-dev libnotify-dev
-libsensors4-dev libunity-dev nvidia-settings perl</tt></pre>
+libsensors4-dev libunity-dev nvidia-settings perl</code></pre>
 </div></div>
 </div>
 <div class="sect2">
@@ -654,29 +651,29 @@ Extract files from the source archive
 </li>
 <li>
 <p>
-Compilation: <tt>./configure;make clean all</tt>
+Compilation: <code>./configure;make clean all</code>
 </p>
 </li>
 <li>
 <p>
-Installation:  <tt>make install</tt> (require to have root permission)
+Installation:  <code>make install</code> (require to have root permission)
 </p>
 </li>
 <li>
 <p>
-Start the sensor detection script: <tt>sensors-detect</tt> and follows the
+Start the sensor detection script: <code>sensors-detect</code> and follows the
 instructions. Reboot or activate the kernel modules which have
 been found.
 </p>
 </li>
 <li>
 <p>
-To monitor HDDs, the <tt>hddtemp</tt> daemon must be installed and running.
+To monitor HDDs, the <code>hddtemp</code> daemon must be installed and running.
 </p>
 </li>
 <li>
 <p>
-Run: <tt>psensor</tt>
+Run: <code>psensor</code>
 </p>
 </li>
 </ol></div>
@@ -691,8 +688,8 @@ requiring an additional library.</p></div>
 <div class="paragraph"><p>Download the
 <a href="http://developer.amd.com/sdks/ADLSDK/Pages/default.aspx">ATI ADL SDK</a>
 and extracts the files of the archive into a directory [dir].</p></div>
-<div class="paragraph"><p>Replace the step 3. of the above section by <tt>./configure
---with-libatiadl=[dir]</tt> where <tt>[dir]</tt> must be the directory where you
+<div class="paragraph"><p>Replace the step 3. of the above section by <code>./configure
+--with-libatiadl=[dir]</code> where <code>[dir]</code> must be the directory where you
 have extracted the ATI ADL SDK. Other steps are indentical.</p></div>
 </div>
 </div>
@@ -708,7 +705,7 @@ have extracted the ATI ADL SDK. Other steps are indentical.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-04-10 01:57:33 CEST
+Last updated 2014-08-14 01:03:09 CEST
 </div>
 </div>
 </body>
diff --git a/aclocal.m4 b/aclocal.m4
index 495e557..0805dc4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -20,51 +20,6 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl  (i.e. pass to gconftool-2
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl  you should install foo.schemas files
-dnl
-
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-  AC_ARG_WITH([gconf-source],
-	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-			     [Config database for installing schema files.]),
-	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-  AC_ARG_WITH([gconf-schema-file-dir],
-	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-			     [Directory for installing schema files.]),
-	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-
-  AC_ARG_ENABLE(schemas-install,
-  	AC_HELP_STRING([--disable-schemas-install],
-		       [Disable the schemas installation]),
-     [case ${enableval} in
-       yes|no) ;;
-       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-      esac])
-  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-])
-
 # gettext.m4 serial 66 (gettext-0.18.2)
 dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
diff --git a/config.h.in b/config.h.in
index a10f070..12de3cd 100644
--- a/config.h.in
+++ b/config.h.in
@@ -31,9 +31,6 @@
    */
 #undef HAVE_DCGETTEXT
 
-/* Use gconf2 */
-#undef HAVE_GCONF2
-
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
diff --git a/configure b/configure
index a4aaef4..d7b1a7c 100755
--- a/configure
+++ b/configure
@@ -673,10 +673,6 @@ ATASMART_FALSE
 ATASMART_TRUE
 ATASMART_LIBS
 ATASMART_CFLAGS
-GCONF_FALSE
-GCONF_TRUE
-GCONF_LIBS
-GCONF_CFLAGS
 GTK_FALSE
 GTK_TRUE
 GTK_LIBS
@@ -698,11 +694,6 @@ PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
 GSETTINGS_DISABLE_SCHEMAS_COMPILE
-GCONF_SCHEMAS_INSTALL_FALSE
-GCONF_SCHEMAS_INSTALL_TRUE
-GCONF_SCHEMA_FILE_DIR
-GCONF_SCHEMA_CONFIG_SOURCE
-GCONFTOOL
 POSUB
 LTLIBINTL
 LIBINTL
@@ -826,9 +817,6 @@ with_gnu_ld
 enable_rpath
 with_libiconv_prefix
 with_libintl_prefix
-with_gconf_source
-with_gconf_schema_file_dir
-enable_schemas_install
 enable_schemas_compile
 with_libatiadl
 with_gtop
@@ -852,8 +840,6 @@ XEXT_CFLAGS
 XEXT_LIBS
 GTK_CFLAGS
 GTK_LIBS
-GCONF_CFLAGS
-GCONF_LIBS
 ATASMART_CFLAGS
 ATASMART_LIBS
 LIBNOTIFY_CFLAGS
@@ -1497,8 +1483,6 @@ Optional Features:
   --disable-largefile     omit support for large files
   --disable-nls           do not use Native Language Support
   --disable-rpath         do not hardcode runtime library paths
-  --disable-schemas-install
-                          Disable the schemas installation
   --disable-schemas-compile
                           Disable regeneration of gschemas.compiled on install
 
@@ -1511,10 +1495,6 @@ Optional Packages:
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
-  --with-gconf-source=sourceaddress
-                          Config database for installing schema files.
-  --with-gconf-schema-file-dir=dir
-                          Directory for installing schema files.
   --with-libatiadl=DIR   use libatiadlxx in DIR
   --with-gtop=yes|no   use gtop
 
@@ -1539,9 +1519,6 @@ Some influential environment variables:
   XEXT_LIBS   linker flags for XEXT, overriding pkg-config
   GTK_CFLAGS  C compiler flags for GTK, overriding pkg-config
   GTK_LIBS    linker flags for GTK, overriding pkg-config
-  GCONF_CFLAGS
-              C compiler flags for GCONF, overriding pkg-config
-  GCONF_LIBS  linker flags for GCONF, overriding pkg-config
   ATASMART_CFLAGS
               C compiler flags for ATASMART, overriding pkg-config
   ATASMART_LIBS
@@ -7468,99 +7445,6 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
 
 
-# Gconf
-# Extract the first word of "gconftool-2", so it can be a program name with args.
-set dummy gconftool-2; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GCONFTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GCONFTOOL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-  ;;
-esac
-fi
-GCONFTOOL=$ac_cv_path_GCONFTOOL
-if test -n "$GCONFTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
-$as_echo "$GCONFTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-
-# Check whether --with-gconf-source was given.
-if test "${with_gconf_source+set}" = set; then :
-  withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
-fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
-$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-
-# Check whether --with-gconf-schema-file-dir was given.
-if test "${with_gconf_schema_file_dir+set}" = set; then :
-  withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
-fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
-
-  # Check whether --enable-schemas-install was given.
-if test "${enable_schemas_install+set}" = set; then :
-  enableval=$enable_schemas_install; case ${enableval} in
-       yes|no) ;;
-       *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
-      esac
-fi
-
-   if test "$enable_schemas_install" != no; then
-  GCONF_SCHEMAS_INSTALL_TRUE=
-  GCONF_SCHEMAS_INSTALL_FALSE='#'
-else
-  GCONF_SCHEMAS_INSTALL_TRUE='#'
-  GCONF_SCHEMAS_INSTALL_FALSE=
-fi
-
-
-
 # Gsettings
 
 
@@ -8172,93 +8056,6 @@ GTK_CFLAGS+=" -DGSEAL_ENABLE "
 
 
 
-# Check GCONF
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5
-$as_echo_n "checking for GCONF... " >&6; }
-
-if test -n "$GCONF_CFLAGS"; then
-    pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$GCONF_LIBS"; then
-    pkg_cv_GCONF_LIBS="$GCONF_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gconf-2.0" 2>&1`
-        else
-	        GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gconf-2.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GCONF_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gconf2 missing psensor will not be built\"" >&5
-$as_echo "$as_me: WARNING: \"gconf2 missing psensor will not be built\"" >&2;}
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gconf2 missing psensor will not be built\"" >&5
-$as_echo "$as_me: WARNING: \"gconf2 missing psensor will not be built\"" >&2;}
-else
-	GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
-	GCONF_LIBS=$pkg_cv_GCONF_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_GCONF2 1" >>confdefs.h
-
-fi
- if test -n "$GCONF_LIBS"; then
-  GCONF_TRUE=
-  GCONF_FALSE='#'
-else
-  GCONF_TRUE='#'
-  GCONF_FALSE=
-fi
-
-
-
-
 ### Optional
 
 # check libatasmart
@@ -9658,10 +9455,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
-  as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${X11_TRUE}" && test -z "${X11_FALSE}"; then
   as_fn_error $? "conditional \"X11\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -9674,10 +9467,6 @@ if test -z "${GTK_TRUE}" && test -z "${GTK_FALSE}"; then
   as_fn_error $? "conditional \"GTK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${GCONF_TRUE}" && test -z "${GCONF_FALSE}"; then
-  as_fn_error $? "conditional \"GCONF\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${ATASMART_TRUE}" && test -z "${ATASMART_FALSE}"; then
   as_fn_error $? "conditional \"ATASMART\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index fed2bd3..558ee1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,10 +38,6 @@ AC_CHECK_FUNCS([gettimeofday memmove socket strdup strtol])
 AM_GNU_GETTEXT_VERSION([0.16])
 AM_GNU_GETTEXT([external])
 
-# Gconf
-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-AM_GCONF_SOURCE_2
-
 # Gsettings
 GLIB_GSETTINGS
 
@@ -85,14 +81,6 @@ GTK_CFLAGS+=" -DGSEAL_ENABLE "
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
-# Check GCONF
-PKG_CHECK_MODULES(GCONF, gconf-2.0,
-	          [AC_DEFINE([HAVE_GCONF2],[1],[Use gconf2])],
-	          [AC_MSG_WARN("gconf2 missing psensor will not be built")])
-AM_CONDITIONAL(GCONF, test -n "$GCONF_LIBS")
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
-
 ### Optional
 
 # check libatasmart
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8beb9c4..869ab3c 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -126,11 +126,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/doc/faq.html b/doc/faq.html
index 14de278..9892943 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -750,7 +750,7 @@ more general, but can be configured to display sensors
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-07-23 14:38:36 CEST
+Last updated 2014-08-14 00:14:12 CEST
 </div>
 </div>
 </body>
diff --git a/icons/hicolor/14x14/Makefile.in b/icons/hicolor/14x14/Makefile.in
index 2f16038..ebadd0a 100644
--- a/icons/hicolor/14x14/Makefile.in
+++ b/icons/hicolor/14x14/Makefile.in
@@ -125,11 +125,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/icons/hicolor/16x16/Makefile.in b/icons/hicolor/16x16/Makefile.in
index 7a0245a..c444eee 100644
--- a/icons/hicolor/16x16/Makefile.in
+++ b/icons/hicolor/16x16/Makefile.in
@@ -125,11 +125,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/icons/hicolor/22x22/Makefile.in b/icons/hicolor/22x22/Makefile.in
index d0a9c67..fe576ab 100644
--- a/icons/hicolor/22x22/Makefile.in
+++ b/icons/hicolor/22x22/Makefile.in
@@ -125,11 +125,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/icons/hicolor/24x24/Makefile.in b/icons/hicolor/24x24/Makefile.in
index 9d06b82..1c54167 100644
--- a/icons/hicolor/24x24/Makefile.in
+++ b/icons/hicolor/24x24/Makefile.in
@@ -125,11 +125,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/icons/hicolor/32x32/Makefile.in b/icons/hicolor/32x32/Makefile.in
index 35d44c1..2a3477c 100644
--- a/icons/hicolor/32x32/Makefile.in
+++ b/icons/hicolor/32x32/Makefile.in
@@ -125,11 +125,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/icons/hicolor/48x48/Makefile.in b/icons/hicolor/48x48/Makefile.in
index cec29e9..a9c58ff 100644
--- a/icons/hicolor/48x48/Makefile.in
+++ b/icons/hicolor/48x48/Makefile.in
@@ -125,11 +125,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/icons/hicolor/64x64/Makefile.in b/icons/hicolor/64x64/Makefile.in
index 23c1f89..6293fd4 100644
--- a/icons/hicolor/64x64/Makefile.in
+++ b/icons/hicolor/64x64/Makefile.in
@@ -125,11 +125,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/icons/hicolor/scalable/Makefile.in b/icons/hicolor/scalable/Makefile.in
index bcb48b2..84c9fb8 100644
--- a/icons/hicolor/scalable/Makefile.in
+++ b/icons/hicolor/scalable/Makefile.in
@@ -125,11 +125,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/icons/ubuntu-mono-dark/apps/22/Makefile.in b/icons/ubuntu-mono-dark/apps/22/Makefile.in
index ab92085..803c432 100644
--- a/icons/ubuntu-mono-dark/apps/22/Makefile.in
+++ b/icons/ubuntu-mono-dark/apps/22/Makefile.in
@@ -125,11 +125,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/icons/ubuntu-mono-dark/status/22/Makefile.in b/icons/ubuntu-mono-dark/status/22/Makefile.in
index b75bc92..a300081 100644
--- a/icons/ubuntu-mono-dark/status/22/Makefile.in
+++ b/icons/ubuntu-mono-dark/status/22/Makefile.in
@@ -125,11 +125,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/icons/ubuntu-mono-light/status/22/Makefile.in b/icons/ubuntu-mono-light/status/22/Makefile.in
index 67e56e9..e7c0149 100644
--- a/icons/ubuntu-mono-light/status/22/Makefile.in
+++ b/icons/ubuntu-mono-light/status/22/Makefile.in
@@ -125,11 +125,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/src/Makefile.am b/src/Makefile.am
index 5fb2ac2..1dd2d52 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,6 @@ AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/unity \
 	$(GTK_CFLAGS)\
-	$(GCONF_CFLAGS)\
 	$(SENSORS_CFLAGS)
 
 DEFS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
@@ -24,20 +23,17 @@ DEFS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LIBS = \
 	lib/libpsensor.a \
 	$(GTK_LIBS)\
-	$(GCONF_LIBS)\
 	$(PTHREAD_LIBS)\
 	$(SENSORS_LIBS)
 
 if GTK
 if X11
 if XEXT
-if GCONF
 bin_PROGRAMS = psensor
 dist_man_MANS = psensor.1
 endif
 endif
 endif
-endif
 
 psensor_SOURCES = \
 	cfg.h cfg.c \
@@ -104,14 +100,6 @@ endif
 
 EXTRA_DIST = description.txt psensor.schemas
 
-if GCONF
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = psensor.schemas
-
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA)
-endif
-
 psensor.1: main.c $(top_srcdir)/configure.ac
 	$(MAKE) $(AM_MAKEFLAGS) psensor$(EXEEXT)
 	help2man --include=description.txt -N --name="Temperature monitoring application" --output=psensor.1 ./psensor$(EXEEXT)
diff --git a/src/Makefile.in b/src/Makefile.in
index a9359de..55d5eab 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -15,7 +15,6 @@
 
 @SET_MAKE@
 
-
 VPATH = @srcdir@
 am__make_dryrun = \
   { \
@@ -53,8 +52,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @JSON_TRUE@@LIBMICROHTTPD_TRUE@am__append_1 = server
-@GCONF_TRUE@@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@bin_PROGRAMS =  \
-@GCONF_TRUE@@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@	psensor$(EXEEXT)
+@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@bin_PROGRAMS = psensor$(EXEEXT)
 @GTOP_TRUE@am__append_2 = $(GTOP_CFLAGS)
 @GTOP_TRUE@am__append_3 = $(GTOP_LIBS)
 @LIBNOTIFY_TRUE@am__append_4 = ui_notify.h ui_notify.c
@@ -86,8 +84,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
-	"$(DESTDIR)$(schemadir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__psensor_SOURCES_DIST = cfg.h cfg.c notify_cmd.c notify_cmd.h \
 	graph.h graph.c main.c ui.h ui.c ui_appindicator.h ui_color.h \
@@ -160,7 +157,6 @@ am__uninstall_files_from_dir = { \
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(dist_man_MANS)
-DATA = $(schema_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -222,11 +218,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
@@ -258,10 +249,10 @@ LIBMICROHTTPD_LIBS = @LIBMICROHTTPD_LIBS@
 LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
 LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
 LIBOBJS = @LIBOBJS@
-LIBS = lib/libpsensor.a $(GTK_LIBS) $(GCONF_LIBS) $(PTHREAD_LIBS) \
-	$(SENSORS_LIBS) $(am__append_3) $(am__append_5) \
-	$(am__append_8) $(am__append_11) $(am__append_13) \
-	$(am__append_15) $(am__append_18) $(am__append_20)
+LIBS = lib/libpsensor.a $(GTK_LIBS) $(PTHREAD_LIBS) $(SENSORS_LIBS) \
+	$(am__append_3) $(am__append_5) $(am__append_8) \
+	$(am__append_11) $(am__append_13) $(am__append_15) \
+	$(am__append_18) $(am__append_20)
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -365,11 +356,11 @@ AM_LDFLAGS = -Wl,--as-needed -export-dynamic
 AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \
 	-DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \
 	-DDATADIR=\""$(datadir)"\" -I$(top_srcdir)/src/lib \
-	-I$(top_srcdir)/src/unity $(GTK_CFLAGS) $(GCONF_CFLAGS) \
-	$(SENSORS_CFLAGS) $(am__append_2) $(am__append_6) \
-	$(am__append_9) $(am__append_10) $(am__append_12) \
-	$(am__append_14) $(am__append_17) $(am__append_21)
-@GCONF_TRUE@@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@dist_man_MANS = psensor.1
+	-I$(top_srcdir)/src/unity $(GTK_CFLAGS) $(SENSORS_CFLAGS) \
+	$(am__append_2) $(am__append_6) $(am__append_9) \
+	$(am__append_10) $(am__append_12) $(am__append_14) \
+	$(am__append_17) $(am__append_21)
+@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@dist_man_MANS = psensor.1
 psensor_SOURCES = cfg.h cfg.c notify_cmd.c notify_cmd.h graph.h \
 	graph.c main.c ui.h ui.c ui_appindicator.h ui_color.h \
 	ui_color.c ui_graph.h ui_graph.c ui_pref.h ui_pref.c \
@@ -378,8 +369,6 @@ psensor_SOURCES = cfg.h cfg.c notify_cmd.c notify_cmd.h graph.h \
 	$(am__append_4) $(am__append_7) $(am__append_16) \
 	$(am__append_19)
 EXTRA_DIST = $(gsettings_SCHEMAS)
-@GCONF_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR)
-@GCONF_TRUE@schema_DATA = psensor.schemas
 gsettings_SCHEMAS = psensor.gschema.xml
 all: all-recursive
 
@@ -538,27 +527,6 @@ uninstall-man1:
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-schemaDATA: $(schema_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(schemadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(schemadir)" || 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)$(schemadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \
-	done
-
-uninstall-schemaDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -765,10 +733,10 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
+all-am: Makefile $(PROGRAMS) $(MANS)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(schemadir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -801,7 +769,6 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@GCONF_FALSE@install-data-local:
 clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -824,7 +791,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-data-local install-man install-schemaDATA
+install-data-am: install-man
 
 install-dvi: install-dvi-recursive
 
@@ -869,7 +836,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-man uninstall-schemaDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-man
 
 uninstall-man: uninstall-man1
 
@@ -881,21 +848,17 @@ uninstall-man: uninstall-man1
 	clean-generic ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-pdf \
-	install-pdf-am install-ps install-ps-am install-schemaDATA \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-man uninstall-man1 \
-	uninstall-schemaDATA
-
-
-@GCONF_TRUE@install-data-local:
-@GCONF_TRUE@	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA)
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-binPROGRAMS uninstall-man \
+	uninstall-man1
+
 
 psensor.1: main.c $(top_srcdir)/configure.ac
 	$(MAKE) $(AM_MAKEFLAGS) psensor$(EXEEXT)
diff --git a/src/cfg.c b/src/cfg.c
index 1218129..42e5701 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -110,7 +110,6 @@ static const char *KEY_SLOG_INTERVAL = "slog-interval";
 /* Path to the script called when a notification is raised */
 static const char *KEY_NOTIFICATION_SCRIPT = "notif-script";
 
-static GConfClient *client;
 static GSettings *settings;
 
 static char *user_dir;
@@ -119,6 +118,8 @@ static GKeyFile *key_file;
 
 static char *sensor_config_path;
 
+static void (*slog_enabled_cbk)(void *);
+
 static char *get_string(const char *key)
 {
 	return g_settings_get_string(settings, key);
@@ -278,19 +279,26 @@ static void set_slog_enabled(bool enabled)
 	set_bool(KEY_SLOG_ENABLED, enabled);
 }
 
-void config_slog_enabled_notify_add(GConfClientNotifyFunc cbk, void *data)
+static void slog_enabled_changed_cbk(GSettings *settings,
+				     gchar *key,
+				     gpointer data)
 {
-	log_debug("config_slog_enabled_notify_add");
-	gconf_client_add_dir(client,
-			     KEY_SLOG_ENABLED,
-			     GCONF_CLIENT_PRELOAD_NONE,
-			     NULL);
-	gconf_client_notify_add(client,
-				KEY_SLOG_ENABLED,
-				cbk,
-				data,
-				NULL,
-				NULL);
+	if (slog_enabled_cbk)
+		slog_enabled_cbk(data);
+}
+
+void config_set_slog_enabled_changed_cbk(void (*cbk)(void *), void *data)
+{
+	log_fct_enter();
+
+	slog_enabled_cbk = cbk;
+
+	g_signal_connect_after(settings,
+			       "changed::slog-enabled",
+			       G_CALLBACK(slog_enabled_changed_cbk),
+			       data);
+
+	log_fct_exit();
 }
 
 int config_get_slog_interval()
@@ -326,14 +334,8 @@ static void set_window_keep_below_enabled(bool enabled)
 	set_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, enabled);
 }
 
-/*
- * Initializes the GConf client.
- */
 static void init()
 {
-	if (!client)
-		client = gconf_client_get_default();
-
 	if (!settings)
 		settings = g_settings_new("psensor");
 }
@@ -342,11 +344,6 @@ void config_cleanup()
 {
 	config_sync();
 
-	if (client) {
-		g_object_unref(client);
-		client = NULL;
-	}
-
 	if (settings) {
 		g_settings_sync();
 		g_object_unref(settings);
@@ -367,6 +364,8 @@ void config_cleanup()
 		free(sensor_config_path);
 		sensor_config_path = NULL;
 	}
+
+	slog_enabled_cbk = NULL;
 }
 
 struct config *config_load()
diff --git a/src/cfg.h b/src/cfg.h
index b5982de..6dcbca5 100644
--- a/src/cfg.h
+++ b/src/cfg.h
@@ -19,8 +19,6 @@
 #ifndef _PSENSOR_CONFIG_H_
 #define _PSENSOR_CONFIG_H_
 
-#include <gconf/gconf-client.h>
-
 #include <bool.h>
 #include <color.h>
 
@@ -108,8 +106,8 @@ void config_set_appindicator_enabled(const char *, bool);
 bool config_is_appindicator_label_enabled(const char *);
 void config_set_appindicator_label_enabled(const char *, bool);
 
-void config_slog_enabled_notify_add(GConfClientNotifyFunc cbk, void *data);
 bool is_slog_enabled();
+void config_set_slog_enabled_changed_cbk(void (*)(void *), void *);
 
 int config_get_slog_interval();
 
diff --git a/src/glade/Makefile.in b/src/glade/Makefile.in
index 6611f8e..bfc5c71 100644
--- a/src/glade/Makefile.in
+++ b/src/glade/Makefile.in
@@ -125,11 +125,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index f81cc57..818b594 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -141,11 +141,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/src/lib/slog.c b/src/lib/slog.c
index 7174ba4..15ccd0b 100644
--- a/src/lib/slog.c
+++ b/src/lib/slog.c
@@ -134,7 +134,7 @@ static void slog_write_sensors(struct psensor **sensors)
 	bool first_call;
 
 	if (!file) {
-		log_err(_("Sensor log file not open."));
+		log_debug(_("Sensor log file not open."));
 		return ;
 	}
 
diff --git a/src/server/Makefile.in b/src/server/Makefile.in
index e93f762..af2648d 100644
--- a/src/server/Makefile.in
+++ b/src/server/Makefile.in
@@ -151,11 +151,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/src/ui.c b/src/ui.c
index 967f31e..6876600 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -152,8 +152,7 @@ void ui_enable_alpha_channel(struct ui_psensor *ui)
 	}
 }
 
-static void
-slog_enabled_cbk(GConfClient *client, guint id, GConfEntry *e, gpointer data)
+static void slog_enabled_cbk(void *data)
 {
 	struct ui_psensor *ui;
 	struct psensor **sensors;
@@ -203,7 +202,7 @@ void ui_window_create(struct ui_psensor *ui)
 				cfg->window_x,
 				cfg->window_y);
 
-	config_slog_enabled_notify_add(slog_enabled_cbk, ui);
+	config_set_slog_enabled_changed_cbk(slog_enabled_cbk, ui);
 
 	gtk_window_set_default_size(GTK_WINDOW(window),
 				    cfg->window_w,
diff --git a/tests/Makefile.in b/tests/Makefile.in
index abf3230..7c2de3c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -147,11 +147,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
diff --git a/www/Makefile.in b/www/Makefile.in
index 5cb9f10..b4098f2 100644
--- a/www/Makefile.in
+++ b/www/Makefile.in
@@ -125,11 +125,6 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
-- 
2.7.4

