From 4e9a758bcca0bdf5c65cff25f1f5e388292b1afe Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Mon, 7 Aug 2006 12:37:11 +0000 Subject: [PATCH] * tiny updates pmo-trunk-r459 --- src/modest-main.c | 2 +- src/modest-marshal.list | 1 + src/modest-tny-stream-gtkhtml.c | 15 ++++++++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/modest-main.c b/src/modest-main.c index a804696..988c5c2 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -117,7 +117,7 @@ main (int argc, char *argv[]) } if (debug) - g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); + g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL|G_LOG_LEVEL_WARNING); if (!getenv("DISPLAY")) batch = TRUE; diff --git a/src/modest-marshal.list b/src/modest-marshal.list index 6a79e55..73b8a4d 100644 --- a/src/modest-marshal.list +++ b/src/modest-marshal.list @@ -3,3 +3,4 @@ VOID:POINTER,POINTER,POINTER VOID:STRING,INT VOID:STRING,BOOL VOID:STRING,STRING,BOOL +VOID:STRING,POINTER,POINTER diff --git a/src/modest-tny-stream-gtkhtml.c b/src/modest-tny-stream-gtkhtml.c index 6303a0f..2aa617d 100644 --- a/src/modest-tny-stream-gtkhtml.c +++ b/src/modest-tny-stream-gtkhtml.c @@ -76,6 +76,7 @@ modest_tny_stream_gtkhtml_get_type (void) sizeof(ModestTnyStreamGtkhtml), 1, /* n_preallocs */ (GInstanceInitFunc) modest_tny_stream_gtkhtml_init, + NULL }; static const GInterfaceInfo iface_info = { @@ -160,7 +161,7 @@ gtkhtml_write (TnyStreamIface *self, const char *buffer, size_t n) priv = MODEST_TNY_STREAM_GTKHTML_GET_PRIVATE(self); if (!priv->stream) { - g_warning ("cannot write to closed stream"); + g_print ("modest: cannot write to closed stream\n"); return 0; } @@ -224,11 +225,11 @@ modest_tny_stream_gtkhml_iface_init (gpointer g_iface, gpointer iface_data) klass = (TnyStreamIfaceClass *)g_iface; - klass->read_func = gtkhtml_read; - klass->write_func = gtkhtml_write; - klass->flush_func = gtkhtml_flush; - klass->close_func = gtkhtml_close; - klass->eos_func = gtkhtml_eos; - klass->reset_func = gtkhtml_reset; + klass->read_func = gtkhtml_read; + klass->write_func = gtkhtml_write; + klass->flush_func = gtkhtml_flush; + klass->close_func = gtkhtml_close; + klass->eos_func = gtkhtml_eos; + klass->reset_func = gtkhtml_reset; klass->write_to_stream_func = gtkhtml_write_to_stream; } -- 1.7.9.5