[gvfs] Remove calls to g_type_init(), bump GLib required version

From: Colin Walters <walters src gnome org>
To: commits-list gnome org
Cc:
Subject: [gvfs] Remove calls to g_type_init(), bump GLib required version
Date: Wed, 31 Oct 2012 14:28:34 +0000 (UTC)
commit ed24477ecdcf137276e9b7e89be70a819854a423
Author: Colin Walters <walters verbum org>
Date:   Tue Oct 30 18:47:24 2012 -0400

    Remove calls to g_type_init(), bump GLib required version
    
    See http://git.gnome.org/browse/glib/commit/?id=2002479c02fa6e468fc3f67ddc663657a52ebde8
    
    https://bugzilla.gnome.org/show_bug.cgi?id=687236

 client/gvfsfusedaemon.c                      |    2 --
 configure.ac                                 |    2 +-
 daemon/daemon-main.c                         |    2 --
 daemon/main.c                                |    1 -
 metadata/meta-daemon.c                       |    2 --
 metadata/meta-set.c                          |    2 --
 monitor/proxy/gvfsproxyvolumemonitordaemon.c |    2 --
 programs/gvfs-cat.c                          |    2 --
 programs/gvfs-copy.c                         |    2 --
 programs/gvfs-info.c                         |    2 --
 programs/gvfs-ls.c                           |    2 --
 programs/gvfs-mime.c                         |    2 --
 programs/gvfs-mkdir.c                        |    2 --
 programs/gvfs-monitor-dir.c                  |    2 --
 programs/gvfs-monitor-file.c                 |    2 --
 programs/gvfs-mount.c                        |    2 --
 programs/gvfs-move.c                         |    2 --
 programs/gvfs-open.c                         |    2 --
 programs/gvfs-rename.c                       |    2 --
 programs/gvfs-rm.c                           |    2 --
 programs/gvfs-save.c                         |    2 --
 programs/gvfs-set-attribute.c                |    2 --
 programs/gvfs-trash.c                        |    2 --
 programs/gvfs-tree.c                         |    2 --
 test/benchmark-common.c                      |    1 -
 test/benchmark-gvfs-big-files.c              |    2 --
 test/benchmark-gvfs-small-files.c            |    2 --
 test/benchmark-posix-big-files.c             |    2 --
 test/benchmark-posix-small-files.c           |    2 --
 test/test-query-info-stream.c                |    2 --
 30 files changed, 1 insertions(+), 57 deletions(-)
---
diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
index 450c690..503ec0b 100644
--- a/client/gvfsfusedaemon.c
+++ b/client/gvfsfusedaemon.c
@@ -2454,7 +2454,5 @@ static struct fuse_operations vfs_oper =
 gint
 main (gint argc, gchar *argv [])
 {
-  g_type_init ();
-
   return fuse_main (argc, argv, &vfs_oper, NULL /* user data */);
 }
diff --git a/configure.ac b/configure.ac
index ff5e92b..e96706d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ GTK_DOC_CHECK
 DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.33.12 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 )
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.35.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 )
 
 PKG_CHECK_MODULES(DBUS, dbus-1)
 
diff --git a/daemon/daemon-main.c b/daemon/daemon-main.c
index f4c3073..38a41e9 100644
--- a/daemon/daemon-main.c
+++ b/daemon/daemon-main.c
@@ -66,8 +66,6 @@ daemon_init (void)
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
   
-  g_type_init ();
-
   g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, log_debug, NULL);
 
 #ifdef SIGPIPE
diff --git a/daemon/main.c b/daemon/main.c
index f565f41..1661442 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -175,7 +175,6 @@ main (int argc, char *argv[])
 
   g_option_context_free (context);
 
-  g_type_init ();
   loop = g_main_loop_new (NULL, FALSE);
 
   daemon = g_vfs_daemon_new (TRUE, replace);
diff --git a/metadata/meta-daemon.c b/metadata/meta-daemon.c
index d925a82..ce34b73 100644
--- a/metadata/meta-daemon.c
+++ b/metadata/meta-daemon.c
@@ -479,8 +479,6 @@ main (int argc, char *argv[])
 
   g_option_context_free (context);
 
-  g_type_init ();
-
   loop = g_main_loop_new (NULL, FALSE);
 
   error = NULL;
