aboutsummaryrefslogtreecommitdiffstats
path: root/filter
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-05-21 17:18:20 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-05-21 17:18:20 +0800
commit0a232b36bf48cd8493e455466e7cdbfd96d7aa7f (patch)
treeebc3f3ca60f873e39124228be43f0416b7c6c204 /filter
parent4eb47f9a4696877218bf05d53c52f829d2afcdd5 (diff)
downloadgsoc2013-evolution-0a232b36bf48cd8493e455466e7cdbfd96d7aa7f.tar.gz
gsoc2013-evolution-0a232b36bf48cd8493e455466e7cdbfd96d7aa7f.tar.zst
gsoc2013-evolution-0a232b36bf48cd8493e455466e7cdbfd96d7aa7f.zip
Updated for the GtkHTML API changes. Also fixed some compiler
warnings here and there. svn path=/trunk/; revision=3145
Diffstat (limited to 'filter')
-rw-r--r--filter/ChangeLog14
-rw-r--r--filter/filter-arg-types.c6
-rw-r--r--filter/filter-arg.c4
-rw-r--r--filter/filter-arg.h2
-rw-r--r--filter/filter-druid.c5
-rw-r--r--filter/filter-format.c6
-rw-r--r--filter/filter-format.h2
7 files changed, 27 insertions, 12 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 56ec6f65f5..9387f72a4e 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,17 @@
+2000-05-21 Ettore Perazzoli <ettore@helixcode.com>
+
+ * filter-druid.c: Don't pass an empty URL to `gtk_html_begin()'
+ anymore.
+
+ * filter-arg-types.c: Updated for the new GtkHTML API which uses
+ `GtkHTMLStream *' instead of `GtkHTMLStreamHandle'.
+ * filter-arg.c: Likewise.
+ * filter-arg.h: Likewise.
+ * filter-druid.c: Likewise.
+
+ * filter-format.c: Likewise.
+ * filter-format.h: Likewise.
+
2000-05-18 Dan Winship <danw@helixcode.com>
* filter-driver.c (filter_driver_run): update for
diff --git a/filter/filter-arg-types.c b/filter/filter-arg-types.c
index f1f0d1236c..fd0bb32248 100644
--- a/filter/filter-arg-types.c
+++ b/filter/filter-arg-types.c
@@ -59,7 +59,7 @@ filter_arg_string_get_type (void)
}
static void
-arg_string_write_html(FilterArg *argin, GtkHTML *html, GtkHTMLStreamHandle *stream)
+arg_string_write_html(FilterArg *argin, GtkHTML *html, GtkHTMLStream *stream)
{
FilterArgString *arg = (FilterArgString *)argin;
/* empty */
@@ -280,7 +280,7 @@ filter_arg_address_get_type (void)
}
static void
-arg_address_write_html(FilterArg *argin, GtkHTML *html, GtkHTMLStreamHandle *stream)
+arg_address_write_html(FilterArg *argin, GtkHTML *html, GtkHTMLStream *stream)
{
FilterArgAddress *arg = (FilterArgAddress *)argin;
/* empty */
@@ -531,7 +531,7 @@ filter_arg_folder_get_type (void)
}
static void
-arg_folder_write_html(FilterArg *argin, GtkHTML *html, GtkHTMLStreamHandle *stream)
+arg_folder_write_html(FilterArg *argin, GtkHTML *html, GtkHTMLStream *stream)
{
FilterArgFolder *arg = (FilterArgFolder *)argin;
/* empty */
diff --git a/filter/filter-arg.c b/filter/filter-arg.c
index 77dffe284b..ece10efbba 100644
--- a/filter/filter-arg.c
+++ b/filter/filter-arg.c
@@ -83,7 +83,7 @@ clone_default(FilterArg *a)
}
static void
-write_html_nothing(FilterArg *arg, GtkHTML *html, GtkHTMLStreamHandle *stream)
+write_html_nothing(FilterArg *arg, GtkHTML *html, GtkHTMLStream *stream)
{
/* empty */
}
@@ -209,7 +209,7 @@ filter_arg_remove(FilterArg *arg, void *v)
void
-filter_arg_write_html(FilterArg *arg, GtkHTML *html, GtkHTMLStreamHandle *stream)
+filter_arg_write_html(FilterArg *arg, GtkHTML *html, GtkHTMLStream *stream)
{
((FilterArgClass *)(arg->object.klass))->write_html(arg, html, stream);
}
diff --git a/filter/filter-arg.h b/filter/filter-arg.h
index 514bf1adf2..7790123569 100644
--- a/filter/filter-arg.h
+++ b/filter/filter-arg.h
@@ -50,7 +50,7 @@ struct _FilterArgClass {
struct _FilterArg * (*clone)(FilterArg *arg);
/* virtual methods */
- void (*write_html)(FilterArg *arg, GtkHTML *html, GtkHTMLStreamHandle *stream);
+ void (*write_html)(FilterArg *arg, GtkHTML *html, GtkHTMLStream *stream);
void (*write_text)(FilterArg *arg, GString *string);
void (*free_value)(FilterArg *arg, void *v);
diff --git a/filter/filter-druid.c b/filter/filter-druid.c
index 43e7d1e705..4a4595c5fb 100644
--- a/filter/filter-druid.c
+++ b/filter/filter-druid.c
@@ -198,11 +198,12 @@ static char *display_posttext[] = {
void
html_write_options(GtkHTML *html, struct filter_option *option, char *def)
{
- GtkHTMLStreamHandle *stream;
+ GtkHTMLStream *stream;
GList *optionrulel;
int i;
- stream = gtk_html_begin(html, "");
+ stream = gtk_html_begin(html);
+
gtk_html_write(html, stream, "<body bgcolor=white alink=blue>", strlen("<body bgcolor=white alink=blue>"));
if (option) {
char *t;
diff --git a/filter/filter-format.c b/filter/filter-format.c
index 8f0f67b16e..b7a2a956be 100644
--- a/filter/filter-format.c
+++ b/filter/filter-format.c
@@ -57,7 +57,7 @@ struct description_decode_lambda {
GString *str;
GList *args;
GtkHTML *html;
- GtkHTMLStreamHandle *stream;
+ GtkHTMLStream *stream;
};
static char *
@@ -129,7 +129,7 @@ filter_description_text(GList *description, GList *args)
}
static void
-html_write(GtkHTML *html, GtkHTMLStreamHandle *stream, char *s)
+html_write(GtkHTML *html, GtkHTMLStream *stream, char *s)
{
d(printf("appending html '%s'\n", s));
gtk_html_write(html, stream, s, strlen(s));
@@ -187,7 +187,7 @@ description_decode_html(struct filter_desc *d, struct description_decode_lambda
}
void
-filter_description_html_write(GList *description, GList *args, GtkHTML *html, GtkHTMLStreamHandle *stream)
+filter_description_html_write(GList *description, GList *args, GtkHTML *html, GtkHTMLStream *stream)
{
char *txt;
struct description_decode_lambda l;
diff --git a/filter/filter-format.h b/filter/filter-format.h
index 12a4040a46..bdd047164e 100644
--- a/filter/filter-format.h
+++ b/filter/filter-format.h
@@ -5,6 +5,6 @@
#include <glib.h>
char *filter_description_text(GList *description, GList *args);
-void description_html_write(GList *description, GList *args, GtkHTML *html, GtkHTMLStreamHandle *stream);
+void description_html_write(GList *description, GList *args, GtkHTML *html, GtkHTMLStream *stream);
#endif /* _FILTER_FORMAT_H */
generated by cgit (git 2.34.1) at 2024-11-12 06:31:56 +0800