diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-09-13 18:24:56 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-09-13 18:24:56 +0800 |
| commit | 2606279995f614634062e0aeb9833c482db5d083 (patch) | |
| tree | 625e6ae5d03052e753c3322397b41f4174ca3926 /data | |
| parent | 79ec35d68d698710604fd4e9682188ae28ba1ae0 (diff) | |
| download | gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.gz gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.tar.zst gsoc2013-epiphany-2606279995f614634062e0aeb9833c482db5d083.zip | |
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.
Diffstat (limited to 'data')
| -rw-r--r-- | data/.cvsignore | 4 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/art/Makefile.am | 3 | ||||
| -rw-r--r-- | data/art/epiphany-close-tab.png | bin | 0 -> 260 bytes | |||
| -rw-r--r-- | data/art/epiphany-secure.png | bin | 866 -> 0 bytes | |||
| -rw-r--r-- | data/art/epiphany-unsecure.png | bin | 792 -> 0 bytes | |||
| -rw-r--r-- | data/epiphany-1.6.pc.in (renamed from data/epiphany-1.4.pc.in) | 0 | ||||
| -rw-r--r-- | data/ui/epiphany-ui.xml | 17 |
8 files changed, 20 insertions, 6 deletions
diff --git a/data/.cvsignore b/data/.cvsignore index 181c80d45..e6b3a3b26 100644 --- a/data/.cvsignore +++ b/data/.cvsignore @@ -4,6 +4,4 @@ Makefile.in *.schemas epiphany.desktop bme.desktop -epiphany-1.0.pc -epiphany-1.2.pc -epiphany-1.4.pc +*.pc diff --git a/data/Makefile.am b/data/Makefile.am index f7c94e813..8b6ef68fd 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -30,7 +30,7 @@ mimepermissiondir = $(pkgdatadir) mimepermission_DATA = mime-types-permissions.xml pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = epiphany-1.4.pc +pkgconfig_DATA = epiphany-1.6.pc install-data-local: if GCONF_SCHEMAS_INSTALL diff --git a/data/art/Makefile.am b/data/art/Makefile.am index cc27b7231..3ace0c8df 100644 --- a/data/art/Makefile.am +++ b/data/art/Makefile.am @@ -1,6 +1,5 @@ art_DATA = \ - epiphany-secure.png \ - epiphany-unsecure.png \ + epiphany-close-tab.png \ epiphany-entry.png \ epiphany-download.png \ epiphany-history.png \ diff --git a/data/art/epiphany-close-tab.png b/data/art/epiphany-close-tab.png Binary files differnew file mode 100644 index 000000000..43a549aa1 --- /dev/null +++ b/data/art/epiphany-close-tab.png diff --git a/data/art/epiphany-secure.png b/data/art/epiphany-secure.png Binary files differdeleted file mode 100644 index 36b3fc8b5..000000000 --- a/data/art/epiphany-secure.png +++ /dev/null diff --git a/data/art/epiphany-unsecure.png b/data/art/epiphany-unsecure.png Binary files differdeleted file mode 100644 index d6699dc94..000000000 --- a/data/art/epiphany-unsecure.png +++ /dev/null diff --git a/data/epiphany-1.4.pc.in b/data/epiphany-1.6.pc.in index bd81d700b..bd81d700b 100644 --- a/data/epiphany-1.4.pc.in +++ b/data/epiphany-1.6.pc.in 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"/> |