diff --git a/metadata/meta-set.c b/metadata/meta-set.c
index e8bc125..be35a32 100644
--- a/metadata/meta-set.c
+++ b/metadata/meta-set.c
@@ -31,8 +31,6 @@ main (int argc,
   char *tree_path;
   GVfsMetadata *proxy;
   
-  g_type_init();
-  
   context = g_option_context_new ("<path> <key> <value> - set metadata");
   g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
   if (!g_option_context_parse (context, &argc, &argv, &error))
diff --git a/monitor/proxy/gvfsproxyvolumemonitordaemon.c b/monitor/proxy/gvfsproxyvolumemonitordaemon.c
index e059370..95eea49 100644
--- a/monitor/proxy/gvfsproxyvolumemonitordaemon.c
+++ b/monitor/proxy/gvfsproxyvolumemonitordaemon.c
@@ -1873,8 +1873,6 @@ g_vfs_proxy_volume_monitor_daemon_init (void)
   bindtextdomain (GETTEXT_PACKAGE, GVFS_LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
-
-  g_type_init ();
 }
 
 
diff --git a/programs/gvfs-cat.c b/programs/gvfs-cat.c
index dbf01db..45cdd42 100644
--- a/programs/gvfs-cat.c
+++ b/programs/gvfs-cat.c
@@ -138,8 +138,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   param = g_strdup_printf (("%s..."), _("FILE"));
   /* Translators: this message will appear after the usage string */
   /* and before the list of options.                              */
diff --git a/programs/gvfs-copy.c b/programs/gvfs-copy.c
index 1d36c4e..c77b4ef 100644
--- a/programs/gvfs-copy.c
+++ b/programs/gvfs-copy.c
@@ -115,8 +115,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = g_strdup_printf ("%s... %s", _("SOURCE"), _("DEST"));
   summary = _("Copy one or more files from SOURCE to DEST.");
diff --git a/programs/gvfs-info.c b/programs/gvfs-info.c
index 6e915c5..8085272 100644
--- a/programs/gvfs-info.c
+++ b/programs/gvfs-info.c
@@ -369,8 +369,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = g_strdup_printf ("[%s...]", _("LOCATION"));
   summary = _("Show information about locations.");
diff --git a/programs/gvfs-ls.c b/programs/gvfs-ls.c
index b15cf91..aca6a9f 100644
--- a/programs/gvfs-ls.c
+++ b/programs/gvfs-ls.c
@@ -391,8 +391,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = g_strdup_printf ("[%s...]", _("LOCATION"));
   summary = _("List the contents of the locations.");
diff --git a/programs/gvfs-mime.c b/programs/gvfs-mime.c
index f8bef15..22f6d39 100644
--- a/programs/gvfs-mime.c
+++ b/programs/gvfs-mime.c
@@ -76,8 +76,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = g_strdup_printf ("%s [%s]", _("MIMETYPE"), _("HANDLER"));
   summary = _("Get or set the handler for a mime-type.");
diff --git a/programs/gvfs-mkdir.c b/programs/gvfs-mkdir.c
index 1112f91..3eccd3f 100644
--- a/programs/gvfs-mkdir.c
+++ b/programs/gvfs-mkdir.c
@@ -51,8 +51,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = g_strdup_printf ("[%s...]", _("LOCATION"));
   summary = _("Create directories.");
diff --git a/programs/gvfs-monitor-dir.c b/programs/gvfs-monitor-dir.c
index 4fd7586..54a9213 100644
--- a/programs/gvfs-monitor-dir.c
+++ b/programs/gvfs-monitor-dir.c
@@ -106,8 +106,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = g_strdup_printf ("[%s...]", _("LOCATION"));
   summary = _("Monitor directories for changes.");
diff --git a/programs/gvfs-monitor-file.c b/programs/gvfs-monitor-file.c
index 43671cf..1fe396f 100644
--- a/programs/gvfs-monitor-file.c
+++ b/programs/gvfs-monitor-file.c
@@ -105,8 +105,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = g_strdup_printf ("[%s...]", _("LOCATION"));
   summary = _("Monitor files for changes.");
diff --git a/programs/gvfs-mount.c b/programs/gvfs-mount.c
index 2addcee..68e9267 100644
--- a/programs/gvfs-mount.c
+++ b/programs/gvfs-mount.c
@@ -1043,8 +1043,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = g_strdup_printf ("[%s...]", _("LOCATION"));
   summary = _("Mount the locations.");
diff --git a/programs/gvfs-move.c b/programs/gvfs-move.c
index 2a4c081..81b3d93 100644
--- a/programs/gvfs-move.c
+++ b/programs/gvfs-move.c
@@ -103,8 +103,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = g_strdup_printf ("%s... %s", _("SOURCE"), _("DEST"));
   summary = _("Move one or more files from SOURCE to DEST.");
diff --git a/programs/gvfs-open.c b/programs/gvfs-open.c
index 0ec1b7c..0dcfccd 100644
--- a/programs/gvfs-open.c
+++ b/programs/gvfs-open.c
@@ -56,8 +56,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   param = g_strdup_printf ("%s...", _("FILE"));
   /* Translators: this message will appear after the usage string */
   /* and before the list of options.                              */
diff --git a/programs/gvfs-rename.c b/programs/gvfs-rename.c
index 26c08ba..f4a1648 100644
--- a/programs/gvfs-rename.c
+++ b/programs/gvfs-rename.c
@@ -58,8 +58,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = g_strdup_printf ("%s %s", _("LOCATION"), _("NEW-NAME"));
   summary = _("Rename a file.");
diff --git a/programs/gvfs-rm.c b/programs/gvfs-rm.c
index ef3f231..81af713 100644
--- a/programs/gvfs-rm.c
+++ b/programs/gvfs-rm.c
@@ -52,8 +52,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = g_strdup_printf ("[%s...]", _("FILE"));
   summary = _("Delete the given files.");
diff --git a/programs/gvfs-save.c b/programs/gvfs-save.c
index d73c1fa..16c8c97 100644
--- a/programs/gvfs-save.c
+++ b/programs/gvfs-save.c
@@ -159,8 +159,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = _("DEST");
   summary = _("Read from standard input and save to DEST.");
diff --git a/programs/gvfs-set-attribute.c b/programs/gvfs-set-attribute.c
index 5814c41..f593184 100644
--- a/programs/gvfs-set-attribute.c
+++ b/programs/gvfs-set-attribute.c
@@ -133,8 +133,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = g_strdup_printf ("%s %s %s...", _("LOCATION"), _("ATTRIBUTE"), _("VALUE"));
   summary = _("Set a file attribute of LOCATION.");
diff --git a/programs/gvfs-trash.c b/programs/gvfs-trash.c
index 11a30dc..4654f21 100644
--- a/programs/gvfs-trash.c
+++ b/programs/gvfs-trash.c
@@ -51,8 +51,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = g_strdup_printf ("[%s...]", _("LOCATION"));
   summary = _("Move files or directories to the trash.");
diff --git a/programs/gvfs-tree.c b/programs/gvfs-tree.c
index cf8f1ab..8e18f77 100644
--- a/programs/gvfs-tree.c
+++ b/programs/gvfs-tree.c
@@ -242,8 +242,6 @@ main (int argc, char *argv[])
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_type_init ();
-
   error = NULL;
   param = g_strdup_printf ("[%s...]", _("LOCATION"));
   summary = _("List contents of directories in a tree-like format.");
diff --git a/test/benchmark-common.c b/test/benchmark-common.c
index 5d6ded4..06492e4 100644
--- a/test/benchmark-common.c
+++ b/test/benchmark-common.c
@@ -159,7 +159,6 @@ benchmark_end (void)
 static void
 benchmark_begin (const gchar *name)
 {
-  g_type_init ();
   g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_ERROR);
   main_loop = g_main_loop_new (NULL, FALSE);
 }
