[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header

[platform/upstream/glib.git] / gio / gunixinputstream.c

diff --git a/gio/gunixinputstream.c b/gio/gunixinputstream.c
index dd6af1a..24700ec 100644 (file)
--- a/gio/gunixinputstream.c
+++ b/gio/gunixinputstream.c
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  */
@@ -31,6 +29,7 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <glib/glib-unix.h>
 #include "gioerror.h"
 #include "gsimpleasyncresult.h"
 #include "gunixinputstream.h"
@@ -52,9 +51,9 @@
  * asynchronous I/O. If it refers to a regular file, it will fall back
  * to doing asynchronous I/O in another thread.)
  *
- * Note that <filename>&lt;gio/gunixinputstream.h&gt;</filename> belongs
- * to the UNIX-specific GIO interfaces, thus you have to use the
- * <filename>gio-unix-2.0.pc</filename> pkg-config file when using it.
+ * Note that `<gio/gunixinputstream.h>` belongs to the UNIX-specific GIO
+ * interfaces, thus you have to use the `gio-unix-2.0.pc` pkg-config
+ * file when using it.
  */
 
 enum {
@@ -238,7 +237,7 @@ g_unix_input_stream_get_property (GObject    *object,
 static void
 g_unix_input_stream_init (GUnixInputStream *unix_stream)
 {
-  unix_stream->priv = g_unix_input_stream_get_private (unix_stream);
+  unix_stream->priv = g_unix_input_stream_get_instance_private (unix_stream);
   unix_stream->priv->fd = -1;
   unix_stream->priv->close_fd = TRUE;
 }
@@ -302,7 +301,7 @@ g_unix_input_stream_set_close_fd (GUnixInputStream *stream,
  * Returns whether the file descriptor of @stream will be
  * closed when the stream is closed.
  *
- * Return value: %TRUE if the file descriptor is closed when done
+ * Returns: %TRUE if the file descriptor is closed when done
  *
  * Since: 2.20
  */
@@ -320,7 +319,7 @@ g_unix_input_stream_get_close_fd (GUnixInputStream *stream)
  *
  * Return the UNIX file descriptor that the stream reads from.
  *
- * Return value: The file descriptor of @stream
+ * Returns: The file descriptor of @stream
  *
  * Since: 2.20
  */
@@ -510,14 +509,22 @@ g_unix_input_stream_pollable_create_source (GPollableInputStream *stream,
                                            GCancellable         *cancellable)
 {
   GUnixInputStream *unix_stream = G_UNIX_INPUT_STREAM (stream);
-  GSource *inner_source, *pollable_source;
+  GSource *inner_source, *cancellable_source, *pollable_source;
 
   pollable_source = g_pollable_source_new (G_OBJECT (stream));
 
-  inner_source = _g_fd_source_new (unix_stream->priv->fd, G_IO_IN, cancellable);
+  inner_source = g_unix_fd_source_new (unix_stream->priv->fd, G_IO_IN);
   g_source_set_dummy_callback (inner_source);
   g_source_add_child_source (pollable_source, inner_source);
   g_source_unref (inner_source);
 
+  if (cancellable)
+    {
+      cancellable_source = g_cancellable_source_new (cancellable);
+      g_source_set_dummy_callback (cancellable_source);
+      g_source_add_child_source (pollable_source, cancellable_source);
+      g_source_unref (cancellable_source);
+    }
+
   return pollable_source;
 }