[nautilus] all: remove deprecated g_type_init()



commit 98e5c66258dfd65f6140d40e007917b3762c15b8
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Oct 26 11:57:16 2012 -0400

    all: remove deprecated g_type_init()
    
    Now that we depend on GLib master anyway.

 docs/reference/libnautilus-extension/Makefile.am |    3 ---
 src/nautilus-convert-metadata.c                  |    2 --
 src/nautilus-main.c                              |    2 --
 src/nautilus-shell-search-provider.c             |    2 --
 4 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/docs/reference/libnautilus-extension/Makefile.am b/docs/reference/libnautilus-extension/Makefile.am
index 5e69b07..ac77ea4 100644
--- a/docs/reference/libnautilus-extension/Makefile.am
+++ b/docs/reference/libnautilus-extension/Makefile.am
@@ -15,9 +15,6 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 # e.g. DOC_SOURCE_DIR=../../../libnautilus-extension
 DOC_SOURCE_DIR=$(top_srcdir)/libnautilus-extension
 
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
-
 # Extra options to supply to gtkdoc-mkdb.
 MKDB_OPTIONS=--sgml-mode --output-format=xml
 
diff --git a/src/nautilus-convert-metadata.c b/src/nautilus-convert-metadata.c
index cf9053a..3fb642c 100644
--- a/src/nautilus-convert-metadata.c
+++ b/src/nautilus-convert-metadata.c
@@ -299,8 +299,6 @@ main (int argc, char *argv[])
 	GError *error = NULL;
 	int i;
 
-	g_type_init ();
-
 	context = g_option_context_new ("<nautilus metadata files> - convert nautilus metadata");
 	g_option_context_add_main_entries (context, entries, NULL);
 	if (!g_option_context_parse (context, &argc, &argv, &error)) {
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index bcab09b..81f578c 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -75,8 +75,6 @@ main (int argc, char *argv[])
 	mallopt (M_MMAP_THRESHOLD, 128 *1024);
 #endif
 
-	g_type_init ();
-
 	/* This will be done by gtk+ later, but for now, force it to GNOME */
 	g_desktop_app_info_set_desktop_env ("GNOME");
 
diff --git a/src/nautilus-shell-search-provider.c b/src/nautilus-shell-search-provider.c
index f33c6ec..e45b2f3 100644
--- a/src/nautilus-shell-search-provider.c
+++ b/src/nautilus-shell-search-provider.c
@@ -832,8 +832,6 @@ nautilus_shell_search_provider_app_class_init (NautilusShellSearchProviderAppCla
 static GApplication *
 nautilus_shell_search_provider_app_new (void)
 {
-  g_type_init ();
-
   return g_object_new (nautilus_shell_search_provider_app_get_type (),
                        NULL);
 }



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