diff --git a/test/benchmark-gvfs-big-files.c b/test/benchmark-gvfs-big-files.c
index 0ca8c47..875a9a6 100644
--- a/test/benchmark-gvfs-big-files.c
+++ b/test/benchmark-gvfs-big-files.c
@@ -154,8 +154,6 @@ benchmark_run (gint argc, gchar *argv [])
   
   setlocale (LC_ALL, "");
 
-  g_type_init ();
-  
   if (argc < 2)
     {
       g_printerr ("Usage: %s <scratch URI>\n", argv [0]);
diff --git a/test/benchmark-gvfs-small-files.c b/test/benchmark-gvfs-small-files.c
index db41d82..a93906a 100644
--- a/test/benchmark-gvfs-small-files.c
+++ b/test/benchmark-gvfs-small-files.c
@@ -154,8 +154,6 @@ benchmark_run (gint argc, gchar *argv [])
   
   setlocale (LC_ALL, "");
 
-  g_type_init ();
-  
   if (argc < 2)
     {
       g_printerr ("Usage: %s <scratch URI>\n", argv [0]);
diff --git a/test/benchmark-posix-big-files.c b/test/benchmark-posix-big-files.c
index 9157de6..7dbad46 100644
--- a/test/benchmark-posix-big-files.c
+++ b/test/benchmark-posix-big-files.c
@@ -157,8 +157,6 @@ benchmark_run (gint argc, gchar *argv [])
   
   setlocale (LC_ALL, "");
 
-  g_type_init ();
-  
   if (argc < 2)
     {
       g_printerr ("Usage: %s <scratch path>\n", argv [0]);
diff --git a/test/benchmark-posix-small-files.c b/test/benchmark-posix-small-files.c
index 3b48370..9e94236 100644
--- a/test/benchmark-posix-small-files.c
+++ b/test/benchmark-posix-small-files.c
@@ -157,8 +157,6 @@ benchmark_run (gint argc, gchar *argv [])
   
   setlocale (LC_ALL, "");
 
-  g_type_init ();
-  
   if (argc < 2)
     {
       g_printerr ("Usage: %s <scratch path>\n", argv [0]);
diff --git a/test/test-query-info-stream.c b/test/test-query-info-stream.c
index da79c31..c3a1c3e 100644
--- a/test/test-query-info-stream.c
+++ b/test/test-query-info-stream.c
@@ -208,8 +208,6 @@ main (int argc, char *argv[])
   guchar start;
   gboolean do_create_file;
   
-  g_type_init ();
-
   do_create_file = FALSE;
   
   if (argc > 1)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]