aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-01-06 22:27:03 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-01-06 22:41:30 +0800
commit5e8fcdce36151ee61fbbe3937b2a8d1e58850b6e (patch)
treefc7af6ebaf150ee645278c5d044c23d37c23d03c
parent747da9fea882b5e4962e2d1f3e4f86074a350633 (diff)
downloadgsoc2013-empathy-5e8fcdce36151ee61fbbe3937b2a8d1e58850b6e.tar
gsoc2013-empathy-5e8fcdce36151ee61fbbe3937b2a8d1e58850b6e.tar.gz
gsoc2013-empathy-5e8fcdce36151ee61fbbe3937b2a8d1e58850b6e.tar.bz2
gsoc2013-empathy-5e8fcdce36151ee61fbbe3937b2a8d1e58850b6e.tar.lz
gsoc2013-empathy-5e8fcdce36151ee61fbbe3937b2a8d1e58850b6e.tar.xz
gsoc2013-empathy-5e8fcdce36151ee61fbbe3937b2a8d1e58850b6e.tar.zst
gsoc2013-empathy-5e8fcdce36151ee61fbbe3937b2a8d1e58850b6e.zip
coding style fixes
https://bugzilla.gnome.org/show_bug.cgi?id=721484
-rw-r--r--tests/empathy-tls-test.c7
-rw-r--r--tests/mock-pkcs11.c4
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c
index d48bfccfd..91b05761f 100644
--- a/tests/empathy-tls-test.c
+++ b/tests/empathy-tls-test.c
@@ -52,7 +52,8 @@ mock_tls_certificate_init (MockTLSCertificate *self)
{
self->state = TP_TLS_CERTIFICATE_STATE_PENDING;
self->cert_type = g_strdup ("x509");
- self->cert_data = g_ptr_array_new_with_free_func((GDestroyNotify) g_array_unref);
+ self->cert_data = g_ptr_array_new_with_free_func ((GDestroyNotify)
+ g_array_unref);
self->rejections = g_ptr_array_new ();
}
@@ -185,7 +186,7 @@ mock_tls_certificate_iface_init (gpointer g_iface,
gpointer iface_data)
{
TpSvcAuthenticationTLSCertificateClass *klass =
- (TpSvcAuthenticationTLSCertificateClass*)g_iface;
+ (TpSvcAuthenticationTLSCertificateClass *) g_iface;
tp_svc_authentication_tls_certificate_implement_accept (klass,
mock_tls_certificate_accept);
@@ -227,7 +228,7 @@ mock_tls_certificate_assert_rejected (MockTLSCertificate *self,
}
#endif
-static MockTLSCertificate*
+static MockTLSCertificate *
mock_tls_certificate_new_and_register (TpDBusDaemon *dbus,
const gchar *path,
...)
diff --git a/tests/mock-pkcs11.c b/tests/mock-pkcs11.c
index 572221acc..be081bc9d 100644
--- a/tests/mock-pkcs11.c
+++ b/tests/mock-pkcs11.c
@@ -70,7 +70,7 @@ typedef struct {
static void
free_session (gpointer data)
{
- Session *sess = (Session*)data;
+ Session *sess = (Session *) data;
g_list_free (sess->matches);
g_free (sess);
}
@@ -119,7 +119,7 @@ mock_C_Initialize (CK_VOID_PTR init_args)
args = (CK_C_INITIALIZE_ARGS_PTR)init_args;
if (args)
{
- g_return_val_if_fail(
+ g_return_val_if_fail (
(args->CreateMutex == NULL && args->DestroyMutex == NULL &&
args->LockMutex == NULL && args->UnlockMutex == NULL) ||
(args->CreateMutex != NULL && args->DestroyMutex != NULL &&