From d564f8b254eaa371f5d59ffb292ba0f7fcd56439 Mon Sep 17 00:00:00 2001
From: Chris Shoemaker <c.shoemaker@cox.net>
Date: Mon, 29 May 2006 22:07:10 +0000
Subject: [PATCH]    Improve GNOME desktop integration.  Bug #342936    Patch
 supplied by Stanislav Brabec <sbrabec@suse.cz>.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14251 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/gnome/Makefile.am        | 18 +-----------------
 src/gnome/gnucash.desktop.in |  5 +++--
 src/gnome/gnucash.keys.in    |  3 ---
 src/gnome/gnucash.mime       |  2 --
 src/pixmaps/Makefile.am      |  6 ++++--
 5 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 src/gnome/gnucash.keys.in
 delete mode 100644 src/gnome/gnucash.mime

diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am
index 4776aca694..541288e6d5 100644
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -94,9 +94,6 @@ gnomeapp_DATA = $(gnomeapp_in_files:.desktop.in=.desktop)
 
 appicondir = $(datadir)/pixmaps
 
-mimedir = $(datadir)/mime-info
-mime_DATA = gnucash.keys gnucash.mime
-
 noinst_HEADERS = \
   dialog-chart-export.h \
   dialog-fincalc.h \
@@ -129,8 +126,6 @@ noinst_HEADERS = \
 
 EXTRA_DIST = \
   gnucash.desktop.in \
-  gnucash.keys.in \
-  gnucash.mime \
   ${gwmod_DATA}
 
 
@@ -166,17 +161,6 @@ AM_CFLAGS = \
 # The line below breaks automake 1.5.  
 ##OMIT_DEPENDENCIES = gnc-dir.h
 
-## We borrow guile's convention and use @-...-@ as the substitution
-## brackets here, instead of the usual @...@.  This prevents autoconf
-## from substituting the values directly into the left-hand sides of
-## the sed substitutions.
-gnucash.keys: gnucash.keys.in ${top_builddir}/config.status Makefile
-	rm -f $@.tmp
-	sed < $< > $@.tmp \
-            -e 's:@-icondir-@:${appicondir}:g'
-	chmod +x $@.tmp
-	mv $@.tmp $@
-
 noinst_DATA = .scm-links
 
 if GNUCASH_SEPARATE_BUILDDIR
@@ -206,5 +190,5 @@ gw-gnc.scm gw-gnc.h gw-gnc.c gw-gnc.html: \
            (primitive-load \"./gw-gnc-spec.scm\") \
            (gw:generate-wrapset \"gw-gnc\")"
 BUILT_SOURCES = gw-gnc.scm gw-gnc.h gw-gnc.c
-CLEANFILES = gnucash.keys gnucash.desktop gnucash g-wrapped .scm-links
+CLEANFILES = gnucash.desktop gnucash g-wrapped .scm-links
 DISTCLEANFILES = ${SCM_FILE_LINKS} gw-gnc.html
diff --git a/src/gnome/gnucash.desktop.in b/src/gnome/gnucash.desktop.in
index 91eb39462a..70c7eb34cc 100644
--- a/src/gnome/gnucash.desktop.in
+++ b/src/gnome/gnucash.desktop.in
@@ -1,10 +1,11 @@
 [Desktop Entry]
 _Name=GnuCash Finance Management
 _Comment=Manage your finances, accounts, and investments
-Exec=gnucash
-Icon=gnucash/gnucash-icon.png
+Exec=gnucash %f
+Icon=gnucash-icon
 StartupNotify=true
 Terminal=false
 Type=Application
 Categories=Application;Office;Finance;
 X-Desktop-File-Install-Version=0.3
+MimeType=application/x-gnucash
diff --git a/src/gnome/gnucash.keys.in b/src/gnome/gnucash.keys.in
deleted file mode 100644
index aeb2aa7e00..0000000000
--- a/src/gnome/gnucash.keys.in
+++ /dev/null
@@ -1,3 +0,0 @@
-application/x-gnucash:
-	open=gnucash %f
-	view=gnucash %f
diff --git a/src/gnome/gnucash.mime b/src/gnome/gnucash.mime
deleted file mode 100644
index 67bb11df9a..0000000000
--- a/src/gnome/gnucash.mime
+++ /dev/null
@@ -1,2 +0,0 @@
-application/x-gnucash
-	ext: xac gnc gnucash
diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
index 8b45d4f18f..661ab3d276 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/pixmaps/Makefile.am
@@ -28,10 +28,12 @@ gncpixmap_DATA = \
   gnc-sx-new.png \
   gnc-transfer-16.png \
   gnc-transfer.png \
-  gnucash-icon.png \
   gnucash_splash.png \
   stock_split_title.png \
   stock_split_watermark.png
 
+gncicondir = ${datadir}/pixmaps
+gncicon_DATA = gnucash-icon.png
+
 EXTRA_DIST = \
-  ${gncpixmap_DATA}
+  ${gncpixmap_DATA} ${gncicon_DATA}