isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dateMenu: Use desktop action to open Evolution calendar

Browse Source 
We include a private hidden .desktop file for evolution's calendar
component, so that we can explicitly open that component when
evolution is configured as the default calendar application.

That's because the evolution developers didn't want to ship
additional .desktop files at the time, but they have since
then included a desktop action that can be used for the same
purpose.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2479>
This commit is contained in:
Florian Müllner 2022-09-08 00:14:24 +02:00 committed by Marge Bot
parent 1236bf8f09
commit 661356766b
5 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -56,7 +56,6 @@ src/*.gir
src/*.typelib src/*.typelib
src/*-enum-types.[ch] src/*-enum-types.[ch]
src/*-marshal.[ch] src/*-marshal.[ch]
src/calendar-server/evolution-calendar.desktop
src/calendar-server/org.gnome.Shell.CalendarServer.service src/calendar-server/org.gnome.Shell.CalendarServer.service
src/gnome-shell src/gnome-shell
src/gnome-shell-calendar-server src/gnome-shell-calendar-server

13
js/ui/dateMenu.js
View File

@ -284,13 +284,12 @@ class EventsSection extends St.Button {
Main.overview.hide(); Main.overview.hide();
Main.panel.closeCalendar(); Main.panel.closeCalendar();
let appInfo = this._calendarApp; const appInfo = this._calendarApp;
if (appInfo.get_id() === 'org.gnome.Evolution.desktop') { const context = global.create_app_launch_context(0, -1);
const app = this._appSys.lookup_app('evolution-calendar.desktop'); if (appInfo.get_id() === 'org.gnome.Evolution.desktop')
if (app) appInfo.launch_action('calendar', context);
appInfo = app.app_info; else
} appInfo.launch([], context);
appInfo.launch([], global.create_app_launch_context(0, -1));
} }
_appInstalledChanged() { _appInstalledChanged() {

1
po/POTFILES.in
View File

@ -79,7 +79,6 @@ js/ui/welcomeDialog.js
js/ui/windowAttentionHandler.js js/ui/windowAttentionHandler.js
js/ui/windowManager.js js/ui/windowManager.js
js/ui/windowMenu.js js/ui/windowMenu.js
src/calendar-server/evolution-calendar.desktop.in
src/main.c src/main.c
src/shell-app.c src/shell-app.c
src/shell-app-system.c src/shell-app-system.c

8
src/calendar-server/evolution-calendar.desktop.in
View File

@ -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

9
src/calendar-server/meson.build
View File

@ -26,12 +26,3 @@ configure_file(
configuration: service_data, configuration: service_data,
install_dir: servicedir 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'
)