[banshee] Add X-GNOME-FullName to .desktop files (bgo#596242)



commit 72de009be76c70b691858f29d267cd354876f32a
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Tue Jan 26 12:08:41 2010 -0800

    Add X-GNOME-FullName to .desktop files (bgo#596242)
    
    Only change Name from 'Banshee Media Player' to the proper
    'Banshee' if building on GNOME >= 2.28

 configure.ac                                       |    5 +++++
 data/desktop-files/Makefile.am                     |    5 +++--
 .../{common.desktop => common.desktop.in}          |    3 ++-
 po/POTFILES.in                                     |    2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 234117b..13065a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,10 @@ dnl Check for mono >= 2.4.3 for LibraryWatcher extension, with fix for bnc#32233
 PKG_CHECK_MODULES(MONO_2_4_3, mono >= 2.4.3, HAVE_MONO_2_4_3=yes, HAVE_MONO_2_4_3=no)
 AM_CONDITIONAL(ENABLE_LIBRARY_WATCHER, test "x$HAVE_MONO_2_4_3" = "xyes")
 
+dnl Check for GNOME >= 2.28 to see if we should remove 'Media Player' from the app Name, bgo#596242
+PKG_CHECK_MODULES(GNOME_LT_2_28, gnome-desktop-2.0 < 2.28, BANSHEE_DESKTOP_NAME="_Name=Banshee Media Player", BANSHEE_DESKTOP_NAME="_Name=Banshee")
+AC_SUBST(BANSHEE_DESKTOP_NAME)
+
 dnl NDesk DBus libraries
 BANSHEE_CHECK_NDESK_DBUS
 
@@ -209,6 +213,7 @@ data/org.bansheeproject.Banshee.service
 data/org.bansheeproject.CollectionIndexer.service
 data/audio-profiles/Makefile
 data/desktop-files/Makefile
+data/desktop-files/common.desktop
 data/icon-theme-hicolor/Makefile
 
 docs/Makefile
diff --git a/data/desktop-files/Makefile.am b/data/desktop-files/Makefile.am
index 53f509c..c839d86 100644
--- a/data/desktop-files/Makefile.am
+++ b/data/desktop-files/Makefile.am
@@ -2,7 +2,7 @@ desktopdir = $(datadir)/applications
 desktop_in_files = $(wildcard *.desktop.in.in)
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
-DESKTOP_FRAMEWORK_DEPS = common.desktop update-desktop-file.sh
+DESKTOP_FRAMEWORK_DEPS = common.desktop.in update-desktop-file.sh
 DESKTOP_MIME_DEPS = $(wildcard *.desktop.mime)
 
 if ENABLE_RELEASE
@@ -22,7 +22,8 @@ EXTRA_DIST = \
 	$(DESKTOP_FRAMEWORK_DEPS)
 
 CLEANFILES = \
-	$(desktop_DATA)
+	$(desktop_DATA) \
+	common.desktop
 
 MAINTAINERCLEANFILES = \
 	Makefile.in
diff --git a/data/desktop-files/common.desktop b/data/desktop-files/common.desktop.in
similarity index 86%
rename from data/desktop-files/common.desktop
rename to data/desktop-files/common.desktop.in
index a4ee6aa..be41d1b 100644
--- a/data/desktop-files/common.desktop
+++ b/data/desktop-files/common.desktop.in
@@ -1,6 +1,7 @@
 Version=1.0
-_Name=Banshee Media Player
+ BANSHEE_DESKTOP_NAME@
 _GenericName=Media Player
+_X-GNOME-FullName=Banshee Media Player
 _Comment=Play and organize your media collection
 Icon=media-player-banshee
 StartupNotify=true
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 86dfc10..25e0420 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,7 +11,7 @@ data/audio-profiles/vorbis.xml.in
 data/audio-profiles/wavpack.xml.in
 data/audio-profiles/wav.xml.in
 data/audio-profiles/wma.xml.in
-data/desktop-files/common.desktop
+data/desktop-files/common.desktop.in
 libbanshee/banshee-bpmdetector.c
 libbanshee/banshee-ripper.c
 libbanshee/banshee-transcoder.c



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]