Merge branch 'master' into errorstate

[cascardo/gnio.git] / gnio / gsocket.c

diff --git a/gnio/gsocket.c b/gnio/gsocket.c
index cfeaa73..d92a1d0 100644 (file)
--- a/gnio/gsocket.c
+++ b/gnio/gsocket.c
@@ -79,6 +79,7 @@ struct _GSocketPrivate
 };
 
 static void
+<<<<<<< HEAD:gnio/gsocket.c
 g_socket_constructed (GObject *object)
 {
   GSocket *sock = G_SOCKET (object);
@@ -169,7 +170,10 @@ g_socket_constructed (GObject *object)
 }
 
 static void
-g_socket_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+g_socket_get_property (GObject    *object,
+                       guint       prop_id,
+                       GValue     *value,
+                       GParamSpec *pspec)
 {
   GSocket *socket = G_SOCKET (object);
 
@@ -217,7 +221,10 @@ g_socket_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec
 }
 
 static void
-g_socket_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+g_socket_set_property (GObject      *object,
+                       guint         prop_id,
+                       const GValue *value,
+                       GParamSpec   *pspec)
 {
   GSocket *socket = G_SOCKET (object);