From 0a232b36bf48cd8493e455466e7cdbfd96d7aa7f Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sun, 21 May 2000 09:18:20 +0000 Subject: Updated for the GtkHTML API changes. Also fixed some compiler warnings here and there. svn path=/trunk/; revision=3145 --- mail/ChangeLog | 19 +++++++++++++++++++ mail/folder-browser.c | 2 +- mail/mail-config.c | 4 ++-- mail/mail-display.c | 11 +++++------ mail/mail-display.h | 6 +++--- mail/mail-format.c | 18 +++++++++--------- mail/message-list.c | 4 +++- 7 files changed, 42 insertions(+), 22 deletions(-) (limited to 'mail') 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 + + * 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 * 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, "", 12); gtk_html_write (html, handle, text, strlen (text)); gtk_html_write (html, handle, "", 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 "\n\n\n\n\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 -- cgit v1.2.3