summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-05-01 14:17:13 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-05-01 14:22:33 +0100
commitb38c0072563c95d9252a7fbde9322b3e928d286a (patch)
tree21bbf785683208aafb720a6daf56307835ce5f11
parentae30e944677a28573bde3bc1940e329637b003f5 (diff)
Split property/value pairs one-per-line in interactive TLS checking code
While we're touching these lines anyway, they might as well be in a slightly more Telepathic style.
-rw-r--r--src/idle-connection.c9
-rw-r--r--src/server-tls-channel.c4
2 files changed, 10 insertions, 3 deletions
diff --git a/src/idle-connection.c b/src/idle-connection.c
index c31a00a..24b93c2 100644
--- a/src/idle-connection.c
+++ b/src/idle-connection.c
@@ -547,7 +547,8 @@ static GPtrArray *_iface_create_channel_managers(TpBaseConnection *base) {
g_ptr_array_add(managers, manager);
priv->tls_manager = g_object_new (IDLE_TYPE_SERVER_TLS_MANAGER,
- "connection", self, NULL);
+ "connection", self,
+ NULL);
g_ptr_array_add(managers, priv->tls_manager);
return managers;
@@ -761,7 +762,11 @@ static void _start_connecting_continue(IdleConnection *conn) {
priv->username = g_strdup(g_get_user_name());
}
- sconn = g_object_new(IDLE_TYPE_SERVER_CONNECTION, "host", priv->server, "port", priv->port, "tls-manager", priv->tls_manager, NULL);
+ sconn = g_object_new(IDLE_TYPE_SERVER_CONNECTION,
+ "host", priv->server,
+ "port", priv->port,
+ "tls-manager", priv->tls_manager,
+ NULL);
if (priv->use_ssl)
idle_server_connection_set_tls(sconn, TRUE);
diff --git a/src/server-tls-channel.c b/src/server-tls-channel.c
index 85fb845..aa2ef62 100644
--- a/src/server-tls-channel.c
+++ b/src/server-tls-channel.c
@@ -174,7 +174,9 @@ idle_server_tls_channel_constructed (GObject *object)
GByteArray *content;
GArray *c;
- g_object_get (cert, "certificate", &content, NULL);
+ g_object_get (cert,
+ "certificate", &content,
+ NULL);
c = g_array_sized_new (TRUE, TRUE, sizeof (guchar), content->len);
g_array_append_vals (c, content->data, content->len);
g_ptr_array_add (certificates, c);