diff options
author | Xan Lopez <xan@igalia.com> | 2012-01-27 17:32:45 +0800 |
---|---|---|
committer | Xan Lopez <xan@igalia.com> | 2012-01-27 17:33:37 +0800 |
commit | 6bda078417b917696fef7d8fe028391837ad5966 (patch) | |
tree | 7bc080373e38b23fcdd5727eb0c36aabeacee73f | |
parent | 407813deb5700a3adcbf050e7d865ee705214c1f (diff) | |
download | gsoc2013-epiphany-6bda078417b917696fef7d8fe028391837ad5966.tar.gz gsoc2013-epiphany-6bda078417b917696fef7d8fe028391837ad5966.tar.zst gsoc2013-epiphany-6bda078417b917696fef7d8fe028391837ad5966.zip |
Remove the Bookmarks Editor desktop file
There's really no much point in shipping it as a separate "application".
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | data/Makefile.am | 4 | ||||
-rw-r--r-- | data/art/Makefile.am | 19 | ||||
-rw-r--r-- | data/art/epiphany-bookmarks.png | bin | 1287 -> 0 bytes | |||
-rw-r--r-- | data/bme.desktop.in.in | 14 | ||||
-rw-r--r-- | po/POTFILES.in | 1 |
6 files changed, 2 insertions, 38 deletions
diff --git a/configure.ac b/configure.ac index 8ae57c1e3..05768cdd6 100644 --- a/configure.ac +++ b/configure.ac @@ -323,8 +323,6 @@ Makefile data/Makefile data/epiphany-${EPIPHANY_API_VERSION}.pc:data/epiphany.pc.in data/epiphany.desktop.in -data/bme.desktop.in -data/art/Makefile data/pages/Makefile data/ui/Makefile doc/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 24b356b06..f8f4e92e8 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,9 +1,9 @@ -SUBDIRS = art pages ui +SUBDIRS = pages ui @INTLTOOL_SERVER_RULE@ @INTLTOOL_DESKTOP_RULE@ -desktop_in_files = epiphany.desktop.in.in bme.desktop.in.in +desktop_in_files = epiphany.desktop.in.in desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) diff --git a/data/art/Makefile.am b/data/art/Makefile.am deleted file mode 100644 index e2bcb8ddb..000000000 --- a/data/art/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -art_DATA = - -appicon_DATA = epiphany-bookmarks.png -appicondir = $(datadir)/icons/hicolor/48x48/apps - -artdir = $(pkgdatadir)/art - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating GTK+ icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - -EXTRA_DIST = $(appicon_DATA) $(art_DATA) diff --git a/data/art/epiphany-bookmarks.png b/data/art/epiphany-bookmarks.png Binary files differdeleted file mode 100644 index 389152ef3..000000000 --- a/data/art/epiphany-bookmarks.png +++ /dev/null diff --git a/data/bme.desktop.in.in b/data/bme.desktop.in.in deleted file mode 100644 index 97572d4e1..000000000 --- a/data/bme.desktop.in.in +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -_Name=Epiphany Web Bookmarks -_GenericName=Web Bookmarks -_Comment=Browse and organize your bookmarks -Exec=epiphany --bookmarks-editor -StartupNotify=true -Terminal=false -Type=Application -Icon=epiphany-bookmarks -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=epiphany -X-GNOME-Bugzilla-Component=BugBuddyBugs -X-GNOME-Bugzilla-Version=@VERSION@ -Categories=Network;GNOME;GTK; diff --git a/po/POTFILES.in b/po/POTFILES.in index 1693495b1..c63b57773 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,6 @@ [encoding: UTF-8] # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -data/bme.desktop.in.in [type: gettext/xml]data/default-bookmarks.rdf.in data/epiphany.desktop.in.in [type: gettext/glade]data/ui/epiphany.ui |