[gnome-settings-daemon] Revert "plugins: Work-around startup deadlock"

[Bastien Nocera <hadess src gnome org>]

commit e0f230ce6124fac47bc0810d30ff78ec327152ca
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Mar 28 12:04:46 2017 +0200

    Revert "plugins: Work-around startup deadlock"
    
    This reverts commit e5c6735c6b9ed4fc6466d3ea1aac3838ffbb6695 as
    the fix is now in GLib/GIO proper.
    
    This requires a newer GLib version though.
    
    See https://bugzilla.gnome.org/show_bug.cgi?id=674885#c78

 configure.ac                         |    2 +-
 plugins/common/daemon-skeleton-gtk.h |    4 ----
 plugins/common/daemon-skeleton.h     |    4 ----
 3 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ff6ebb3..0b5c4b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ dnl ---------------------------------------------------------------------------
 dnl - Dependencies
 dnl ---------------------------------------------------------------------------
 
-GLIB_REQUIRED_VERSION=2.44.0
+GLIB_REQUIRED_VERSION=2.53.0
 GIO_REQUIRED_VERSION=${GLIB_REQUIRED_VERSION}
 GTK_REQUIRED_VERSION=3.15.3
 GCONF_REQUIRED_VERSION=2.6.1
diff --git a/plugins/common/daemon-skeleton-gtk.h b/plugins/common/daemon-skeleton-gtk.h
index d68ad37..631362e 100644
--- a/plugins/common/daemon-skeleton-gtk.h
+++ b/plugins/common/daemon-skeleton-gtk.h
@@ -198,10 +198,6 @@ main (int argc, char **argv)
 
         set_empty_gtk_theme (TRUE);
 
-        /* Work around https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
-        g_type_ensure (G_TYPE_DBUS_CONNECTION);
-        g_type_ensure (G_TYPE_DBUS_PROXY);
-
         gdk_set_allowed_backends ("x11");
 
         error = NULL;
diff --git a/plugins/common/daemon-skeleton.h b/plugins/common/daemon-skeleton.h
index dedfd61..7c93ced 100644
--- a/plugins/common/daemon-skeleton.h
+++ b/plugins/common/daemon-skeleton.h
@@ -174,10 +174,6 @@ main (int argc, char **argv)
         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
         textdomain (GETTEXT_PACKAGE);
 
-        /* Work around https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
-        g_type_ensure (G_TYPE_DBUS_CONNECTION);
-        g_type_ensure (G_TYPE_DBUS_PROXY);
-
         context = g_option_context_new (NULL);
         g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
         if (!g_option_context_parse (context, &argc, &argv, &error)) {