From d2f164cd7274d08103c74314f24e98cd818dbfab Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Fri, 20 Jul 2012 13:38:27 +0000 Subject: [PATCH] added gconf schema. (LP: #1026807) --- Makefile.in | 3 + NEWS | 1 + configure | 116 ++++++++++++++++++++++++++ configure.ac | 9 ++ icons/hicolor/14x14/Makefile.in | 3 + icons/hicolor/16x16/Makefile.in | 3 + icons/hicolor/22x22/Makefile.in | 3 + icons/hicolor/24x24/Makefile.in | 3 + icons/hicolor/32x32/Makefile.in | 3 + icons/hicolor/48x48/Makefile.in | 3 + icons/hicolor/64x64/Makefile.in | 3 + icons/hicolor/scalable/Makefile.in | 3 + icons/ubuntu-mono-dark/apps/22/Makefile.in | 3 + icons/ubuntu-mono-dark/status/22/Makefile.in | 3 + icons/ubuntu-mono-light/status/22/Makefile.in | 3 + po/de.po | 5 +- po/fr.po | 5 +- po/hu.po | 5 +- po/it.po | 5 +- po/lv.po | 5 +- po/psensor.pot | 5 +- po/pt_BR.po | 5 +- po/ru.po | 5 +- po/sl.po | 5 +- po/sr.po | 5 +- po/tr.po | 5 +- po/uk.po | 5 +- po/zh_CN.po | 5 +- src/Makefile.am | 11 ++- src/Makefile.in | 66 +++++++++++---- src/glade/Makefile.in | 3 + src/lib/Makefile.in | 3 + src/server/Makefile.in | 3 + tests/Makefile.in | 3 + www/Makefile.in | 3 + 35 files changed, 262 insertions(+), 57 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5f8a151..7e683fa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -162,8 +162,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/NEWS b/NEWS index 270ec39..1a9cda5 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ * v0.7.0.2 ** psensor: added latvian translation file. +** psensor: added gconf schema. (LP: #1026807) * v0.7.0.1 diff --git a/configure b/configure index 3b50131..f4201f5 100755 --- a/configure +++ b/configure @@ -659,6 +659,11 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG SENSORS_LIBS +GCONF_SCHEMAS_INSTALL_FALSE +GCONF_SCHEMAS_INSTALL_TRUE +GCONF_SCHEMA_FILE_DIR +GCONF_SCHEMA_CONFIG_SOURCE +GCONFTOOL POSUB LTLIBINTL LIBINTL @@ -778,6 +783,9 @@ with_gnu_ld enable_rpath with_libiconv_prefix with_libintl_prefix +with_gconf_source +with_gconf_schema_file_dir +enable_schemas_install with_libatiadl with_gtop ' @@ -1446,6 +1454,8 @@ Optional Features: --enable-dependency-tracking do not reject slow dependency extractors --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths + --disable-schemas-install + Disable the schemas installation Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1456,6 +1466,10 @@ 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 @@ -6934,6 +6948,104 @@ $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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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"$GCONFTOOL" = xno; then + as_fn_error $? "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5 +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 + + + ############### common # Checks sensors, required by psensor and psensor-server @@ -8732,6 +8844,10 @@ 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 "${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 7e84f9f..9cd2deb 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,15 @@ 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) + +if test x"$GCONFTOOL" = xno; then + AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) +fi + +AM_GCONF_SOURCE_2 + ############### common # Checks sensors, required by psensor and psensor-server diff --git a/icons/hicolor/14x14/Makefile.in b/icons/hicolor/14x14/Makefile.in index 2403634..8c6b0c3 100644 --- a/icons/hicolor/14x14/Makefile.in +++ b/icons/hicolor/14x14/Makefile.in @@ -101,8 +101,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/icons/hicolor/16x16/Makefile.in b/icons/hicolor/16x16/Makefile.in index 9e37052..240e004 100644 --- a/icons/hicolor/16x16/Makefile.in +++ b/icons/hicolor/16x16/Makefile.in @@ -101,8 +101,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/icons/hicolor/22x22/Makefile.in b/icons/hicolor/22x22/Makefile.in index e6ca41b..fca9524 100644 --- a/icons/hicolor/22x22/Makefile.in +++ b/icons/hicolor/22x22/Makefile.in @@ -101,8 +101,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/icons/hicolor/24x24/Makefile.in b/icons/hicolor/24x24/Makefile.in index e212b73..bb0842d 100644 --- a/icons/hicolor/24x24/Makefile.in +++ b/icons/hicolor/24x24/Makefile.in @@ -101,8 +101,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/icons/hicolor/32x32/Makefile.in b/icons/hicolor/32x32/Makefile.in index 5da3fea..9a1f704 100644 --- a/icons/hicolor/32x32/Makefile.in +++ b/icons/hicolor/32x32/Makefile.in @@ -101,8 +101,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/icons/hicolor/48x48/Makefile.in b/icons/hicolor/48x48/Makefile.in index bd44a90..d62bf1a 100644 --- a/icons/hicolor/48x48/Makefile.in +++ b/icons/hicolor/48x48/Makefile.in @@ -101,8 +101,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/icons/hicolor/64x64/Makefile.in b/icons/hicolor/64x64/Makefile.in index e828acb..ddaaf42 100644 --- a/icons/hicolor/64x64/Makefile.in +++ b/icons/hicolor/64x64/Makefile.in @@ -101,8 +101,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/icons/hicolor/scalable/Makefile.in b/icons/hicolor/scalable/Makefile.in index 8cea7fc..7c858a8 100644 --- a/icons/hicolor/scalable/Makefile.in +++ b/icons/hicolor/scalable/Makefile.in @@ -101,8 +101,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/icons/ubuntu-mono-dark/apps/22/Makefile.in b/icons/ubuntu-mono-dark/apps/22/Makefile.in index f001a4b..64e515e 100644 --- a/icons/ubuntu-mono-dark/apps/22/Makefile.in +++ b/icons/ubuntu-mono-dark/apps/22/Makefile.in @@ -101,8 +101,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/icons/ubuntu-mono-dark/status/22/Makefile.in b/icons/ubuntu-mono-dark/status/22/Makefile.in index bdb00b7..2a5538c 100644 --- a/icons/ubuntu-mono-dark/status/22/Makefile.in +++ b/icons/ubuntu-mono-dark/status/22/Makefile.in @@ -101,8 +101,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/icons/ubuntu-mono-light/status/22/Makefile.in b/icons/ubuntu-mono-light/status/22/Makefile.in index fbec8d6..0c48b9f 100644 --- a/icons/ubuntu-mono-light/status/22/Makefile.in +++ b/icons/ubuntu-mono-light/status/22/Makefile.in @@ -101,8 +101,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/po/de.po b/po/de.po index bfcf77f..a1544e9 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-07-18 02:05+0200\n" +"POT-Creation-Date: 2012-07-20 12:13+0200\n" "PO-Revision-Date: 2012-06-09 17:45+0000\n" "Last-Translator: Daniel Winzen \n" "Language-Team: German\n" @@ -239,8 +239,7 @@ msgstr "" msgid "Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:53 -#: tests/test_psensor_type_to_unit_str.c:54 +#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "U/min" diff --git a/po/fr.po b/po/fr.po index 2f14f3e..ef33ece 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-07-18 02:05+0200\n" +"POT-Creation-Date: 2012-07-20 12:13+0200\n" "PO-Revision-Date: 2012-05-13 18:15+0000\n" "Last-Translator: jeanfi \n" "Language-Team: French <>\n" @@ -241,8 +241,7 @@ msgstr "Impossible d'ouvrir la connexion au serveur X11." msgid "Failed to retrieve NVIDIA information." msgstr "Échec de la récupération des information NVIDIA." -#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:53 -#: tests/test_psensor_type_to_unit_str.c:54 +#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" diff --git a/po/hu.po b/po/hu.po index 224e718..9415b25 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-07-18 02:05+0200\n" +"POT-Creation-Date: 2012-07-20 12:13+0200\n" "PO-Revision-Date: 2012-07-09 17:56+0000\n" "Last-Translator: Richard Somlói \n" "Language-Team: Hungarian \n" @@ -240,8 +240,7 @@ msgstr "Nem lehet létrehozni a kapcsolatot az X11 kiszolgálóval." msgid "Failed to retrieve NVIDIA information." msgstr "NVIDIA információinak lekérése meghiúsult." -#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:53 -#: tests/test_psensor_type_to_unit_str.c:54 +#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" diff --git a/po/it.po b/po/it.po index 6a29647..08ca42a 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-07-18 02:05+0200\n" +"POT-Creation-Date: 2012-07-20 12:13+0200\n" "PO-Revision-Date: 2012-04-28 16:28+0000\n" "Last-Translator: \n" "Language-Team: Italian\n" @@ -238,8 +238,7 @@ msgstr "" msgid "Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:53 -#: tests/test_psensor_type_to_unit_str.c:54 +#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" diff --git a/po/lv.po b/po/lv.po index 04a842e..ce09b34 100644 --- a/po/lv.po +++ b/po/lv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-07-18 02:05+0200\n" +"POT-Creation-Date: 2012-07-20 12:13+0200\n" "PO-Revision-Date: 2012-07-15 16:16+0000\n" "Last-Translator: tuxmaniack \n" "Language-Team: Latvian \n" @@ -239,8 +239,7 @@ msgstr "" msgid "Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:53 -#: tests/test_psensor_type_to_unit_str.c:54 +#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" diff --git a/po/psensor.pot b/po/psensor.pot index 3deebb8..42b0a11 100644 --- a/po/psensor.pot +++ b/po/psensor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-07-18 02:05+0200\n" +"POT-Creation-Date: 2012-07-20 12:13+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -237,8 +237,7 @@ msgstr "" msgid "Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:53 -#: tests/test_psensor_type_to_unit_str.c:54 +#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2cad5ed..38da51a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-07-18 02:05+0200\n" +"POT-Creation-Date: 2012-07-20 12:13+0200\n" "PO-Revision-Date: 2012-06-25 13:26+0000\n" "Last-Translator: Rafael Neri \n" "Language-Team: Brazilian Portuguese\n" @@ -239,8 +239,7 @@ msgstr "" msgid "Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:53 -#: tests/test_psensor_type_to_unit_str.c:54 +#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" diff --git a/po/ru.po b/po/ru.po index 1972fa4..ed99d2f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-07-18 02:05+0200\n" +"POT-Creation-Date: 2012-07-20 12:13+0200\n" "PO-Revision-Date: 2012-05-13 18:15+0000\n" "Last-Translator: jeanfi \n" "Language-Team: Russian\n" @@ -239,8 +239,7 @@ msgstr "Ошибка открытия соединения к серверу X11 msgid "Failed to retrieve NVIDIA information." msgstr "Ошибка получения информации NVIDIA." -#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:53 -#: tests/test_psensor_type_to_unit_str.c:54 +#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "об/мин" diff --git a/po/sl.po b/po/sl.po index 515510d..3b37f93 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-07-18 02:05+0200\n" +"POT-Creation-Date: 2012-07-20 12:13+0200\n" "PO-Revision-Date: 2012-04-14 21:02+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Slovenian \n" @@ -238,8 +238,7 @@ msgstr "" msgid "Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:53 -#: tests/test_psensor_type_to_unit_str.c:54 +#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" diff --git a/po/sr.po b/po/sr.po index 65baeb6..609ade3 100644 --- a/po/sr.po +++ b/po/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-07-18 02:05+0200\n" +"POT-Creation-Date: 2012-07-20 12:13+0200\n" "PO-Revision-Date: 2012-05-03 02:31+0000\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" @@ -239,8 +239,7 @@ msgstr "" msgid "Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:53 -#: tests/test_psensor_type_to_unit_str.c:54 +#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" diff --git a/po/tr.po b/po/tr.po index 6b80dec..2db6116 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-07-18 02:05+0200\n" +"POT-Creation-Date: 2012-07-20 12:13+0200\n" "PO-Revision-Date: 2012-04-28 11:24+0000\n" "Last-Translator: zeugma \n" "Language-Team: Turkish \n" @@ -238,8 +238,7 @@ msgstr "" msgid "Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:53 -#: tests/test_psensor_type_to_unit_str.c:54 +#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" diff --git a/po/uk.po b/po/uk.po index fbd19dd..26d120f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-07-18 02:05+0200\n" +"POT-Creation-Date: 2012-07-20 12:13+0200\n" "PO-Revision-Date: 2012-05-13 18:15+0000\n" "Last-Translator: Ilya Volchanetskiy \n" "Language-Team: Ukrainian \n" @@ -239,8 +239,7 @@ msgstr "" msgid "Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:53 -#: tests/test_psensor_type_to_unit_str.c:54 +#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "об/хв" diff --git a/po/zh_CN.po b/po/zh_CN.po index 948d9cd..4750327 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-07-18 02:05+0200\n" +"POT-Creation-Date: 2012-07-20 12:13+0200\n" "PO-Revision-Date: 2012-06-14 07:28+0000\n" "Last-Translator: Wang Dianjin \n" "Language-Team: Chinese (simplified)\n" @@ -239,8 +239,7 @@ msgstr "无法打开到 X11 服务器的连接。" msgid "Failed to retrieve NVIDIA information." msgstr "无法获取 NVIDIA 信息。" -#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:53 -#: tests/test_psensor_type_to_unit_str.c:54 +#: src/lib/psensor.c:466 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "转速" diff --git a/src/Makefile.am b/src/Makefile.am index e21d7fc..c3641a3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -86,7 +86,16 @@ endif endif dist_man_MANS = psensor.1 -EXTRA_DIST = description.txt +EXTRA_DIST = description.txt psensor.schemas + +schemadir = $(GCONF_SCHEMA_FILE_DIR) +schema_in_files = psensor.schemas.in +schema_DATA = psensor.schemas + +if GCONF_SCHEMAS_INSTALL +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) diff --git a/src/Makefile.in b/src/Makefile.in index 6723430..48fca43 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -67,7 +68,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ + "$(DESTDIR)$(schemadir)" PROGRAMS = $(bin_PROGRAMS) am__psensor_SOURCES_DIST = compat.h cfg.h cfg.c graph.h graph.c main.c \ ui.h ui.c ui_appindicator.h ui_color.h ui_color.c ui_graph.h \ @@ -133,6 +135,7 @@ 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=) \ @@ -192,8 +195,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ @@ -334,7 +340,10 @@ psensor_SOURCES = compat.h cfg.h cfg.c graph.h graph.c main.c ui.h \ $(am__append_4) $(am__append_7) $(am__append_16) \ $(am__append_19) dist_man_MANS = psensor.1 -EXTRA_DIST = description.txt +EXTRA_DIST = description.txt psensor.schemas +schemadir = $(GCONF_SCHEMA_FILE_DIR) +schema_in_files = psensor.schemas.in +schema_DATA = psensor.schemas all: all-recursive .SUFFIXES: @@ -480,6 +489,24 @@ 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) + test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" + @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ + 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. @@ -689,10 +716,10 @@ distdir: $(DISTFILES) done check-am: all-am check: check-recursive -all-am: Makefile $(PROGRAMS) $(MANS) +all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(schemadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -725,6 +752,7 @@ 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_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic mostlyclean-am @@ -747,7 +775,7 @@ info: info-recursive info-am: -install-data-am: install-man +install-data-am: install-data-local install-man install-schemaDATA install-dvi: install-dvi-recursive @@ -792,7 +820,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-man +uninstall-am: uninstall-binPROGRAMS uninstall-man uninstall-schemaDATA uninstall-man: uninstall-man1 @@ -804,17 +832,21 @@ 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-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 - + 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_SCHEMAS_INSTALL_TRUE@install-data-local: +@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA) psensor.1: main.c $(top_srcdir)/configure.ac $(MAKE) $(AM_MAKEFLAGS) psensor$(EXEEXT) diff --git a/src/glade/Makefile.in b/src/glade/Makefile.in index 1efcb45..c9d9045 100644 --- a/src/glade/Makefile.in +++ b/src/glade/Makefile.in @@ -101,8 +101,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 2bf1592..bf5a7f9 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -116,8 +116,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/src/server/Makefile.in b/src/server/Makefile.in index 4e920ca..2e4e8ad 100644 --- a/src/server/Makefile.in +++ b/src/server/Makefile.in @@ -127,8 +127,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/tests/Makefile.in b/tests/Makefile.in index 284b279..80af5b0 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -117,8 +117,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/www/Makefile.in b/www/Makefile.in index 1da37e0..a47bce6 100644 --- a/www/Makefile.in +++ b/www/Makefile.in @@ -101,8 +101,11 @@ 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@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ -- 2.7.4