aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-format.c
diff options
context:
space:
mode:
authorJon Trowbridge <trow@ximian.com>2001-03-23 17:39:37 +0800
committerJon Trowbridge <trow@src.gnome.org>2001-03-23 17:39:37 +0800
commit4f26eac120fd30b1f8199a6aec29c436bfb558a4 (patch)
tree71ee7b80b87d7e47e5ead203ad7a8b63c2d33826 /mail/mail-format.c
parente4affa9382419295eb9911d5528c1b9e38cb6283 (diff)
downloadgsoc2013-evolution-4f26eac120fd30b1f8199a6aec29c436bfb558a4.tar.gz
gsoc2013-evolution-4f26eac120fd30b1f8199a6aec29c436bfb558a4.tar.zst
gsoc2013-evolution-4f26eac120fd30b1f8199a6aec29c436bfb558a4.zip
Added. Call me old-fashioned, but I just prefer to have a real API rather
2001-03-23 Jon Trowbridge <trow@ximian.com> * gui/widgets/e-minicard-widget.c (e_minicard_widget_set_card): Added. Call me old-fashioned, but I just prefer to have a real API rather than doing everything via gtk_object_get/set-type calls. (e_minicard_widget_set_arg): Changed to call e_minicard_widget_set_card. * backend/ebook/e-book-util.c: Small changes to get rid of compiler warnings. (Casting out const, removed unused variables, etc.) Removed some debugging messages. * gui/component/addressbook-factory.c (main): Added call to e_address_popup_factory_init. * gui/component/e-address-popup.c: Added. A popup gadget that is invoked (as a bonobo control) when an address is left-clicked in the mailer. The addressbook is queries, and the address is either displayed as a minicard (if it already exists) or in a "generic format". A button is provided for editting/adding the contact. Some of the semantics of this widget are a bit... non-standard, because of bonobo issues. I can't really seem to replicate popup-menu behavior because of how bonobo propogates events, etc. so I've tried to produce something that I think is non-annoying. YMMV. 2001-03-23 Jon Trowbridge <trow@ximian.com> * mail-display.c (handle_embedded_address_object): #ifdef away some code I don't quite want to delete yet. (html_button_press_event): Remove some of Radek's placeholder code, replace it with code to create my AddressPopup bonobo control. * mail-format.c: Remove some obsolete code that if #ifdef-ed out a while ago. * mail-ops.c (send_queue_send): Strip out the X-Evolution-Identity header when sending. 2001-03-23 Jon Trowbridge <trow@ximian.com> * camel-filter-driver.c (camel_filter_driver_filter_message): Don't call camel_mime_message_set_identity. (The call is commented out, left over from some earlier experimentation that I want to be able to remember later...) * camel-mime-message.c (camel_mime_message_set_identity): Added. A function to set the X-Evolution-Identity header. svn path=/trunk/; revision=8916
Diffstat (limited to 'mail/mail-format.c')
-rw-r--r--mail/mail-format.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/mail/mail-format.c b/mail/mail-format.c
index fc46526b9c..83c15ece17 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -623,32 +623,6 @@ write_subject (const char *subject, int flags, GtkHTML *html, GtkHTMLStream *str
g_free (encoded_subj);
}
-#ifdef USE_OBSOLETE_UNUSED_STUFF_AND_GET_COMPILER_WARNINGS
-static void
-write_field_to_stream(const char *description, const char *value, int flags, GtkHTML *html, GtkHTMLStream *stream)
-{
- char *encoded_desc, *encoded_value, *embedded_object;
- int bold = (flags&WRITE_BOLD) == WRITE_BOLD;
-
- /* The description comes from gettext... */
- encoded_desc = e_utf8_from_gtk_string (GTK_WIDGET (html), description);
-
- if (value)
- encoded_value = e_text_to_html (value, E_TEXT_TO_HTML_CONVERT_NL|E_TEXT_TO_HTML_CONVERT_URLS);
- else
- encoded_value = "";
-
- mail_html_write(html, stream,
- "<tr valign=top><%s align=right>%s</%s>"
- "<td> %s </td></tr>", bold ? "th" : "td",
- encoded_desc, bold ? "th" : "td", encoded_value);
- g_free (encoded_desc);
- g_free (embedded_object);
- if (value)
- g_free(encoded_value);
-}
-#endif
-
static void
write_address(MailDisplay *md, const CamelInternetAddress *addr, const char *field_name, int flags)
{
@@ -665,6 +639,7 @@ write_address(MailDisplay *md, const CamelInternetAddress *addr, const char *fie
while (camel_internet_address_get (addr, i, &name, &email)) {
if ((name && *name) || (email && *email)) {
+
/* we need these <B> </B> to separate HTMLText objects */
mail_html_write (md->html, md->stream, i ? ",<B> </B> " : "<td>");
mail_html_write (md->html, md->stream, " ");
@@ -682,6 +657,7 @@ write_address(MailDisplay *md, const CamelInternetAddress *addr, const char *fie
email);
mail_set = TRUE;
}
+
if (name && *name)
mail_html_write (md->html, md->stream, "%s ", name);
if (email && *email)