aboutsummaryrefslogtreecommitdiffstats
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
parent4eb47f9a4696877218bf05d53c52f829d2afcdd5 (diff)
downloadgsoc2013-evolution-0a232b36bf48cd8493e455466e7cdbfd96d7aa7f.tar
gsoc2013-evolution-0a232b36bf48cd8493e455466e7cdbfd96d7aa7f.tar.gz
gsoc2013-evolution-0a232b36bf48cd8493e455466e7cdbfd96d7aa7f.tar.bz2
gsoc2013-evolution-0a232b36bf48cd8493e455466e7cdbfd96d7aa7f.tar.lz
gsoc2013-evolution-0a232b36bf48cd8493e455466e7cdbfd96d7aa7f.tar.xz
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
-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
-rw-r--r--mail/ChangeLog19
-rw-r--r--mail/folder-browser.c2
-rw-r--r--mail/mail-config.c4
-rw-r--r--mail/mail-display.c11
-rw-r--r--mail/mail-display.h6
-rw-r--r--mail/mail-format.c18
-rw-r--r--mail/message-list.c4
14 files changed, 69 insertions, 34 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 */
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0b68569706..d167dbc7b2 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,22 @@
+2000-05-21 Ettore Perazzoli <ettore@helixcode.com>
+
+ * message-list.c (get_message_info): Made static.
+ (ml_initialize_value): Return NULL to placate compiler.
+
+ * folder-browser.c (folder_browser_gui_init): Add cast.
+
+ * mail-display.c (mail_html_new): Don't pass an empty URL to
+ `gtk_html_begin()' anymore.
+
+ * mail-config.c (put_html): Don't pass an empty URL to
+ `gtk_html_begin()' anymore.
+
+ * mail-display.h: Updated for the new GtkHTML API that uses
+ `GtkHTMLStream *' instead of `GtkHTMLStreamHandle'.
+ * mail-display.c: Likewise.
+ * mail-config.c: Likewise.
+ * mail-format.c: Likewise.
+
2000-05-19 NotZed <NotZed@HelixCode.com>
* mail-format.c: Fixes for stream stuff.
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index b7a3c9faa1..292c22d5d7 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -330,7 +330,7 @@ folder_browser_gui_init (FolderBrowser *fb)
gtk_widget_show(hbox);
fb->search_entry = gtk_entry_new();
gtk_widget_show(fb->search_entry);
- gtk_signal_connect(fb->search_entry, "activate", search_activate, fb);
+ gtk_signal_connect(GTK_OBJECT (fb->search_entry), "activate", search_activate, fb);
/* gtk_signal_connect(fb->search_entry, "changed", search_activate, fb); */
label = gtk_label_new("Search");
gtk_widget_show(label);
diff --git a/mail/mail-config.c b/mail/mail-config.c
index a59af5dde6..513e7e66b0 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -96,10 +96,10 @@ html_new (gboolean white)
static void
put_html (GtkHTML *html, char *text)
{
- GtkHTMLStreamHandle *handle;
+ GtkHTMLStream *handle;
text = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL);
- handle = gtk_html_begin (html, "");
+ handle = gtk_html_begin (html);
gtk_html_write (html, handle, "<HTML><BODY>", 12);
gtk_html_write (html, handle, text, strlen (text));
gtk_html_write (html, handle, "</BODY></HTML>", 14);
diff --git a/mail/mail-display.c b/mail/mail-display.c
index d569ba1f7c..b72169327e 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -128,7 +128,7 @@ on_link_clicked (GtkHTML *html, const char *url, gpointer user_data)
}
static void
-on_url_requested (GtkHTML *html, const char *url, GtkHTMLStreamHandle handle,
+on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
gpointer user_data)
{
CamelMimeMessage *message = CAMEL_MIME_MESSAGE (user_data);
@@ -182,7 +182,7 @@ html_size_req (GtkWidget *widget, GtkRequisition *requisition)
}
void
-mail_html_new (GtkHTML **html, GtkHTMLStreamHandle **stream,
+mail_html_new (GtkHTML **html, GtkHTMLStream **stream,
CamelMimeMessage *root, gboolean init)
{
*html = GTK_HTML (gtk_html_new ());
@@ -194,7 +194,7 @@ mail_html_new (GtkHTML **html, GtkHTMLStreamHandle **stream,
gtk_signal_connect (GTK_OBJECT (*html), "link_clicked",
GTK_SIGNAL_FUNC (on_link_clicked), root);
- *stream = gtk_html_begin (*html, "");
+ *stream = gtk_html_begin (*html);
if (init) {
mail_html_write (*html, *stream, HTML_HEADER
"<BODY TEXT=\"#000000\" "
@@ -203,7 +203,7 @@ mail_html_new (GtkHTML **html, GtkHTMLStreamHandle **stream,
}
void
-mail_html_write (GtkHTML *html, GtkHTMLStreamHandle *stream,
+mail_html_write (GtkHTML *html, GtkHTMLStream *stream,
const char *format, ...)
{
char *buf;
@@ -217,8 +217,7 @@ mail_html_write (GtkHTML *html, GtkHTMLStreamHandle *stream,
}
void
-mail_html_end (GtkHTML *html, GtkHTMLStreamHandle *stream,
- gboolean finish, GtkBox *box)
+mail_html_end (GtkHTML *html, GtkHTMLStream *stream, gboolean finish, GtkBox *box)
{
GtkWidget *scroll;
diff --git a/mail/mail-display.h b/mail/mail-display.h
index 5fff4ec3de..0d38d4e432 100644
--- a/mail/mail-display.h
+++ b/mail/mail-display.h
@@ -40,14 +40,14 @@ void mail_display_set_message (MailDisplay *mail_display,
#define HTML_HEADER "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<HTML>\n<HEAD>\n<META NAME=\"GENERATOR\" CONTENT=\"Evolution Mail Component\">\n</HEAD>\n"
void mail_html_new (GtkHTML **html,
- GtkHTMLStreamHandle **stream,
+ GtkHTMLStream **stream,
CamelMimeMessage *root,
gboolean init);
void mail_html_write (GtkHTML *html,
- GtkHTMLStreamHandle *stream,
+ GtkHTMLStream *stream,
const char *format, ...);
void mail_html_end (GtkHTML *html,
- GtkHTMLStreamHandle *stream,
+ GtkHTMLStream *stream,
gboolean finish,
GtkBox *box);
diff --git a/mail/mail-format.c b/mail/mail-format.c
index fc5d321cec..ad7aa0fff6 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -302,7 +302,7 @@ call_handler_function (CamelMimePart *part, CamelMimeMessage *root,
static void
write_field_to_stream (const char *description, const char *value,
gboolean bold, GtkHTML *html,
- GtkHTMLStreamHandle *stream)
+ GtkHTMLStream *stream)
{
char *encoded_value;
@@ -331,7 +331,7 @@ static void
write_recipients_to_stream (const gchar *recipient_type,
const CamelInternetAddress *recipients,
gboolean optional, gboolean bold,
- GtkHTML *html, GtkHTMLStreamHandle *stream)
+ GtkHTML *html, GtkHTMLStream *stream)
{
int i;
char *recipients_string = NULL;
@@ -363,7 +363,7 @@ write_headers (CamelMimeMessage *mime_message, GtkBox *box)
{
const CamelInternetAddress *recipients;
GtkHTML *html;
- GtkHTMLStreamHandle *stream;
+ GtkHTMLStream *stream;
mail_html_new (&html, &stream, mime_message, FALSE);
mail_html_write (html, stream, "%s%s", HTML_HEADER,
@@ -435,7 +435,7 @@ static void
handle_text_plain (CamelMimePart *part, CamelMimeMessage *root, GtkBox *box)
{
GtkHTML *html;
- GtkHTMLStreamHandle *stream;
+ GtkHTMLStream *stream;
CamelDataWrapper *wrapper =
camel_medium_get_content_object (CAMEL_MEDIUM (part));
char *text, *htmltext;
@@ -471,7 +471,7 @@ handle_text_plain_flowed (CamelMimePart *part, CamelMimeMessage *root,
GtkBox *box)
{
GtkHTML *html;
- GtkHTMLStreamHandle *stream;
+ GtkHTMLStream *stream;
CamelDataWrapper *wrapper =
camel_medium_get_content_object (CAMEL_MEDIUM (part));
char *buf, *text, *line, *eol, *p;
@@ -540,7 +540,7 @@ handle_text_enriched (CamelMimePart *part, CamelMimeMessage *root, GtkBox *box)
{
static GHashTable *translations = NULL;
GtkHTML *html;
- GtkHTMLStreamHandle *stream;
+ GtkHTMLStream *stream;
CamelDataWrapper *wrapper =
camel_medium_get_content_object (CAMEL_MEDIUM (part));
CamelStream *memstream;
@@ -669,7 +669,7 @@ static void
handle_text_html (CamelMimePart *part, CamelMimeMessage *root, GtkBox *box)
{
GtkHTML *html;
- GtkHTMLStreamHandle *stream;
+ GtkHTMLStream *stream;
CamelDataWrapper *wrapper =
camel_medium_get_content_object (CAMEL_MEDIUM (part));
char *text;
@@ -688,7 +688,7 @@ static void
handle_image (CamelMimePart *part, CamelMimeMessage *root, GtkBox *box)
{
GtkHTML *html;
- GtkHTMLStreamHandle *stream;
+ GtkHTMLStream *stream;
char *cid;
cid = get_cid (part, root);
@@ -849,7 +849,7 @@ handle_mystery (CamelMimePart *part, CamelMimeMessage *root, GtkBox *box,
char *icon_name, char *id, char *action)
{
GtkHTML *html;
- GtkHTMLStreamHandle *stream;
+ GtkHTMLStream *stream;
const char *info;
char *htmlinfo;
GMimeContentField *content_type;
diff --git a/mail/message-list.c b/mail/message-list.c
index 41c4ad7314..d556fc1514 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -55,7 +55,7 @@ on_row_selection_cmd (ETable *table,
gpointer user_data);
-CamelMessageInfo *get_message_info(MessageList *message_list, gint row)
+static CamelMessageInfo *get_message_info(MessageList *message_list, gint row)
{
CamelMessageInfo *info = NULL;
@@ -322,6 +322,8 @@ ml_initialize_value (ETableModel *etm, int col, void *data)
default:
g_assert_not_reached ();
}
+
+ return NULL;
}
static gboolean
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 03:12:44 +0800