X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-count-stream.c;h=fe0270d74038bcb85bccd7023b0d994e6c8fc205;hp=f10314effa1e57cc499568806793139aafe42925;hb=7758fa49daf7bcdddd9199281099aef348d33a1e;hpb=8f06b773ccd7153887edee262a9d5489a8107787 diff --git a/src/modest-count-stream.c b/src/modest-count-stream.c index f10314e..fe0270d 100644 --- a/src/modest-count-stream.c +++ b/src/modest-count-stream.c @@ -147,15 +147,17 @@ modest_count_stream_instance_init (GTypeInstance *instance, gpointer g_class) } static void -tny_stream_init (TnyStreamIface *klass) +tny_stream_init (gpointer g_iface, gpointer iface_data) { - klass->read_func = modest_count_stream_read; - klass->write_func = modest_count_stream_write; - klass->flush_func = modest_count_stream_flush; - klass->close_func = modest_count_stream_close; - klass->is_eos_func = modest_count_stream_is_eos; - klass->reset_func = modest_count_stream_reset; - klass->write_to_stream_func = modest_count_stream_write_to_stream; + TnyStreamIface *klass = (TnyStreamIface *) g_iface; + + klass->read = modest_count_stream_read; + klass->write = modest_count_stream_write; + klass->flush = modest_count_stream_flush; + klass->close = modest_count_stream_close; + klass->is_eos = modest_count_stream_is_eos; + klass->reset = modest_count_stream_reset; + klass->write_to_stream = modest_count_stream_write_to_stream; } static void @@ -198,10 +200,9 @@ modest_count_stream_get_type (void) }; type = g_type_register_static (G_TYPE_OBJECT, - "ModestCountStream", - &info, 0); + "ModestCountStream", + &info, 0); - /* TODO? : FIX THIS (ADD _TYPE): */ g_type_add_interface_static (type, TNY_TYPE_STREAM, &tny_stream_info);