aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Ewing <lewing@ximian.com>2002-03-16 07:27:04 +0800
committerLarry Ewing <lewing@src.gnome.org>2002-03-16 07:27:04 +0800
commitb171dcc269b1926fe27e25bfd9c1c7bb04a0b727 (patch)
treeb9ea6cf1e655cc33bf47c5d6ca3facc9fece835c
parent88a322f15d8ce9c152cce75630b302b8b3ca1c08 (diff)
downloadgsoc2013-evolution-b171dcc269b1926fe27e25bfd9c1c7bb04a0b727.tar
gsoc2013-evolution-b171dcc269b1926fe27e25bfd9c1c7bb04a0b727.tar.gz
gsoc2013-evolution-b171dcc269b1926fe27e25bfd9c1c7bb04a0b727.tar.bz2
gsoc2013-evolution-b171dcc269b1926fe27e25bfd9c1c7bb04a0b727.tar.lz
gsoc2013-evolution-b171dcc269b1926fe27e25bfd9c1c7bb04a0b727.tar.xz
gsoc2013-evolution-b171dcc269b1926fe27e25bfd9c1c7bb04a0b727.tar.zst
gsoc2013-evolution-b171dcc269b1926fe27e25bfd9c1c7bb04a0b727.zip
expand the relative urls of the object at the point so that relative
2002-03-15 Larry Ewing <lewing@ximian.com> * mail-display.c: expand the relative urls of the object at the point so that relative images can be saved correctly. * folder-browser.c: add a closing quote in a comment. svn path=/trunk/; revision=16181
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/folder-browser.c2
-rw-r--r--mail/mail-display.c11
3 files changed, 17 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 005e0d7933..089c6468e8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-15 Larry Ewing <lewing@ximian.com>
+
+ * mail-display.c: expand the relative urls of the object at the
+ point so that relative images can be saved correctly.
+
+ * folder-browser.c: add a closing quote in a comment.
+
2002-03-15 Ettore Perazzoli <ettore@ximian.com>
* folder-browser-factory.c (control_activate): Set the UI
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index eb7ea566dd..910cd51470 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -1704,7 +1704,7 @@ on_right_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event
g_free (uids->pdata[i]);
g_ptr_array_free (uids, TRUE);
- /* generate the "Filter on Mailing List menu item name */
+ /* generate the "Filter on Mailing List" menu item name */
if (mlist == NULL) {
enable_mask |= IS_MAILING_LIST;
filter_menu[MLIST_FILTER].name = g_strdup (_("Filter on _Mailing List"));
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 234ecd8db5..bdf3d87722 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -1978,7 +1978,11 @@ html_button_press_event (GtkWidget *widget, GdkEventButton *event, MailDisplay *
if (url && !g_strncasecmp (url, "mailto:", 7)) {
PopupInfo *pop;
- gchar *url_decoded = g_strdup (url);
+ gchar *url_decoded;
+
+ url_decoded = gtk_html_get_url_object_relative (GTK_HTML (widget),
+ point->object,
+ url);
camel_url_decode (url_decoded);
popup_thing = bonobo_widget_new_control ("OAFIID:GNOME_Evolution_Addressbook_AddressPopup",
@@ -2005,7 +2009,10 @@ html_button_press_event (GtkWidget *widget, GdkEventButton *event, MailDisplay *
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));
+ gtk_object_set_data (GTK_OBJECT (mail_display), "current_src_uri",
+ gtk_html_get_url_object_relative (GTK_HTML (widget),
+ point->object,
+ src));
e_popup_menu_run (link_menu, (GdkEvent *) event, 0, hide_mask, mail_display);