[gnome-settings-daemon] Remove calls to g_type_init(), bump GLib required version

[Colin Walters <walters src gnome org>]

commit 1bb777166c3f52baa9af00c403fa8b3c23e6028f
Author: Colin Walters <walters verbum org>
Date:   Mon Oct 29 11:40:34 2012 -0400

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

 configure.ac                                    |    2 +-
 gnome-settings-daemon/main.c                    |    2 --
 plugins/automount/gnome-fallback-mount-helper.c |    1 -
 plugins/power/gsd-backlight-helper.c            |    3 ---
 plugins/print-notifications/gsd-printer.c       |    2 --
 plugins/smartcard/gsd-smartcard-manager.c       |    2 --
 plugins/wacom/gsd-wacom-led-helper.c            |    2 --
 plugins/xsettings/fontconfig-monitor.c          |    2 --
 plugins/xsettings/test-gtk-modules.c            |    2 --
 9 files changed, 1 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e1cb862..7ebefe0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ dnl ---------------------------------------------------------------------------
 dnl - Dependencies
 dnl ---------------------------------------------------------------------------
 
-GLIB_REQUIRED_VERSION=2.31.0
+GLIB_REQUIRED_VERSION=2.35.0
 GIO_REQUIRED_VERSION=${GLIB_REQUIRED_VERSION}
 GTK_REQUIRED_VERSION=3.3.18
 GCONF_REQUIRED_VERSION=2.6.1
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
index 86be40d..33d088a 100644
--- a/gnome-settings-daemon/main.c
+++ b/gnome-settings-daemon/main.c
@@ -445,8 +445,6 @@ main (int argc, char *argv[])
 
         parse_args (&argc, &argv);
 
-        g_type_init ();
-
         gnome_settings_profile_start ("opening gtk display");
         if (! gtk_init_check (NULL, NULL)) {
                 g_warning ("Unable to initialize GTK+");
diff --git a/plugins/automount/gnome-fallback-mount-helper.c b/plugins/automount/gnome-fallback-mount-helper.c
index 4a52ba0..2ed08ed 100644
--- a/plugins/automount/gnome-fallback-mount-helper.c
+++ b/plugins/automount/gnome-fallback-mount-helper.c
@@ -36,7 +36,6 @@ main (int argc,
         GsdAutomountManager *manager;
         GError *error = NULL;
 
-        g_type_init ();
         gtk_init (&argc, &argv);
 
         bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR);
diff --git a/plugins/power/gsd-backlight-helper.c b/plugins/power/gsd-backlight-helper.c
index 9ccfba3..753335c 100644
--- a/plugins/power/gsd-backlight-helper.c
+++ b/plugins/power/gsd-backlight-helper.c
@@ -143,9 +143,6 @@ main (int argc, char *argv[])
 		{ NULL}
 	};
 
-	/* setup type system */
-	g_type_init ();
-
 	context = g_option_context_new (NULL);
 	g_option_context_set_summary (context, "GNOME Settings Daemon Backlight Helper");
 	g_option_context_add_main_entries (context, options, NULL);
diff --git a/plugins/print-notifications/gsd-printer.c b/plugins/print-notifications/gsd-printer.c
index 26dbb6d..c985d0d 100644
--- a/plugins/print-notifications/gsd-printer.c
+++ b/plugins/print-notifications/gsd-printer.c
@@ -1302,8 +1302,6 @@ main (int argc, char *argv[])
   npn_owner_id = 0;
   pdi_owner_id = 0;
 
-  g_type_init ();
-
   notify_init ("gnome-settings-daemon-printer");
 
   npn_introspection_data =
diff --git a/plugins/smartcard/gsd-smartcard-manager.c b/plugins/smartcard/gsd-smartcard-manager.c
index 03c8f79..3acef0e 100644
--- a/plugins/smartcard/gsd-smartcard-manager.c
+++ b/plugins/smartcard/gsd-smartcard-manager.c
@@ -1484,8 +1484,6 @@ main (int   argc,
         g_log_set_always_fatal (G_LOG_LEVEL_ERROR
                                 | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
 
-        g_type_init ();
-
         g_message ("creating instance of 'smartcard manager' object...");
         manager = gsd_smartcard_manager_new (NULL);
         g_message ("'smartcard manager' object created successfully");
diff --git a/plugins/wacom/gsd-wacom-led-helper.c b/plugins/wacom/gsd-wacom-led-helper.c
index e98bf55..d5c6176 100644
--- a/plugins/wacom/gsd-wacom-led-helper.c
+++ b/plugins/wacom/gsd-wacom-led-helper.c
@@ -108,8 +108,6 @@ int main (int argc, char **argv)
 		return 1;
 	}
 
-	g_type_init ();
-
 	context = g_option_context_new (NULL);
 	g_option_context_set_summary (context, "GNOME Settings Daemon Wacom LED Helper");
 	g_option_context_add_main_entries (context, options, NULL);
diff --git a/plugins/xsettings/fontconfig-monitor.c b/plugins/xsettings/fontconfig-monitor.c
index bfb15ed..81bf15a 100644
--- a/plugins/xsettings/fontconfig-monitor.c
+++ b/plugins/xsettings/fontconfig-monitor.c
@@ -180,8 +180,6 @@ main (void)
 {
         GMainLoop *loop;
 
-        g_type_init ();
-
         fontconfig_monitor_start ((GFunc) yay, NULL);
 
         loop = g_main_loop_new (NULL, TRUE);
diff --git a/plugins/xsettings/test-gtk-modules.c b/plugins/xsettings/test-gtk-modules.c
index 21fcee8..ef83fc3 100644
--- a/plugins/xsettings/test-gtk-modules.c
+++ b/plugins/xsettings/test-gtk-modules.c
@@ -18,8 +18,6 @@ int main (int argc, char **argv)
 	GMainLoop *loop;
 	GsdXSettingsGtk *gtk;
 
-	g_type_init ();
-
 	gtk = gsd_xsettings_gtk_new ();
         g_signal_connect (G_OBJECT (gtk), "notify::gtk-modules",
 			  G_CALLBACK (gtk_modules_callback), NULL);