diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | mail/ChangeLog | 12 | ||||
| -rw-r--r-- | mail/mail-display.c | 116 |
4 files changed, 118 insertions, 16 deletions
@@ -1,3 +1,7 @@ +2001-07-02 Larry Ewing <lewing@ximian.com> + + * configure.in: Check for gtkhtml 0.9.99.1. + 2001-07-02 Jeffrey Stedfast <fejj@ximian.com> * configure.in: Check for libGal 0.8.99.7. diff --git a/configure.in b/configure.in index fc94555ef3..07a0d0dd01 100644 --- a/configure.in +++ b/configure.in @@ -502,7 +502,7 @@ EVO_CHECK_LIB(GAL, gal, 0.8.99.7) dnl FIXME: really a post-0.9.3 version (as of April 25) is needed for dnl changes in Editor.idl (menesis) -EVO_CHECK_LIB(GtkHTML, gtkhtml, 0.9.3) +EVO_CHECK_LIB(GtkHTML, gtkhtml, 0.9.99.1) EVO_CHECK_LIB(GNOME-VFS, vfs, 1.0) EVO_CHECK_LIB(libxml, xml, 1.8.10, 2.0) diff --git a/mail/ChangeLog b/mail/ChangeLog index f78038640b..0f62287f5e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,15 @@ +2001-07-02 Larry Ewing <lewing@ximian.com> + + * mail-display.c (save_part): move the saving logic out of save_cb + so that we can reuse it for the image saving code. + (save_cb): call save_part. + (save_url): new function to resolve an save an html url. + (image_save_as): save function for images and. Add it to the + link_menu, and add MASK_URL and MASK_SRC to the structure so that + we cans show the proper menus. + (html_button_press_event): call get_src as well to find external + urls references. Add popup masking. + 2001-07-02 Peter Williams <peterw@ximian.com> * README.async: Add a warning about how wrong this document is. diff --git a/mail/mail-display.c b/mail/mail-display.c index 78fe4f2022..a2f5d6eaa5 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -115,12 +115,15 @@ write_data_to_file (CamelMimePart *part, const char *name, gboolean unique) } static char * -make_safe_filename (const char *prefix, CamelMimePart *part) +make_safe_filename (const char *prefix,CamelMimePart *part) { const char *name = NULL; char *safe, *p; - name = camel_mime_part_get_filename (part); + if (part) { + name = camel_mime_part_get_filename (part); + } + if (!name) { /* This is a filename. Translators take note. */ name = _("attachment"); @@ -188,13 +191,12 @@ on_link_clicked (GtkHTML *html, const char *url, MailDisplay *md) gnome_url_show (url); } -static void -save_cb (GtkWidget *widget, gpointer user_data) +static void +save_part (CamelMimePart *part) { - CamelMimePart *part = gtk_object_get_data (user_data, "CamelMimePart"); GtkFileSelection *file_select; char *filename; - + filename = make_safe_filename (g_get_home_dir (), part); file_select = GTK_FILE_SELECTION ( gtk_file_selection_new (_("Save Attachment"))); @@ -212,6 +214,14 @@ save_cb (GtkWidget *widget, gpointer user_data) } static void +save_cb (GtkWidget *widget, gpointer user_data) +{ + CamelMimePart *part = gtk_object_get_data (GTK_OBJECT (user_data), "CamelMimePart"); + + save_part (part); +} + +static void launch_cb (GtkWidget *widget, gpointer user_data) { CamelMimePart *part = gtk_object_get_data (user_data, "CamelMimePart"); @@ -641,6 +651,44 @@ get_embedded_for_component (const char *iid, MailDisplay *md) return embedded; } +static void * +save_url (MailDisplay *md, const char *url) +{ + GHashTable *urls; + GByteArray *ba; + CamelMimePart *part; + + urls = g_datalist_get_data (md->data, "part_urls"); + g_return_val_if_fail (urls != NULL, NULL); + + part = g_hash_table_lookup (urls, url); + if (part) { + CamelDataWrapper *data; + + g_return_val_if_fail (CAMEL_IS_MIME_PART (part), NULL); + + data = camel_medium_get_content_object ((CamelMedium *)part); + if (!mail_content_loaded (data, md)) { + return NULL; + } + + save_part (part); + return NULL; + } + + g_warning ("part not found"); +#if 0 + urls = g_datalist_get_data (md->data, "data_urls"); + g_return_val_if_fail (urls != NULL, NULL); + + /* See if it's some piece of cached data */ + ba = g_hash_table_lookup (urls, url); + if (ba) { + return ba; + } +#endif + return NULL; +} static gboolean on_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data) @@ -1260,7 +1308,7 @@ link_open_in_browser (GtkWidget *w, MailDisplay *mail_display) static void link_save_as (GtkWidget *w, MailDisplay *mail_display) { - g_print ("FIXME\n"); + g_print ("FIXME save %s\n", mail_display->html->pointer_url); } static void @@ -1273,17 +1321,43 @@ link_copy_location (GtkWidget *w, MailDisplay *mail_display) g_warning ("Damn"); } +static void +image_save_as (GtkWidget *w, MailDisplay *mail_display) +{ + const char *src; + + src = gtk_object_get_data (GTK_OBJECT (mail_display), "current_src_uri"); + + g_warning ("loading uri=%s", src); + + save_url (mail_display, src); +} + +enum { + /* + * This is used to mask the link specific menu items. + */ + MASK_URL = 1, + + /* + * This is used to mask src specific menu items. + */ + MASK_SRC = 2 +}; + #define SEPARATOR { "", NULL, (NULL), NULL, 0 } #define TERMINATOR { NULL, NULL, (NULL), NULL, 0 } static EPopupMenu link_menu [] = { { N_("Open Link in Browser"), NULL, - GTK_SIGNAL_FUNC (link_open_in_browser), NULL, 0 }, - { N_("Save as (FIXME)"), NULL, - GTK_SIGNAL_FUNC (link_save_as), NULL, 0 }, + GTK_SIGNAL_FUNC (link_open_in_browser), NULL, MASK_URL }, { N_("Copy Link Location"), NULL, - GTK_SIGNAL_FUNC (link_copy_location), NULL, 0 }, - + GTK_SIGNAL_FUNC (link_copy_location), NULL, MASK_URL }, + { N_("Save Link as (FIXME)"), NULL, + GTK_SIGNAL_FUNC (link_save_as), NULL, MASK_URL }, + { N_("Save Image as"), NULL, + GTK_SIGNAL_FUNC (image_save_as), NULL, MASK_SRC }, + TERMINATOR }; @@ -1494,8 +1568,10 @@ html_button_press_event (GtkWidget *widget, GdkEventButton *event, MailDisplay * if (point) { const gchar *url; - + const gchar *src; + url = html_object_get_url (point->object); + src = html_object_get_src (point->object); if (url && !g_strncasecmp (url, "mailto:", 7)) { @@ -1517,9 +1593,19 @@ html_button_press_event (GtkWidget *widget, GdkEventButton *event, MailDisplay * - } else if (url) { + } else if (url || src) { + gint hide_mask = 0; - e_popup_menu_run (link_menu, (GdkEvent *) event, 0, 0, mail_display); + if (!url) + hide_mask |= MASK_URL; + + if (!src) + hide_mask |= MASK_SRC; + + g_free (gtk_object_get_data (GTK_OBJECT (mail_display), "current_src_uri")); + gtk_object_set_data (GTK_OBJECT (mail_display), "current_src_uri", g_strdup (src)); + + e_popup_menu_run (link_menu, (GdkEvent *) event, 0, hide_mask, mail_display); } |