[eog] Remove unneeded GConf schemas



commit e98adab7da3209c9f193d0df019d5516f82ed967
Author: Felix Riemann <friemann gnome org>
Date:   Wed Jul 28 22:00:05 2010 +0200

    Remove unneeded GConf schemas
    
    They wont't be used anymore.

 configure.ac        |   13 +--
 data/Makefile.am    |   17 ---
 data/eog.schemas.in |  274 ---------------------------------------------------
 3 files changed, 3 insertions(+), 301 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a7200b6..5260fa0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -325,19 +325,12 @@ if test "x$have_lcms" = "xyes" || test "$gdk_target" = "x11"; then
 	fi
 fi
 
-# *****
-# GConf
-# *****
+# *********
+# GSettings
+# *********
 
-AM_GCONF_SOURCE_2
 GLIB_GSETTINGS
 
-AC_PATH_PROG([GCONFTOOL], [gconftool-2], [no])
-
-if test "$GCONFTOOL" = "no"; then
-        AC_MSG_ERROR([gconftool-2 not found])
-fi
-
 # ************
 # Sun Keyboard
 # ************
diff --git a/data/Makefile.am b/data/Makefile.am
index 02243f4..00b8e99 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,8 +8,6 @@ DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
 
- INTLTOOL_SCHEMAS_RULE@
-
 gsettings_SCHEMAS = org.gnome.eog.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
@@ -18,10 +16,6 @@ gsettings_SCHEMAS = org.gnome.eog.gschema.xml
 gsettingsconvertdir = $(datadir)/GConf/gsettings
 gsettingsconvert_DATA = eog.convert
 
-schemas_in_files = eog.schemas.in
-schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-
 gladedir = $(pkgdatadir)
 glade_DATA = eog-image-properties-dialog.ui \
 	     eog-multiple-save-as-dialog.ui \
@@ -40,26 +34,15 @@ pkgconfig_DATA = eog.pc
 gtkrcdir = $(pkgdatadir)
 gtkrc_DATA = gtkrc
 
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	if test -z "$(DESTDIR)" ; then \
-	for p in $(schemas_DATA) ; do \
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p >&1 > /dev/null; \
-	done \
-	fi
-endif
-
 EXTRA_DIST =			\
         $(gtkrc_DATA)		\
         $(glade_DATA)		\
         $(DESKTOP_IN_FILES)	\
-        $(schemas_in_files)	\
 	eog.convert		\
 	$(UI_FILES)
 
 DISTCLEANFILES = 		\
         $(DESKTOP_FILES)        \
-	$(schemas_DATA)		\
         $(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]