diff options
| author | fujiwarat <takao.fujiwara1@gmail.com> | 2013-06-04 11:12:53 +0900 |
|---|---|---|
| committer | fujiwarat <takao.fujiwara1@gmail.com> | 2013-06-04 11:12:53 +0900 |
| commit | 7ff8271dee2e3f5a9f65f64ee5ba798f4aa00b84 (patch) | |
| tree | 20f722b628418ff5b9436da5efe09518f957ed43 /bus | |
| parent | 5bb877682c218a5c0cd41e86a80655a7fd2269b9 (diff) | |
| download | ibus-7ff8271dee2e3f5a9f65f64ee5ba798f4aa00b84.tar.gz | |
Remove g_type_init() calls.
https://git.gnome.org/browse/glib/commit/?id=1dc774a653e992e1153fbed16f90097fa8db467f
https://git.gnome.org/browse/vala/commit/?id=f1fbafdfdc91fadaa57d2e073fc29cc6804d6ae3
Review URL: https://codereview.appspot.com/9727047
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/dbusimpl.c | 3 | ||||
| -rw-r--r-- | bus/test-matchrule.c | 2 | ||||
| -rw-r--r-- | bus/test-registry.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c index 7b8294b2..4a4781a4 100644 --- a/bus/dbusimpl.c +++ b/bus/dbusimpl.c @@ -733,7 +733,8 @@ bus_dbus_impl_name_has_owner (BusDBusImpl *dbus, g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, - "'%s' is not a legal bus name"); + "'%s' is not a legal bus name", + name ? name : "(null)"); return; } diff --git a/bus/test-matchrule.c b/bus/test-matchrule.c index d2e2648c..d85fc90c 100644 --- a/bus/test-matchrule.c +++ b/bus/test-matchrule.c @@ -20,7 +20,9 @@ int main(gint argc, gchar **argv) { BusMatchRule *rule, *rule1; +#if !GLIB_CHECK_VERSION(2,35,0) g_type_init (); +#endif rule = bus_match_rule_new (" type='signal' , interface = 'org.freedesktop.IBus' "); g_assert (rule->message_type == G_DBUS_MESSAGE_TYPE_SIGNAL); diff --git a/bus/test-registry.c b/bus/test-registry.c index 97f05790..22572204 100644 --- a/bus/test-registry.c +++ b/bus/test-registry.c @@ -3,7 +3,9 @@ int main() { +#if !GLIB_CHECK_VERSION(2,35,0) g_type_init (); +#endif BusRegistry *registry = bus_registry_new (); g_object_unref (registry); return 0; |