summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2009-05-15 10:51:30 (GMT)
committerAlexander Larsson <alexl@redhat.com>2009-05-15 10:51:30 (GMT)
commit52bf0b17d08495eca532d3686e45c70801838a23 (patch)
tree2e353e785eaba2a48758f4331e6bd21195f1e178
parent8c64ba6a3605746441e56635bd178ec98d639d71 (diff)
downloadgnio-52bf0b17d08495eca532d3686e45c70801838a23.tar.gz
gnio-52bf0b17d08495eca532d3686e45c70801838a23.tar.xz
Make GSocketInput/OutputStream more in-line with glib style
-rw-r--r--gio/gsocketinputstream.c13
-rw-r--r--gio/gsocketinputstream.h9
-rw-r--r--gio/gsocketoutputstream.c11
-rw-r--r--gio/gsocketoutputstream.h9
4 files changed, 23 insertions, 19 deletions
diff --git a/gio/gsocketinputstream.c b/gio/gsocketinputstream.c
index 0f9f848..1615eb5 100644
--- a/gio/gsocketinputstream.c
+++ b/gio/gsocketinputstream.c
@@ -1,4 +1,4 @@
-/* GNIO - GLib Network Layer of GIO
+/* GIO - GLib Input, Output and Streaming Library
*
* Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima
* © 2009 codethink
@@ -23,6 +23,7 @@
* Ryan Lortie <desrt@desrt.ca>
*/
+#include "config.h"
#include "gsocketinputstream.h"
#include <gio/gsimpleasyncresult.h>
@@ -236,11 +237,11 @@ g_socket_input_stream_class_init (GSocketInputStreamClass *klass)
ginputstream_class->read_finish = g_socket_input_stream_read_finish;
g_object_class_install_property (gobject_class, PROP_SOCKET,
- g_param_spec_object ("socket", "socket",
- "the socket that this stream wraps",
- G_TYPE_SOCKET, G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_READWRITE | G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
+ g_param_spec_object ("socket",
+ P_("socket"),
+ P_("The socket that this stream wraps"),
+ G_TYPE_SOCKET, G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
static void
diff --git a/gio/gsocketinputstream.h b/gio/gsocketinputstream.h
index 7eb48d2..0500b4e 100644
--- a/gio/gsocketinputstream.h
+++ b/gio/gsocketinputstream.h
@@ -1,4 +1,5 @@
-/*
+/* GIO - GLib Input, Output and Streaming Library
+ *
* Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima
* Copyright © 2009 Codethink Limited
*
@@ -14,8 +15,8 @@
* Ryan Lortie <desrt@desrt.ca>
*/
-#ifndef _gsocketinputstream_h_
-#define _gsocketinputstream_h_
+#ifndef __G_SOCKET_INPUT_STREAM_H__
+#define __G_SOCKET_INPUT_STREAM_H__
#include <gio/ginputstream.h>
#include <gio/gsocket.h>
@@ -54,4 +55,4 @@ GSocketInputStream * _g_socket_input_stream_new (GSocket
G_END_DECLS
-#endif /* _gsocketinputstream_h_ */
+#endif /* __G_SOCKET_INPUT_STREAM_H___ */
diff --git a/gio/gsocketoutputstream.c b/gio/gsocketoutputstream.c
index b8b94f7..dd36793 100644
--- a/gio/gsocketoutputstream.c
+++ b/gio/gsocketoutputstream.c
@@ -23,6 +23,7 @@
* Ryan Lortie <desrt@desrt.ca>
*/
+#include "config.h"
#include "gsocketoutputstream.h"
#include <gio/gsimpleasyncresult.h>
@@ -236,11 +237,11 @@ g_socket_output_stream_class_init (GSocketOutputStreamClass *klass)
goutputstream_class->write_finish = g_socket_output_stream_write_finish;
g_object_class_install_property (gobject_class, PROP_SOCKET,
- g_param_spec_object ("socket", "socket",
- "the socket that this stream wraps",
- G_TYPE_SOCKET, G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_READWRITE | G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
+ g_param_spec_object ("socket",
+ P_("socket"),
+ P_("The socket that this stream wraps"),
+ G_TYPE_SOCKET, G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
static void
diff --git a/gio/gsocketoutputstream.h b/gio/gsocketoutputstream.h
index 3146066..37f99b3 100644
--- a/gio/gsocketoutputstream.h
+++ b/gio/gsocketoutputstream.h
@@ -1,4 +1,5 @@
-/*
+/* GIO - GLib Input, Output and Streaming Library
+ *
* Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima
* Copyright © 2009 Codethink Limited
*
@@ -14,8 +15,8 @@
* Ryan Lortie <desrt@desrt.ca>
*/
-#ifndef _gsocketoutputstream_h_
-#define _gsocketoutputstream_h_
+#ifndef __G_SOCKET_OUTPUT_STREAM_H__
+#define __G_SOCKET_OUTPUT_STREAM_H__
#include <gio/goutputstream.h>
#include <gio/gsocket.h>
@@ -54,4 +55,4 @@ GSocketOutputStream * _g_socket_output_stream_new (GSocket
G_END_DECLS
-#endif /* _gsocketoutputstream_h_ */
+#endif /* __G_SOCKET_OUTPUT_STREAM_H__ */