diff --git a/.gitignore b/.gitignore index 396a628e5..f692b4944 100644 --- a/.gitignore +++ b/.gitignore @@ -56,7 +56,6 @@ src/*.gir src/*.typelib src/*-enum-types.[ch] src/*-marshal.[ch] -src/calendar-server/evolution-calendar.desktop src/calendar-server/org.gnome.Shell.CalendarServer.service src/gnome-shell src/gnome-shell-calendar-server diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js index 2c44f0c4f..96458d2fd 100644 --- a/js/ui/dateMenu.js +++ b/js/ui/dateMenu.js @@ -284,13 +284,12 @@ class EventsSection extends St.Button { Main.overview.hide(); Main.panel.closeCalendar(); - let appInfo = this._calendarApp; - if (appInfo.get_id() === 'org.gnome.Evolution.desktop') { - const app = this._appSys.lookup_app('evolution-calendar.desktop'); - if (app) - appInfo = app.app_info; - } - appInfo.launch([], global.create_app_launch_context(0, -1)); + const appInfo = this._calendarApp; + const context = global.create_app_launch_context(0, -1); + if (appInfo.get_id() === 'org.gnome.Evolution.desktop') + appInfo.launch_action('calendar', context); + else + appInfo.launch([], context); } _appInstalledChanged() { diff --git a/po/POTFILES.in b/po/POTFILES.in index 88409eb95..431580bb0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -79,7 +79,6 @@ js/ui/welcomeDialog.js js/ui/windowAttentionHandler.js js/ui/windowManager.js js/ui/windowMenu.js -src/calendar-server/evolution-calendar.desktop.in src/main.c src/shell-app.c src/shell-app-system.c diff --git a/src/calendar-server/evolution-calendar.desktop.in b/src/calendar-server/evolution-calendar.desktop.in deleted file mode 100644 index 1e3499771..000000000 --- a/src/calendar-server/evolution-calendar.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Evolution Calendar -Exec=evolution -c calendar -# Translators: Do NOT translate or transliterate this text (this is an icon file name)! -Icon=evolution -NoDisplay=true -Type=Application -StartupNotify=true diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build index 8b4ef411c..4b92ca503 100644 --- a/src/calendar-server/meson.build +++ b/src/calendar-server/meson.build @@ -26,12 +26,3 @@ configure_file( configuration: service_data, install_dir: servicedir ) - -i18n.merge_file( - input: 'evolution-calendar.desktop.in', - output: 'evolution-calendar.desktop', - po_dir: po_dir, - install: true, - install_dir: desktopdir, - type: 'desktop' -)