[epiphany] g_type_init is no longer mandatory in GObject

[Xan Lopez <xan src gnome org>]

commit 5f8520e28a0e3c9cef9a95b4d933d65c66daf76a
Author: Xan Lopez <xan igalia com>
Date:   Fri Oct 19 14:22:33 2012 +0200

    g_type_init is no longer mandatory in GObject

 configure.ac                |    2 +-
 doc/reference/Makefile.am   |    5 +----
 lib/ephy-profile-migrator.c |    2 --
 3 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index dd3d826..259467b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,7 +82,7 @@ if test "$enable_maintainer_mode" = "yes"; then
 	DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE"
 fi
 
-GLIB_REQUIRED=2.31.2
+GLIB_REQUIRED=2.35.0
 GTK_REQUIRED=3.5.2
 LIBXML_REQUIRED=2.6.12
 LIBXSLT_REQUIRED=1.1.7
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 2988327..2963dc0 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -9,9 +9,6 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # documenting functions and macros.
 DOC_SOURCE_DIR=../..
 
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS="--type-init-func=g_type_init()"
-
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS=
 
@@ -169,7 +166,7 @@ scan-build.stamp: $(HFILE_GLOB)
 	@echo '*** Scanning header files ***'
 	@-chmod -R u+w $(srcdir)
 	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
 	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \
diff --git a/lib/ephy-profile-migrator.c b/lib/ephy-profile-migrator.c
index 9acafd7..2f915e3 100644
--- a/lib/ephy-profile-migrator.c
+++ b/lib/ephy-profile-migrator.c
@@ -903,8 +903,6 @@ main (int argc, char *argv[])
   GError *error = NULL;
   EphyFileHelpersFlags file_helpers_flags = EPHY_FILE_HELPERS_NONE;
 
-  g_type_init ();
-
   option_group = g_option_group_new ("ephy-profile-migrator",
                                      N_("Epiphany profile migrator"),
                                      N_("Epiphany profile migrator options"),