applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use gconf macros.

Browse source 
Sun Dec  9 19:24:47 2001  Jonathan Blandford  <jrb@redhat.com>

	* configure.in: use gconf macros.
This commit is contained in:
Jonathan Blandford 2001-12-10 05:31:44 +00:00 • committed by Jonathan Blandford
parent 757434ab94
commit f6f9711f6f
4 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sun Dec 9 19:24:47 2001 Jonathan Blandford <jrb@redhat.com>
* configure.in: use gconf macros.
Sat Dec 8 21:33:10 2001 Jonathan Blandford <jrb@redhat.com>
* gnome-settings-daemon/gnome-settings-daemon.c (main): Import

15
configure.in
View file

@ -86,20 +86,13 @@ dnl ==============================================
dnl Special GConf section
dnl ==============================================
dnl Specify the gconf configuration source,
dnl default to xml::$(sysconfdir)/gconf/gconf.xml.defaults
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
GCONF_CONFIG_SOURCE=
AC_ARG_ENABLE(gconf-source, [ --enable-gconf-source=sourceaddress Where to install schema files.],GCONF_CONFIG_SOURCE=$enable_gconf_source,)
if test "x$GCONF_CONFIG_SOURCE" = "x"; then
GCONF_CONFIG_SOURCE="xml::\${sysconfdir}/gconf/gconf.xml.defaults"
if test x"$GCONFTOOL" = xno; then
AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
fi
AC_SUBST(GCONF_CONFIG_SOURCE)
AC_SUBST(INSTALL_GCONF_CONFIG_SOURCE)
AM_GCONF_SOURCE_2
dnl ==============================================
dnl Define the main variables

8
gnome-settings-daemon/gnome-settings-xsettings.c
View file

@ -42,13 +42,13 @@ translate_string_string (TranslationEntry *trans,
}
static TranslationEntry translations [] = {
{ "/desktop/standard/double-click-time", "Net/DoubleClickTime", GCONF_VALUE_INT,
{ "/desktop/gnome/double-click-time", "Net/DoubleClickTime", GCONF_VALUE_INT,
translate_int_int },
{ "/desktop/gtk/gtk-color-palette", "Gtk/ColorPalette", GCONF_VALUE_STRING,
{ "/desktop/gnome/gtk-color-palette", "Gtk/ColorPalette", GCONF_VALUE_STRING,
translate_string_string },
{ "/desktop/gtk/gtk-toolbar-style", "Gtk/ToolbarStyle", GCONF_VALUE_STRING,
{ "/desktop/gnome/gtk-toolbar-style", "Gtk/ToolbarStyle", GCONF_VALUE_STRING,
translate_string_string },
{ "/desktop/gtk/gtk-toolbar-icon-size", "Gtk/ToolbarIconSize", GCONF_VALUE_STRING,
{ "/desktop/gnome/gtk-toolbar-icon-size", "Gtk/ToolbarIconSize", GCONF_VALUE_STRING,
translate_string_string }
};

6
schemas/Makefile.am
View file

@ -1,7 +1,5 @@
schemadir = $(sysconfdir)/gconf/schemas
schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_DATA = peripherals.schemas
##FIXME: s/gconftool/$(GCONFTOOL) sometime
install-data-local:
GCONF_CONFIG_SOURCE=$(GCONF_CONFIG_SOURCE) gconftool --makefile-install-rule $(srcdir)/$(schema_DATA)
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)