diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-11 17:19:59 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-07 13:49:43 +0000 |
| commit | e3d4c2977fbf086e7d42c77e3713e1bcddda2a9c (patch) | |
| tree | 6b9bd0fb1a069796367724a31e822797129febd7 /telepathy-glib | |
| parent | 4480d2b9f5bb72c8acf0e9f712c6f8346a174f91 (diff) | |
| download | telepathy-glib-e3d4c2977fbf086e7d42c77e3713e1bcddda2a9c.tar.gz | |
Stop calling g_type_init()
It was deprecated in GLib 2.36, and we already have a hard dependency
on that version.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71048
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Diffstat (limited to 'telepathy-glib')
| -rw-r--r-- | telepathy-glib/errors.c | 1 | ||||
| -rw-r--r-- | telepathy-glib/run.c | 2 | ||||
| -rw-r--r-- | telepathy-glib/simple-client-factory.c | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/telepathy-glib/errors.c b/telepathy-glib/errors.c index bc045b5be..358f3130d 100644 --- a/telepathy-glib/errors.c +++ b/telepathy-glib/errors.c @@ -335,7 +335,6 @@ tp_error_quark (void) * "tp-error-quark" */ GQuark domain = g_quark_from_static_string ("tp_errors"); - g_type_init (); dbus_g_error_domain_register (domain, TP_ERROR_PREFIX, TP_TYPE_ERROR); g_once_init_leave (&quark, domain); diff --git a/telepathy-glib/run.c b/telepathy-glib/run.c index c3df19037..1b3393caf 100644 --- a/telepathy-glib/run.c +++ b/telepathy-glib/run.c @@ -219,8 +219,6 @@ tp_run_connection_manager (const char *prog_name, add_signal_handlers (); - g_type_init (); - g_set_prgname (prog_name); #ifdef ENABLE_BACKTRACE diff --git a/telepathy-glib/simple-client-factory.c b/telepathy-glib/simple-client-factory.c index c096ea040..0060b9d0a 100644 --- a/telepathy-glib/simple-client-factory.c +++ b/telepathy-glib/simple-client-factory.c @@ -51,8 +51,6 @@ * TpSimpleClientFactory *factory; * TpAccountManager *manager; * - * g_type_init (); - * * factory = my_factory_new (); * manager = tp_account_manager_new_with_factory (factory); * tp_account_manager_set_default (manager); |