[banshee/stable-1.6] [configure] use full desktop name on MeeGo



commit 6619de61841c6c02fbb922309551490170685aab
Author: Aaron Bockover <abockover novell com>
Date:   Sat May 1 20:28:38 2010 -0400

    [configure] use full desktop name on MeeGo
    
    On MeeGo, use 'Banshee Media Player' as the Name field in the .desktop
    files, similar to what is done in GNOME < 2.28. The application tiles in
    MeeGo do not properly use Name/GenericName (they should display both
    fields, but only display Name).

 configure.ac |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 52f0e8a..a339b86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,8 +79,18 @@ 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")
+dnl Check for GNOME >= 2.28 to see if we should remove
+dnl 'Media Player' from the app Name, bgo#596242, except
+dnl in MeeGo where GNOME >= 2.28, but we want the full name
+PKG_CHECK_MODULES(GNOME_2_28, gnome-desktop-2.0 >= 2.28,
+	HAVE_GNOME_2_28=yes, HAVE_GNOME_2_28=no)
+PKG_CHECK_MODULES(MEEGO_PANEL, moblin-panel,
+	HAVE_MEEGO_PANEL=yes, HAVE_MEEGO_PANEL=no)
+if test "x$HAVE_GNOME_2_28" = "xno" -o "x$HAVE_MEEGO_PANEL" = "xyes"; then
+	BANSHEE_DESKTOP_NAME="_Name=Banshee Media Player"
+else
+	BANSHEE_DESKTOP_NAME="_Name=Banshee"
+fi
 AC_SUBST(BANSHEE_DESKTOP_NAME)
 
 dnl NDesk DBus libraries



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