diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-07-04 16:25:39 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-07-04 16:25:39 +0000 |
| commit | 87bef09bfd0978b947ac1421d3717dae48579f68 (patch) | |
| tree | e9d8424853c321cee5c97ecf2b3867e473fca359 /utils | |
| parent | 9eff435d13228cf57d951673220ca569392fd803 (diff) | |
| parent | 9077d7fb83fbc09f777a3d482d6c7ad60f1d786a (diff) | |
| download | pango-87bef09bfd0978b947ac1421d3717dae48579f68.tar.gz | |
Merge branch 'kill-gtype-init' into 'master'
Drop g_type_init calls
See merge request GNOME/pango!60
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/pango-list.c | 3 | ||||
| -rw-r--r-- | utils/viewer-main.c | 3 |
2 files changed, 0 insertions, 6 deletions
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); |