Commit 0961697a authored by Milan Crha's avatar Milan Crha

Revert "Rename evolution.desktop to org.gnome.Evolution.desktop"

This reverts commit 3f892a06.
parent 27e906d3
......@@ -718,6 +718,8 @@ add_pkgconfig_file(evolution-calendar.pc.in evolution-calendar-${INTERFACE_VERSI
add_pkgconfig_file(evolution-mail.pc.in evolution-mail-${INTERFACE_VERSION}.pc)
add_pkgconfig_file(evolution-shell.pc.in evolution-shell-${INTERFACE_VERSION}.pc)
add_appdata_file(evolution.appdata.xml.in evolution.appdata.xml)
add_subdirectory(data)
add_subdirectory(po)
add_subdirectory(src)
......
......@@ -189,7 +189,7 @@ macro(add_appdata_file _infilename _outfilename)
endif(NOT TARGET appdata-files)
set(_out ${_outfilename})
get_filename_component(_outtarget ${_out} NAME)
get_filename_component(_outtarget ${_out} NAME_WE)
get_filename_component(_path ${_out} DIRECTORY)
if(_path STREQUAL "")
set(_out ${CMAKE_CURRENT_BINARY_DIR}/${_out})
......
......@@ -3,31 +3,29 @@ set(autostartdir ${SYSCONF_INSTALL_DIR}/xdg/autostart)
set(desktopdir ${SHARE_INSTALL_PREFIX}/applications)
set(themedir ${privdatadir}/theme)
configure_file(org.gnome.Evolution.desktop.in.in
org.gnome.Evolution.desktop.in
configure_file(evolution.desktop.in.in
evolution.desktop.in
@ONLY
)
intltool_merge(${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution.desktop.in org.gnome.Evolution.desktop --desktop-style --utf8)
intltool_merge(${CMAKE_CURRENT_BINARY_DIR}/evolution.desktop.in evolution.desktop --desktop-style --utf8)
list(APPEND filedeps ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution.desktop)
list(APPEND filedeps ${CMAKE_CURRENT_BINARY_DIR}/evolution.desktop)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution.desktop
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/evolution.desktop
DESTINATION ${desktopdir}
)
add_appdata_file(org.gnome.Evolution.appdata.xml.in org.gnome.Evolution.appdata.xml)
configure_file(org.gnome.Evolution-alarm-notify.desktop.in.in
org.gnome.Evolution-alarm-notify.desktop.in
configure_file(evolution-alarm-notify.desktop.in.in
evolution-alarm-notify.desktop.in
@ONLY
)
intltool_merge(${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution-alarm-notify.desktop.in org.gnome.Evolution-alarm-notify.desktop --desktop-style --utf8)
intltool_merge(${CMAKE_CURRENT_BINARY_DIR}/evolution-alarm-notify.desktop.in evolution-alarm-notify.desktop --desktop-style --utf8)
list(APPEND filedeps ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution-alarm-notify.desktop)
list(APPEND filedeps ${CMAKE_CURRENT_BINARY_DIR}/evolution-alarm-notify.desktop)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution-alarm-notify.desktop
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/evolution-alarm-notify.desktop
DESTINATION ${autostartdir}
)
......
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>org.gnome.Evolution.desktop</id>
<id>evolution.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+ and GFDL-1.3</project_license>
<_name>Evolution</_name>
......
# List of source files containing translatable strings.
# Please keep this list in alphabetic order.
evolution.appdata.xml.in
data/evolution-alarm-notify.desktop.in.in
data/evolution.desktop.in.in
data/org.gnome.evolution.addressbook.gschema.xml.in
data/org.gnome.evolution.bogofilter.gschema.xml.in
data/org.gnome.evolution.calendar.gschema.xml.in
......@@ -19,9 +22,6 @@ data/org.gnome.evolution.plugin.templates.gschema.xml.in
data/org.gnome.evolution.shell.gschema.xml.in
data/org.gnome.evolution.spamassassin.gschema.xml.in
data/org.gnome.evolution.text-highlight.gschema.xml.in
data/org.gnome.Evolution.appdata.xml.in
data/org.gnome.Evolution.desktop.in.in
data/org.gnome.Evolution-alarm-notify.desktop.in.in
data/views/addressbook/galview.xml
data/views/calendar/galview.xml
data/views/mail/galview.xml
......@@ -399,7 +399,7 @@ src/modules/backup-restore/evolution-backup-restore.c
src/modules/backup-restore/evolution-backup-tool.c
src/modules/backup-restore/org-gnome-backup-restore.error.xml
src/modules/bogofilter/evolution-bogofilter.c
src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in
src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in
src/modules/book-config-google/evolution-book-config-google.c
src/modules/book-config-ldap/evolution-book-config-ldap.c
src/modules/book-config-webdav/evolution-book-config-webdav.c
......@@ -468,7 +468,7 @@ src/modules/prefer-plain/e-mail-parser-prefer-plain.c
src/modules/prefer-plain/plugin/config-ui.c
src/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml
src/modules/spamassassin/evolution-spamassassin.c
src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in
src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in
src/modules/startup-wizard/e-mail-config-import-page.c
src/modules/startup-wizard/e-mail-config-import-progress-page.c
src/modules/startup-wizard/e-startup-assistant.c
......@@ -503,7 +503,7 @@ src/plugins/mail-notification/mail-notification.c
src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml
src/plugins/mail-to-task/mail-to-task.c
src/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
src/plugins/pst-import/org.gnome.Evolution-pst.metainfo.xml.in
src/plugins/pst-import/evolution-pst.metainfo.xml.in
src/plugins/pst-import/org-gnome-pst-import.eplug.xml
src/plugins/pst-import/pst-importer.c
src/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml
......
build/
.build/
_build/
data/org.gnome.Evolution-alarm-notify.desktop.in
data/org.gnome.Evolution.desktop.in
data/evolution-alarm-notify.desktop.in
data/evolution.desktop.in
src/e-util/test-html-editor.c
......@@ -769,7 +769,7 @@ attachment_view_update_actions (EAttachmentView *view)
continue;
/* Don't list 'Open With "Evolution"'. */
if (g_str_equal (app_id, "org.gnome.Evolution.desktop"))
if (g_str_equal (app_id, "evolution.desktop"))
continue;
action_name = g_strdup_printf ("open-with-%s", app_id);
......
add_appdata_file(org.gnome.Evolution-bogofilter.metainfo.xml.in org.gnome.Evolution-bogofilter.metainfo.xml)
add_appdata_file(evolution-bogofilter.metainfo.xml.in evolution-bogofilter.metainfo.xml)
set(extra_deps
email-engine
......
......@@ -2,7 +2,7 @@
<!-- Copyright 2014 Evolution Team <evolution-hackers@gnome.org> -->
<component type="addon">
<id>evolution-bogofilter</id>
<extends>org.gnome.Evolution.desktop</extends>
<extends>evolution.desktop</extends>
<_name>Bogofilter</_name>
<_summary>Junk filter using Bogofilter</_summary>
<url type="homepage">https://live.gnome.org/Apps/Evolution</url>
......
add_appdata_file(org.gnome.Evolution-spamassassin.metainfo.xml.in org.gnome.Evolution-spamassassin.metainfo.xml)
add_appdata_file(evolution-spamassassin.metainfo.xml.in evolution-spamassassin.metainfo.xml)
set(extra_deps
email-engine
......
......@@ -2,7 +2,7 @@
<!-- Copyright 2014 Evolution Team <evolution-hackers@gnome.org> -->
<component type="addon">
<id>evolution-spamassassin</id>
<extends>org.gnome.Evolution.desktop</extends>
<extends>evolution.desktop</extends>
<_name>SpamAssassin</_name>
<_summary>Junk filter using SpamAssassin</_summary>
<url type="homepage">https://live.gnome.org/Apps/Evolution</url>
......
add_eplug_file(pst-import org-gnome-pst-import.eplug)
add_appdata_file(org.gnome.Evolution-pst.metainfo.xml.in org.gnome.Evolution-pst.metainfo.xml)
add_appdata_file(evolution-pst.metainfo.xml.in evolution-pst.metainfo.xml)
set(DEPENDENCIES
email-engine
......
......@@ -2,7 +2,7 @@
<!-- Copyright 2016 Evolution Team <evolution-hackers@gnome.org> -->
<component type="addon">
<id>evolution-pst</id>
<extends>org.gnome.Evolution.desktop</extends>
<extends>evolution.desktop</extends>
<_name>Outlook PST import</_name>
<_summary>Import Outlook messages from PST file</_summary>
<url type="homepage">https://live.gnome.org/Apps/Evolution</url>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment