[gnome-games] Comment out gsettings code



commit d95af9f52325f279a8cd2008e56268294e2dc55d
Author: Christian Persch <chpe gnome org>
Date:   Sun Jun 27 20:11:47 2010 +0200

    Comment out gsettings code
    
    ... it doesn't build with newest glib, and is still unused.

 configure.in                 |   31 ++++---------------------------
 libgames-support/Makefile.am |   24 ++++++++----------------
 2 files changed, 12 insertions(+), 43 deletions(-)
---
diff --git a/configure.in b/configure.in
index 1d17935..5f4accc 100644
--- a/configure.in
+++ b/configure.in
@@ -565,38 +565,15 @@ PKG_CHECK_MODULES([GTK],[gtk+-$GTK_API_VERSION >= $GTK_REQUIRED])
 AC_SUBST([GTK_CFLAGS])
 AC_SUBST([GTK_LIBS])
 
-# GSettings
-
-PKG_CHECK_MODULES([GIO],[gio-2.0 >= $GIO_REQUIRED],
-[
-  have_gio_2_26=yes
-
-  GCONF_REQUIRED=2.31.1
+# GDBus
 
-  AC_ARG_ENABLE([schemas-install],
-    [AS_HELP_STRING([--disable-schemas-install],
-                    [Disable installation of GSettings schemas])],
-    [],[enable_schemas_install=yes])
+PKG_CHECK_MODULES([GIO],[gio-2.0 >= $GIO_REQUIRED],[have_gio_2_26=yes],[have_gio_2_26=no])
 
-  AC_SUBST([GLIB_COMPILE_SCHEMAS],["$($PKG_CONFIG --variable glib_compile_schemas gio-2.0)]")
-
-  if test -z "$LSB_DISTRIBUTOR" -o -z "$LSB_DISTRIBUTION"; then
-    AC_MSG_WARN([couldn't determine the distribution information using lsb_release; PackageKit integration disabled])
-    have_gio_2_26=no
-  fi
-],[
-  have_gio_2_26=no
-  enable_schemas_install=no
-
-  if test "$need_gio_2_26" = "yes"; then
-    AC_MSG_ERROR([GIO >= 2.25 is required but was not found])
-  fi
-])
+# GSettings
 
 AM_CONDITIONAL([HAVE_GIO_2_26],[test "$have_gio_2_26" = "yes"])
 
-AC_SUBST([gsettingsschemadir],['${datadir}/glib-2.0/schemas'])
-AM_CONDITIONAL([GSETTINGS_SCHEMAS_INSTALL],[test "$enable_schemas_install" = "yes"])
+# GLIB_GSETTINGS([],[:])
 
 # Check for GNOME modules
 
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index 79ec0ab..65647d4 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -50,12 +50,12 @@ libgames_support_la_SOURCES +=		\
 	$(NULL)
 endif # !HAVE_HILDON
 
-if HAVE_GIO_2_26
-libgames_support_la_SOURCES += \
-	games-settings.c \
-	games-settings.h \
-	$(NULL)
-endif
+# if HAVE_GIO_2_26
+# libgames_support_la_SOURCES += \
+# 	games-settings.c \
+# 	games-settings.h \
+# 	$(NULL)
+# endif
 
 if LIBGAMES_SUPPORT_FULL
 libgames_support_la_SOURCES +=		\
@@ -156,9 +156,7 @@ libgames_support_la_LIBADD += $(HILDON_LIBS)
 endif
 
 gsettingsschema_in_files = org.gnome.Games.WindowState.gschema.xml.in
-if HAVE_GIO_2_26
-nodist_gsettingsschema_DATA = $(gsettingsschema_in_files:.gschema.xml.in=.gschema.xml)
-endif
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.gschema.xml.in=.gschema.xml)
 
 stamp_files = \
 	stamp-games-marshal.c \
@@ -239,13 +237,7 @@ CLEANFILES += GnomeGamesSupport-1.0.gir $(typelibs_DATA)
 
 endif # HAVE_INTROSPECTION
 
-install-data-hook:
-if GSETTINGS_SCHEMAS_INSTALL
-	if test -z "$(DESTDIR)"; then \
-		$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) ; \
-	fi
-endif # GSETTINGS_SCHEMAS_INSTALL
-
 @INTLTOOL_XML_NOMERGE_RULE@
+# @GSETTINGS_RULES@
 
 -include $(top_srcdir)/git.mk



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