From 583da46b8caf4b2a8b548b03c38fe0e84164abfb Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 9 Nov 2012 07:49:07 -0500
Subject: Replace e_ensure_type() with g_type_ensure().

---
 shell/main.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'shell/main.c')

diff --git a/shell/main.c b/shell/main.c
index d71e499dba..e1237cccbd 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -436,17 +436,6 @@ create_default_shell (void)
 	return shell;
 }
 
-/* this workarounds https://bugzilla.gnome.org/show_bug.cgi?id=683548
-   and is a replacement of g_type_ensure(), which is part of GLib 2.34,
-   on which Evolution doesn't depend yet
-*/
-static void
-e_ensure_type (GType type)
-{
-	if (G_UNLIKELY (type == (GType) -1))
-		g_warning ("can't happen");
-}
-
 gint
 main (gint argc,
       gchar **argv)
@@ -658,7 +647,7 @@ main (gint argc,
 
 	/* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=683548 */
 	if (!quit)
-		e_ensure_type (WEBKIT_TYPE_WEB_VIEW);
+		g_type_ensure (WEBKIT_TYPE_WEB_VIEW);
 
 	shell = create_default_shell ();
 	if (!shell)
-- 
cgit v1.2.3