summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Zabaluev <mikhail.zabaluev@nokia.com>2011-09-01 13:22:42 +0300
committerMikhail Zabaluev <mikhail.zabaluev@nokia.com>2011-09-01 13:22:42 +0300
commit28b64163e8bbca02de308612f6653ed291e2b1df (patch)
treefae6320da5216cc6405febbfa73f1a6b08402651
parent39fc20df8c978ebf072998cc1077a48ec6b41593 (diff)
Don't allow the stub for GabbleGoogleRelayResolver to be empty
g_slice_alloc() behavior for zero-sized blocks is undocumented and leads to obscure code paths taken.
-rw-r--r--src/google-relay.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google-relay.c b/src/google-relay.c
index 92575cca..5f23457a 100644
--- a/src/google-relay.c
+++ b/src/google-relay.c
@@ -38,6 +38,8 @@
struct _GabbleGoogleRelayResolver {
#ifdef ENABLE_GOOGLE_RELAY
SoupSession *soup;
+#else
+ GObject *soup;
#endif
};
@@ -267,9 +269,7 @@ gabble_google_relay_resolver_new (void)
void
gabble_google_relay_resolver_destroy (GabbleGoogleRelayResolver *self)
{
-#ifdef ENABLE_GOOGLE_RELAY
tp_clear_object (&self->soup);
-#endif
g_slice_free (GabbleGoogleRelayResolver, self);
}