projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GDBus: add support for GVariant floats to helpers
[platform/upstream/glib.git]
/
gio
/
gconverterinputstream.c
diff --git
a/gio/gconverterinputstream.c
b/gio/gconverterinputstream.c
index
1acf9a9
..
7e22aaa
100644
(file)
--- a/
gio/gconverterinputstream.c
+++ b/
gio/gconverterinputstream.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* 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>
*/
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
@@
-99,9
+97,9
@@
static void g_converter_input_stream_pollable_iface_init (GPollableInputStreamI
G_DEFINE_TYPE_WITH_CODE (GConverterInputStream,
g_converter_input_stream,
G_TYPE_FILTER_INPUT_STREAM,
G_DEFINE_TYPE_WITH_CODE (GConverterInputStream,
g_converter_input_stream,
G_TYPE_FILTER_INPUT_STREAM,
+ G_ADD_PRIVATE (GConverterInputStream)
G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
- g_converter_input_stream_pollable_iface_init);
- )
+ g_converter_input_stream_pollable_iface_init))
static void
g_converter_input_stream_class_init (GConverterInputStreamClass *klass)
static void
g_converter_input_stream_class_init (GConverterInputStreamClass *klass)
@@
-109,8
+107,6
@@
g_converter_input_stream_class_init (GConverterInputStreamClass *klass)
GObjectClass *object_class;
GInputStreamClass *istream_class;
GObjectClass *object_class;
GInputStreamClass *istream_class;
- g_type_class_add_private (klass, sizeof (GConverterInputStreamPrivate));
-
object_class = G_OBJECT_CLASS (klass);
object_class->get_property = g_converter_input_stream_get_property;
object_class->set_property = g_converter_input_stream_set_property;
object_class = G_OBJECT_CLASS (klass);
object_class->get_property = g_converter_input_stream_get_property;
object_class->set_property = g_converter_input_stream_set_property;
@@
-207,9
+203,7
@@
g_converter_input_stream_get_property (GObject *object,
static void
g_converter_input_stream_init (GConverterInputStream *stream)
{
static void
g_converter_input_stream_init (GConverterInputStream *stream)
{
- stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream,
- G_TYPE_CONVERTER_INPUT_STREAM,
- GConverterInputStreamPrivate);
+ stream->priv = g_converter_input_stream_get_instance_private (stream);
}
/**
}
/**
@@
-415,6
+409,7
@@
read_internal (GInputStream *stream,
buffer_read (&priv->converted_buffer, buffer, available);
total_bytes_read = available;
buffer_read (&priv->converted_buffer, buffer, available);
total_bytes_read = available;
+ buffer = (char *) buffer + available;
count -= available;
/* If there is no data to convert, and no pre-converted data,
count -= available;
/* If there is no data to convert, and no pre-converted data,