diff options
| -rw-r--r-- | pango/pangocairo-fontmap.c | 8 | ||||
| -rw-r--r-- | pango/pangoft2-fontmap.c | 5 | ||||
| -rw-r--r-- | pango/pangowin32-fontmap.c | 5 | ||||
| -rw-r--r-- | pango/pangoxft-fontmap.c | 5 | ||||
| -rw-r--r-- | tests/test-pangocairo-threads.c | 4 | ||||
| -rw-r--r-- | utils/pango-list.c | 3 | ||||
| -rw-r--r-- | utils/viewer-main.c | 3 |
7 files changed, 0 insertions, 33 deletions
diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index 177dbbce..dce640e3 100644 --- a/pango/pangocairo-fontmap.c +++ b/pango/pangocairo-fontmap.c @@ -76,10 +76,6 @@ pango_cairo_font_map_new (void) const char *backend = getenv ("PANGOCAIRO_BACKEND"); if (backend && !*backend) backend = NULL; -#if !GLIB_CHECK_VERSION (2, 35, 3) - /* Make sure that the type system is initialized */ - g_type_init (); -#endif #if defined(HAVE_CORE_TEXT) && defined (HAVE_CAIRO_QUARTZ) if (!backend || 0 == strcmp (backend, "coretext")) return g_object_new (PANGO_TYPE_CAIRO_CORE_TEXT_FONT_MAP, NULL); @@ -131,10 +127,6 @@ pango_cairo_font_map_new (void) PangoFontMap * pango_cairo_font_map_new_for_font_type (cairo_font_type_t fonttype) { -#if !GLIB_CHECK_VERSION (2, 35, 3) - /* Make sure that the type system is initialized */ - g_type_init (); -#endif switch ((int) fonttype) { #if defined(HAVE_CORE_TEXT) && defined (HAVE_CAIRO_QUARTZ) diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 617def07..60ca3e79 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -142,11 +142,6 @@ pango_ft2_font_map_finalize (GObject *object) PangoFontMap * pango_ft2_font_map_new (void) { -#if !GLIB_CHECK_VERSION (2, 35, 3) - /* Make sure that the type system is initialized */ - g_type_init (); -#endif - return (PangoFontMap *) g_object_new (PANGO_TYPE_FT2_FONT_MAP, NULL); } diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index 0cf8f5a0..130b76e9 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -796,11 +796,6 @@ _pango_win32_font_map_class_init (PangoWin32FontMapClass *class) PangoFontMap * pango_win32_font_map_for_display (void) { -#if !GLIB_CHECK_VERSION (2, 35, 3) - /* Make sure that the type system is initialized */ - g_type_init (); -#endif - if (g_once_init_enter ((gsize*)&default_fontmap)) g_once_init_leave((gsize*)&default_fontmap, (gsize)g_object_new (PANGO_TYPE_WIN32_FONT_MAP, NULL)); diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c index fd96816d..674e006b 100644 --- a/pango/pangoxft-fontmap.c +++ b/pango/pangoxft-fontmap.c @@ -234,11 +234,6 @@ pango_xft_get_font_map (Display *display, if (fontmap) return fontmap; -#if !GLIB_CHECK_VERSION (2, 35, 3) - /* Make sure that the type system is initialized */ - g_type_init (); -#endif - xftfontmap = (PangoXftFontMap *)g_object_new (PANGO_TYPE_XFT_FONT_MAP, NULL); xftfontmap->display = display; diff --git a/tests/test-pangocairo-threads.c b/tests/test-pangocairo-threads.c index 6462a0ea..cdbd2419 100644 --- a/tests/test-pangocairo-threads.c +++ b/tests/test-pangocairo-threads.c @@ -78,10 +78,6 @@ main (int argc, char **argv) if (argc > 2) num_iters = atoi (argv[2]); -#if !GLIB_CHECK_VERSION (2, 35, 3) - g_type_init(); -#endif - g_mutex_lock (&mutex); for (i = 0; i < num_threads; i++) diff --git a/utils/pango-list.c b/utils/pango-list.c index 6f80b521..642b09fc 100644 --- a/utils/pango-list.c +++ b/utils/pango-list.c @@ -33,9 +33,6 @@ main (int argc, int n_families; int i, j, k; -#if !GLIB_CHECK_VERSION (2, 35, 3) - g_type_init(); -#endif g_set_prgname ("pango-list"); /* Use PangoCairo to get default fontmap so it works on every platform. */ diff --git a/utils/viewer-main.c b/utils/viewer-main.c index 525599a7..537a012d 100644 --- a/utils/viewer-main.c +++ b/utils/viewer-main.c @@ -47,9 +47,6 @@ main (int argc, int width, height; gpointer surface; -#if !GLIB_CHECK_VERSION (2, 35, 3) - g_type_init(); -#endif g_set_prgname ("pango-view"); setlocale (LC_ALL, ""); parse_options (argc, argv); |