[PATCH] build: install notmuch-emacs-mua if configured with emacs

[PATCH] build: install notmuch-emacs-mua if configured with emacs

[Jani Nikula]

notmuch-emacs-mua is good enough to be installed with notmuch-emacs.
---
 Makefile.local | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile.local b/Makefile.local
index d1b0585f2866..c60f4e7d4792 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -311,6 +311,9 @@ notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME)
 install: all install-man
 	mkdir -p "$(DESTDIR)$(prefix)/bin/"
 	install notmuch-shared "$(DESTDIR)$(prefix)/bin/notmuch"
+ifeq ($(WITH_EMACS), 1)
+	install notmuch-emacs-mua "$(DESTDIR)$(prefix)/bin"
+endif
 ifeq ($(MAKECMDGOALS), install)
 	@echo ""
 	@echo "Notmuch is now installed to $(DESTDIR)$(prefix)"
-- 
2.1.4

[PATCH 1/2] build: only install the notmuch desktop file with emacs

[Jani Nikula]

The notmuch desktop file execs the emacs interface; no use installing
it if notmuch-emacs has not been installed.
---
 Makefile.local | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.local b/Makefile.local
index c60f4e7d4792..7cf694b068a0 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -338,8 +338,10 @@ endif
 
 .PHONY: install-desktop
 install-desktop:
+ifeq ($(WITH_EMACS), 1)
 	mkdir -p "$(DESTDIR)$(desktop_dir)"
 	desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" notmuch.desktop
+endif
 
 SRCS  := $(SRCS) $(notmuch_client_srcs)
 CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules)
-- 
2.1.4

[PATCH 2/2] notmuch.desktop: update to use notmuch-emacs-mua and handle mailto

[Jani Nikula]

With the mailto: handling in notmuch-emacs-mua, we can update the
desktop file to advertize we can be set as the default application to
handle email. While at it, add GenericName and Comment to be more
informative.
---
 notmuch.desktop | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/notmuch.desktop b/notmuch.desktop
index f1600473bf60..6498b74c763d 100644
--- a/notmuch.desktop
+++ b/notmuch.desktop
@@ -1,7 +1,10 @@
 [Desktop Entry]
 Name=Notmuch (emacs interface)
-Exec=emacs -f notmuch
+GenericName=Email Client
+Comment=Emacs based email client
+Exec=notmuch-emacs-mua %u
 Icon=emblem-mail
+MimeType=x-scheme-handler/mailto;
 Terminal=false
 Type=Application
 Categories=Network;Email;
-- 
2.1.4