diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-11-09 20:49:07 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-11-09 20:49:07 +0800 |
| commit | 583da46b8caf4b2a8b548b03c38fe0e84164abfb (patch) | |
| tree | d04c3f946c3b5965a6edb0f566454d72b7bbc5b1 /shell | |
| parent | f8e346731c87cddef5c6610432f960105157b011 (diff) | |
| download | gsoc2013-evolution-583da46b8caf4b2a8b548b03c38fe0e84164abfb.tar gsoc2013-evolution-583da46b8caf4b2a8b548b03c38fe0e84164abfb.tar.gz gsoc2013-evolution-583da46b8caf4b2a8b548b03c38fe0e84164abfb.tar.bz2 gsoc2013-evolution-583da46b8caf4b2a8b548b03c38fe0e84164abfb.tar.lz gsoc2013-evolution-583da46b8caf4b2a8b548b03c38fe0e84164abfb.tar.xz gsoc2013-evolution-583da46b8caf4b2a8b548b03c38fe0e84164abfb.tar.zst gsoc2013-evolution-583da46b8caf4b2a8b548b03c38fe0e84164abfb.zip | |
Replace e_ensure_type() with g_type_ensure().
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/main.c | 13 |
1 files changed, 1 insertions, 12 deletions
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) |