GNOME.org
 

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

commit 0961697a4ffcb27fc03eeed131d39d3937cc25c3
Author: Milan Crha <mcrha redhat com>
Date:   Mon Sep 4 16:13:05 2017 +0200

    Revert "Rename evolution.desktop to org.gnome.Evolution.desktop"
    
    This reverts commit 3f892a06345ae4df70611bb733f2d5b9eb2036a5.

 CMakeLists.txt                                     |    2 +
 cmake/modules/FindIntltool.cmake                   |    2 +-
 data/CMakeLists.txt                                |   22 +++++++++----------
 ....in.in => evolution-alarm-notify.desktop.in.in} |    0
 ...ution.desktop.in.in => evolution.desktop.in.in} |    0
 ...tion.appdata.xml.in => evolution.appdata.xml.in |    2 +-
 po/POTFILES.in                                     |   12 +++++-----
 po/POTFILES.skip                                   |    4 +-
 src/e-util/e-attachment-view.c                     |    2 +-
 src/modules/bogofilter/CMakeLists.txt              |    2 +-
 ...xml.in => evolution-bogofilter.metainfo.xml.in} |    2 +-
 src/modules/spamassassin/CMakeLists.txt            |    2 +-
 ...l.in => evolution-spamassassin.metainfo.xml.in} |    2 +-
 src/plugins/pst-import/CMakeLists.txt              |    2 +-
 ...tainfo.xml.in => evolution-pst.metainfo.xml.in} |    2 +-
 15 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f95d683..d4993df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/cmake/modules/FindIntltool.cmake b/cmake/modules/FindIntltool.cmake
index 1397b6d..a2c3547 100644
--- a/cmake/modules/FindIntltool.cmake
+++ b/cmake/modules/FindIntltool.cmake
@@ -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})
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 7a21421..e41dddc 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -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}
 )
 
diff --git a/data/org.gnome.Evolution-alarm-notify.desktop.in.in b/data/evolution-alarm-notify.desktop.in.in
similarity index 100%
rename from data/org.gnome.Evolution-alarm-notify.desktop.in.in
rename to data/evolution-alarm-notify.desktop.in.in
diff --git a/data/org.gnome.Evolution.desktop.in.in b/data/evolution.desktop.in.in
similarity index 100%
rename from data/org.gnome.Evolution.desktop.in.in
rename to data/evolution.desktop.in.in
diff --git a/data/org.gnome.Evolution.appdata.xml.in b/evolution.appdata.xml.in
similarity index 97%
rename from data/org.gnome.Evolution.appdata.xml.in
rename to evolution.appdata.xml.in
index f362bdc..fe9d664 100644
--- a/data/org.gnome.Evolution.appdata.xml.in
+++ b/evolution.appdata.xml.in
@@ -1,6 +1,6 @@
 <?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>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1fc9950..d0d411d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,8 @@
 # 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
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 05fe1c9..ac3e45e 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,6 @@
 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
diff --git a/src/e-util/e-attachment-view.c b/src/e-util/e-attachment-view.c
index 61b6c2d..3b368d3 100644
--- a/src/e-util/e-attachment-view.c
+++ b/src/e-util/e-attachment-view.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);
diff --git a/src/modules/bogofilter/CMakeLists.txt b/src/modules/bogofilter/CMakeLists.txt
index 858ade3..39b43c7 100644
--- a/src/modules/bogofilter/CMakeLists.txt
+++ b/src/modules/bogofilter/CMakeLists.txt
@@ -1,4 +1,4 @@
-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
diff --git a/src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in 
b/src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in
similarity index 91%
rename from src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in
rename to src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in
index d9adaf8..85dbd49 100644
--- a/src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in
+++ b/src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in
@@ -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>
diff --git a/src/modules/spamassassin/CMakeLists.txt b/src/modules/spamassassin/CMakeLists.txt
index 624f456..74d2587 100644
--- a/src/modules/spamassassin/CMakeLists.txt
+++ b/src/modules/spamassassin/CMakeLists.txt
@@ -1,4 +1,4 @@
-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
diff --git a/src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in 
b/src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in
similarity index 91%
rename from src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in
rename to src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in
index 6cc6bcc..8ceeff2 100644
--- a/src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in
+++ b/src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in
@@ -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>
diff --git a/src/plugins/pst-import/CMakeLists.txt b/src/plugins/pst-import/CMakeLists.txt
index e8bb55e..6b66393 100644
--- a/src/plugins/pst-import/CMakeLists.txt
+++ b/src/plugins/pst-import/CMakeLists.txt
@@ -1,5 +1,5 @@
 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
diff --git a/src/plugins/pst-import/org.gnome.Evolution-pst.metainfo.xml.in 
b/src/plugins/pst-import/evolution-pst.metainfo.xml.in
similarity index 91%
rename from src/plugins/pst-import/org.gnome.Evolution-pst.metainfo.xml.in
rename to src/plugins/pst-import/evolution-pst.metainfo.xml.in
index f39dde7..7925b2f 100644
--- a/src/plugins/pst-import/org.gnome.Evolution-pst.metainfo.xml.in
+++ b/src/plugins/pst-import/evolution-pst.metainfo.xml.in
@@ -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>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]