[Gnucash-changes] r14251 - gnucash/trunk/src - Improve GNOME desktop integration. Bug #342936

[Chris Shoemaker]

Author: chris
Date: 2006-05-29 18:07:10 -0400 (Mon, 29 May 2006)
New Revision: 14251
Trac: http://svn.gnucash.org/trac/changeset/14251

Removed:
   gnucash/trunk/src/gnome/gnucash.keys.in
   gnucash/trunk/src/gnome/gnucash.mime
Modified:
   gnucash/trunk/src/gnome/Makefile.am
   gnucash/trunk/src/gnome/gnucash.desktop.in
   gnucash/trunk/src/pixmaps/Makefile.am
Log:
   Improve GNOME desktop integration.  Bug #342936
   Patch supplied by Stanislav Brabec <sbrabec at suse.cz>.
 


Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am	2006-05-29 21:25:41 UTC (rev 14250)
+++ gnucash/trunk/src/gnome/Makefile.am	2006-05-29 22:07:10 UTC (rev 14251)
@@ -94,9 +94,6 @@
 
 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 @@
 
 EXTRA_DIST = \
   gnucash.desktop.in \
-  gnucash.keys.in \
-  gnucash.mime \
   ${gwmod_DATA}
 
 
@@ -166,17 +161,6 @@
 # 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 @... at .  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 @@
            (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

Modified: gnucash/trunk/src/gnome/gnucash.desktop.in
===================================================================
--- gnucash/trunk/src/gnome/gnucash.desktop.in	2006-05-29 21:25:41 UTC (rev 14250)
+++ gnucash/trunk/src/gnome/gnucash.desktop.in	2006-05-29 22:07:10 UTC (rev 14251)
@@ -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

Deleted: gnucash/trunk/src/gnome/gnucash.keys.in
===================================================================
--- gnucash/trunk/src/gnome/gnucash.keys.in	2006-05-29 21:25:41 UTC (rev 14250)
+++ gnucash/trunk/src/gnome/gnucash.keys.in	2006-05-29 22:07:10 UTC (rev 14251)
@@ -1,3 +0,0 @@
-application/x-gnucash:
-	open=gnucash %f
-	view=gnucash %f

Deleted: gnucash/trunk/src/gnome/gnucash.mime
===================================================================
--- gnucash/trunk/src/gnome/gnucash.mime	2006-05-29 21:25:41 UTC (rev 14250)
+++ gnucash/trunk/src/gnome/gnucash.mime	2006-05-29 22:07:10 UTC (rev 14251)
@@ -1,2 +0,0 @@
-application/x-gnucash
-	ext: xac gnc gnucash

Modified: gnucash/trunk/src/pixmaps/Makefile.am
===================================================================
--- gnucash/trunk/src/pixmaps/Makefile.am	2006-05-29 21:25:41 UTC (rev 14250)
+++ gnucash/trunk/src/pixmaps/Makefile.am	2006-05-29 22:07:10 UTC (rev 14251)
@@ -28,10 +28,12 @@
   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}