From 2606279995f614634062e0aeb9833c482db5d083 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Mon, 13 Sep 2004 10:24:56 +0000
Subject: Merging pre-gnome-2-10 branch to HEAD.

2004-09-13  Christian Persch  <chpe@cvs.gnome.org>

	Merging pre-gnome-2-10 branch to HEAD.

	Splitting ChangeLog.
---
 data/ui/epiphany-ui.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'data/ui')

diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index 58f8ae44e..6b4bad784 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -162,6 +162,23 @@
 	<menuitem name="CopyImageLocationILP" action="CopyImageLocation"/>
 </popup>
 
+<popup name="EphyEmailLinkPopup" action="PopupAction">
+	<menuitem name="SendEmailItem" action="SendEmail"/>
+	<menuitem name="CopyEmailAddressItem" action="CopyEmailAddress"/>
+	<separator name="ELPSep0"/>
+	<menuitem name="EditCopyELP" action="EditCopy"/>
+</popup>
+
+<popup name="EphyImageEmailLinkPopup" action="PopupAction">
+	<menuitem name="SendEmailItem" action="SendEmail"/>
+	<menuitem name="CopyEmailAddressItem" action="CopyEmailAddress"/>
+	<separator name="IELPSep1"/>
+	<menuitem name="OpenImageIELP" action="OpenImage"/>
+	<menuitem name="SaveImageAsIELP" action="SaveImageAs"/>
+	<menuitem name="SetImageAsBackgroundIELP" action="SetImageAsBackground"/>
+	<menuitem name="CopyImageLocationIELP" action="CopyImageLocation"/>
+</popup>
+
 <accelerator name="BrowseWithCaretAccel" action="BrowseWithCaret"/>
 <accelerator name="FileSaveAccel" action="FileSave"/>
 
-- 
cgit v1.2.3