From f7aaca5e29ce547c76c1b53dedbfd56fd4badbc8 Mon Sep 17 00:00:00 2001 From: rbuj Date: Sun, 18 Aug 2019 13:13:00 +0200 Subject: Use absolute path of binary on desktop files ./autogen.sh --prefix=/usr && make ... GEN caja.desktop.in GEN caja.desktop GEN caja-home.desktop.in GEN caja-home.desktop GEN caja-computer.desktop.in GEN caja-computer.desktop GEN caja-folder-handler.desktop.in GEN caja-folder-handler.desktop GEN caja-file-management-properties.desktop.in GEN caja-file-management-properties.desktop GEN caja-browser.desktop.in GEN caja-browser.desktop GEN caja-autorun-software.desktop.in GEN caja-autorun-software.desktop GEN mate-network-scheme.desktop.in GEN mate-network-scheme.desktop ... grep Exec= data/*.desktop data/caja-autorun-software.desktop:TryExec=/usr/bin/caja-autorun-software data/caja-autorun-software.desktop:Exec=/usr/bin/caja-autorun-software %u data/caja-browser.desktop:TryExec=/usr/bin/caja data/caja-browser.desktop:Exec=/usr/bin/caja --no-desktop --browser %U data/caja-computer.desktop:TryExec=/usr/bin/caja data/caja-computer.desktop:Exec=/usr/bin/caja --no-desktop computer: data/caja.desktop:Exec=/usr/bin/caja data/caja-file-management-properties.desktop:Exec=/usr/bin/caja-file-management-properties data/caja-folder-handler.desktop:TryExec=/usr/bin/caja data/caja-folder-handler.desktop:Exec=/usr/bin/caja --no-desktop %U data/caja-home.desktop:TryExec=/usr/bin/caja data/caja-home.desktop:Exec=/usr/bin/caja --no-desktop data/mate-network-scheme.desktop:TryExec=/usr/bin/caja data/mate-network-scheme.desktop:Exec=/usr/bin/caja --no-desktop network: --- data/Makefile.am | 26 +++++++++++++--------- data/caja-autorun-software.desktop.in | 10 --------- data/caja-autorun-software.desktop.in.in | 10 +++++++++ data/caja-browser.desktop.in | 13 ----------- data/caja-browser.desktop.in.in | 13 +++++++++++ data/caja-computer.desktop.in | 13 ----------- data/caja-computer.desktop.in.in | 13 +++++++++++ data/caja-file-management-properties.desktop.in | 11 --------- data/caja-file-management-properties.desktop.in.in | 11 +++++++++ data/caja-folder-handler.desktop.in | 12 ---------- data/caja-folder-handler.desktop.in.in | 12 ++++++++++ data/caja-home.desktop.in | 13 ----------- data/caja-home.desktop.in.in | 13 +++++++++++ data/caja.desktop.in | 14 ------------ data/caja.desktop.in.in | 14 ++++++++++++ data/mate-network-scheme.desktop.in.in | 13 +++++++++++ po/POTFILES.in | 16 ++++++------- src/Makefile.am | 12 ---------- src/mate-network-scheme.desktop.in | 13 ----------- 19 files changed, 123 insertions(+), 129 deletions(-) delete mode 100644 data/caja-autorun-software.desktop.in create mode 100644 data/caja-autorun-software.desktop.in.in delete mode 100644 data/caja-browser.desktop.in create mode 100644 data/caja-browser.desktop.in.in delete mode 100644 data/caja-computer.desktop.in create mode 100644 data/caja-computer.desktop.in.in delete mode 100644 data/caja-file-management-properties.desktop.in create mode 100644 data/caja-file-management-properties.desktop.in.in delete mode 100644 data/caja-folder-handler.desktop.in create mode 100644 data/caja-folder-handler.desktop.in.in delete mode 100644 data/caja-home.desktop.in create mode 100644 data/caja-home.desktop.in.in delete mode 100644 data/caja.desktop.in create mode 100644 data/caja.desktop.in.in create mode 100644 data/mate-network-scheme.desktop.in.in delete mode 100644 src/mate-network-scheme.desktop.in diff --git a/data/Makefile.am b/data/Makefile.am index 20202cf2..314241a9 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -7,17 +7,21 @@ xml_files = $(xml_in_files:.xml.in=.xml) $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ desktopdir = $(datadir)/applications -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -desktop_in_files = \ - caja.desktop.in \ - caja-home.desktop.in \ - caja-computer.desktop.in \ - caja-folder-handler.desktop.in \ - caja-file-management-properties.desktop.in \ - caja-browser.desktop.in \ - caja-autorun-software.desktop.in -%.desktop: %.desktop.in +desktop_DATA = \ + caja.desktop \ + caja-home.desktop \ + caja-computer.desktop \ + caja-folder-handler.desktop \ + caja-file-management-properties.desktop \ + caja-browser.desktop \ + caja-autorun-software.desktop \ + mate-network-scheme.desktop +desktop_in_files = $(desktop_DATA:.desktop=.desktop.in) +desktop_in_in_files = $(desktop_DATA:.desktop=.desktop.in.in) +%.desktop.in: %.desktop.in.in $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ +%.desktop: %.desktop.in + $(AM_V_GEN) sed -e 's|@bindir[@]|$(bindir)|g' $< > $@ mimedir = $(datadir)/mime/packages mime_DATA = $(xml_files) @@ -60,12 +64,14 @@ EXTRA_DIST = $(cajadata_DATA) \ $(xml_in_files) \ $(cajadata_in_files) \ $(desktop_in_files) \ + $(desktop_in_in_files) \ $(service_in_files) \ $(appdata_in_files) \ $(NULL) CLEANFILES = $(xml_files) \ $(desktop_DATA) \ + $(desktop_in_files) \ $(service_DATA) \ caja.appdata.xml \ $(NULL) diff --git a/data/caja-autorun-software.desktop.in b/data/caja-autorun-software.desktop.in deleted file mode 100644 index 0db85788..00000000 --- a/data/caja-autorun-software.desktop.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Autorun Prompt -TryExec=caja-autorun-software -Exec=caja-autorun-software %u -Icon=application-x-executable -NoDisplay=true -Terminal=false -StartupNotify=true -Type=Application -MimeType=x-content/software; diff --git a/data/caja-autorun-software.desktop.in.in b/data/caja-autorun-software.desktop.in.in new file mode 100644 index 00000000..aa116f11 --- /dev/null +++ b/data/caja-autorun-software.desktop.in.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Autorun Prompt +TryExec=@bindir@/caja-autorun-software +Exec=@bindir@/caja-autorun-software %u +Icon=application-x-executable +NoDisplay=true +Terminal=false +StartupNotify=true +Type=Application +MimeType=x-content/software; diff --git a/data/caja-browser.desktop.in b/data/caja-browser.desktop.in deleted file mode 100644 index a9a40eb0..00000000 --- a/data/caja-browser.desktop.in +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Name=Caja -GenericName=File Browser -Comment=Browse the file system with the file manager -TryExec=caja -Exec=caja --no-desktop --browser %U -Icon=system-file-manager -Terminal=false -StartupNotify=false -Type=Application -Categories=GTK;System;Utility;Core; -Keywords=files;browser;manager;MATE; -OnlyShowIn=MATE; diff --git a/data/caja-browser.desktop.in.in b/data/caja-browser.desktop.in.in new file mode 100644 index 00000000..45800040 --- /dev/null +++ b/data/caja-browser.desktop.in.in @@ -0,0 +1,13 @@ +[Desktop Entry] +Name=Caja +GenericName=File Browser +Comment=Browse the file system with the file manager +TryExec=@bindir@/caja +Exec=@bindir@/caja --no-desktop --browser %U +Icon=system-file-manager +Terminal=false +StartupNotify=false +Type=Application +Categories=GTK;System;Utility;Core; +Keywords=files;browser;manager;MATE; +OnlyShowIn=MATE; diff --git a/data/caja-computer.desktop.in b/data/caja-computer.desktop.in deleted file mode 100644 index 25c1ba24..00000000 --- a/data/caja-computer.desktop.in +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Name=Computer -Comment=Browse all local and remote disks and folders accessible from this computer -TryExec=caja -Exec=caja --no-desktop computer: -Icon=computer -Terminal=false -StartupNotify=true -Type=Application -Categories=GTK;System;Core; -Keywords=browse;disks;folders;local;remote;computer;MATE; -OnlyShowIn=MATE; -NoDisplay=true diff --git a/data/caja-computer.desktop.in.in b/data/caja-computer.desktop.in.in new file mode 100644 index 00000000..7d638aa0 --- /dev/null +++ b/data/caja-computer.desktop.in.in @@ -0,0 +1,13 @@ +[Desktop Entry] +Name=Computer +Comment=Browse all local and remote disks and folders accessible from this computer +TryExec=@bindir@/caja +Exec=@bindir@/caja --no-desktop computer: +Icon=computer +Terminal=false +StartupNotify=true +Type=Application +Categories=GTK;System;Core; +Keywords=browse;disks;folders;local;remote;computer;MATE; +OnlyShowIn=MATE; +NoDisplay=true diff --git a/data/caja-file-management-properties.desktop.in b/data/caja-file-management-properties.desktop.in deleted file mode 100644 index 14ee8f24..00000000 --- a/data/caja-file-management-properties.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=File Management -Comment=Change the behaviour and appearance of file manager windows -Exec=caja-file-management-properties -Icon=system-file-manager -Terminal=false -Type=Application -StartupNotify=true -Categories=GTK;Settings;X-MATE-PersonalSettings; -Keywords=file;manager;change;properties;behaviour;appearance;windows;MATE; -OnlyShowIn=MATE; diff --git a/data/caja-file-management-properties.desktop.in.in b/data/caja-file-management-properties.desktop.in.in new file mode 100644 index 00000000..2851a7c9 --- /dev/null +++ b/data/caja-file-management-properties.desktop.in.in @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=File Management +Comment=Change the behaviour and appearance of file manager windows +Exec=@bindir@/caja-file-management-properties +Icon=system-file-manager +Terminal=false +Type=Application +StartupNotify=true +Categories=GTK;Settings;X-MATE-PersonalSettings; +Keywords=file;manager;change;properties;behaviour;appearance;windows;MATE; +OnlyShowIn=MATE; diff --git a/data/caja-folder-handler.desktop.in b/data/caja-folder-handler.desktop.in deleted file mode 100644 index b536bf89..00000000 --- a/data/caja-folder-handler.desktop.in +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=Caja -GenericName=Open Folder -TryExec=caja -Exec=caja --no-desktop %U -NoDisplay=true -Terminal=false -Icon=folder-open -StartupNotify=false -Type=Application -MimeType=inode/directory;application/x-mate-saved-search; -OnlyShowIn=MATE; diff --git a/data/caja-folder-handler.desktop.in.in b/data/caja-folder-handler.desktop.in.in new file mode 100644 index 00000000..017e0fdc --- /dev/null +++ b/data/caja-folder-handler.desktop.in.in @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=Caja +GenericName=Open Folder +TryExec=@bindir@/caja +Exec=@bindir@/caja --no-desktop %U +NoDisplay=true +Terminal=false +Icon=folder-open +StartupNotify=false +Type=Application +MimeType=inode/directory;application/x-mate-saved-search; +OnlyShowIn=MATE; diff --git a/data/caja-home.desktop.in b/data/caja-home.desktop.in deleted file mode 100644 index 3aad993f..00000000 --- a/data/caja-home.desktop.in +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Name=Home Folder -Comment=Open your personal folder -TryExec=caja -Exec=caja --no-desktop -Icon=user-home -Terminal=false -StartupNotify=true -Type=Application -Categories=GTK;System;Core; -Keywords=home;personal;folder;open;MATE; -OnlyShowIn=MATE; -NoDisplay=true diff --git a/data/caja-home.desktop.in.in b/data/caja-home.desktop.in.in new file mode 100644 index 00000000..d0d1d5ba --- /dev/null +++ b/data/caja-home.desktop.in.in @@ -0,0 +1,13 @@ +[Desktop Entry] +Name=Home Folder +Comment=Open your personal folder +TryExec=@bindir@/caja +Exec=@bindir@/caja --no-desktop +Icon=user-home +Terminal=false +StartupNotify=true +Type=Application +Categories=GTK;System;Core; +Keywords=home;personal;folder;open;MATE; +OnlyShowIn=MATE; +NoDisplay=true diff --git a/data/caja.desktop.in b/data/caja.desktop.in deleted file mode 100644 index ce4f8340..00000000 --- a/data/caja.desktop.in +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Name=Caja -GenericName=File Manager -Exec=caja -Icon=system-file-manager -Terminal=false -Type=Application -StartupNotify=false -NoDisplay=true -OnlyShowIn=MATE; -X-MATE-Autostart-Phase=Desktop -X-MATE-Autostart-Notify=true -X-MATE-AutoRestart=true -X-MATE-Provides=filemanager diff --git a/data/caja.desktop.in.in b/data/caja.desktop.in.in new file mode 100644 index 00000000..5f109692 --- /dev/null +++ b/data/caja.desktop.in.in @@ -0,0 +1,14 @@ +[Desktop Entry] +Name=Caja +GenericName=File Manager +Exec=@bindir@/caja +Icon=system-file-manager +Terminal=false +Type=Application +StartupNotify=false +NoDisplay=true +OnlyShowIn=MATE; +X-MATE-Autostart-Phase=Desktop +X-MATE-Autostart-Notify=true +X-MATE-AutoRestart=true +X-MATE-Provides=filemanager diff --git a/data/mate-network-scheme.desktop.in.in b/data/mate-network-scheme.desktop.in.in new file mode 100644 index 00000000..ca7f0a2c --- /dev/null +++ b/data/mate-network-scheme.desktop.in.in @@ -0,0 +1,13 @@ +[Desktop Entry] +Name=Network +Comment=Browse bookmarked and local network locations +TryExec=@bindir@/caja +Exec=@bindir@/caja --no-desktop network: +Terminal=false +StartupNotify=true +Type=Application +Icon=network-workgroup +Categories=GTK;System;Core; +Keywords=bookmarks;browse;local;network;locations;MATE; +OnlyShowIn=MATE; +NoDisplay=true diff --git a/po/POTFILES.in b/po/POTFILES.in index c77d550e..f97157e8 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,14 +2,15 @@ # Please keep this file sorted alphabetically. data/browser.xml.in data/caja.appdata.xml.in -data/caja-autorun-software.desktop.in -data/caja-browser.desktop.in -data/caja-computer.desktop.in -data/caja.desktop.in -data/caja-file-management-properties.desktop.in -data/caja-folder-handler.desktop.in -data/caja-home.desktop.in +data/caja-autorun-software.desktop.in.in +data/caja-browser.desktop.in.in +data/caja-computer.desktop.in.in +data/caja.desktop.in.in +data/caja-file-management-properties.desktop.in.in +data/caja-folder-handler.desktop.in.in +data/caja-home.desktop.in.in data/caja.xml.in +data/mate-network-scheme.desktop.in.in eel/eel-canvas.c eel/eel-editable-label.c eel/eel-glib-extensions.c @@ -112,4 +113,3 @@ src/caja-window-toolbars.c src/caja-window.c src/caja-x-content-bar.c src/caja-zoom-control.c -src/mate-network-scheme.desktop.in diff --git a/src/Makefile.am b/src/Makefile.am index 5641e922..8ce75565 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,16 +51,6 @@ $(dbus_freedesktop_built_sources) : Makefile.am $(top_srcdir)/data/freedesktop-d $(top_srcdir)/data/freedesktop-dbus-interfaces.xml \ $(NULL) -desktop_in_files=mate-network-scheme.desktop.in -desktop_files=$(desktop_in_files:.desktop.in=.desktop) -desktopdir = $(datadir)/mate/network/ - -$(desktop_files): $(desktop_in_files) - $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ - -schemedir = $(datadir)/applications -scheme_DATA = mate-network-scheme.desktop - BUILT_SOURCES = \ caja-src-marshal.c \ caja-src-marshal.h \ @@ -220,7 +210,6 @@ ui_DATA = \ CLEANFILES = \ caja-src-marshal.list \ $(BUILT_SOURCES) \ - $(desktop_files) \ $(server_DATA) \ $(NULL) @@ -230,7 +219,6 @@ EXTRA_DIST = \ $(ui_DATA) \ check-caja \ $(about_DATA) \ - $(desktop_in_files) \ $(NULL) dist-hook: diff --git a/src/mate-network-scheme.desktop.in b/src/mate-network-scheme.desktop.in deleted file mode 100644 index d3449fa5..00000000 --- a/src/mate-network-scheme.desktop.in +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Name=Network -Comment=Browse bookmarked and local network locations -TryExec=caja -Exec=caja --no-desktop network: -Terminal=false -StartupNotify=true -Type=Application -Icon=network-workgroup -Categories=GTK;System;Core; -Keywords=bookmarks;browse;local;network;locations;MATE; -OnlyShowIn=MATE; -NoDisplay=true -- cgit v1.2.1