diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-11 17:54:33 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-14 19:01:41 +0000 |
| commit | adf88c982890f44f52f2585aebf651709f502307 (patch) | |
| tree | e885c05f239837c63a84666aee3f6cfb5cc21c40 | |
| parent | 02201d12089760016b1446c080097e82cc3ff277 (diff) | |
| download | telepathy-glib-adf88c982890f44f52f2585aebf651709f502307.tar.gz | |
tp_private_proxy_set_implementation: don't use g_assert_cmp* family
They're inappropriate outside regression tests, because they
respect test_nonfatal_assertions.
| -rw-r--r-- | telepathy-glib/core-proxy.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/telepathy-glib/core-proxy.c b/telepathy-glib/core-proxy.c index 78147f058..47474bf26 100644 --- a/telepathy-glib/core-proxy.c +++ b/telepathy-glib/core-proxy.c @@ -164,9 +164,10 @@ tp_proxy_signal_connection_v0_take_results (TpProxySignalConnection *sc, void tp_private_proxy_set_implementation (TpProxyImplementation *impl) { - g_assert_cmpstr (impl->version, ==, VERSION); - g_assert_cmpuint (impl->size, ==, sizeof (TpProxyImplementation)); - g_assert_cmpstr (g_type_name (impl->type), ==, "TpProxy"); + /* not using tp_strdiff because it isn't available in the core library */ + g_assert (strcmp (impl->version, VERSION) == 0); + g_assert (impl->size == sizeof (TpProxyImplementation)); + g_assert (strcmp (g_type_name (impl->type), "TpProxy") == 0); g_assert (_tp_proxy_implementation.version == NULL); g_assert (impl->get_interface_by_id != NULL); @@ -180,5 +181,5 @@ tp_private_proxy_set_implementation (TpProxyImplementation *impl) memcpy (&_tp_proxy_implementation, impl, sizeof (TpProxyImplementation)); - g_assert_cmpstr (_tp_proxy_implementation.version, ==, VERSION); + g_assert (strcmp (_tp_proxy_implementation.version, VERSION) == 0); } |