banshee r3388 - in trunk/banshee: . build build/m4/banshee data libbanshee po src/Core/Banshee.Services/Banshee.ServiceStack src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView

[abock svn gnome org]

Author: abock
Date: Wed Mar  5 22:44:04 2008
New Revision: 3388
URL: http://svn.gnome.org/viewvc/banshee?rev=3388&view=rev

Log:
2008-03-05  Aaron Bockover  <abock gnome org>

    Lots of build fixes, preparing for the release

    * src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs:
    Always update the addin registry so new/changed addins are rescanned

    * src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:
    Workaround for a mono 1.2.4 bug



Added:
   trunk/banshee/build/banshee-preview.pc.in
      - copied unchanged from r3385, /trunk/banshee/build/banshee.pc.in
   trunk/banshee/data/banshee-preview.desktop.in.in
      - copied, changed from r3382, /trunk/banshee/data/banshee.desktop.in.in
   trunk/banshee/data/org.bansheeproject.Banshee.service.in
      - copied, changed from r3382, /trunk/banshee/data/org.gnome.Banshee.service.in
Removed:
   trunk/banshee/build/banshee.pc.in
   trunk/banshee/data/banshee.desktop.in.in
   trunk/banshee/data/org.gnome.Banshee.service.in
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/Makefile.am
   trunk/banshee/build/build.rules.mk
   trunk/banshee/build/m4/banshee/libbanshee.m4
   trunk/banshee/configure.ac
   trunk/banshee/data/Makefile.am
   trunk/banshee/libbanshee/Makefile.am
   trunk/banshee/libbanshee/gst-misc-0.10.c
   trunk/banshee/po/ChangeLog
   trunk/banshee/po/POTFILES.in
   trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs

Modified: trunk/banshee/build/Makefile.am
==============================================================================
--- trunk/banshee/build/Makefile.am	(original)
+++ trunk/banshee/build/Makefile.am	Wed Mar  5 22:44:04 2008
@@ -4,7 +4,7 @@
 TRANSLATOR_EXTRACTOR_ASSEMBLY = translator-extractor.exe
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = banshee.pc
+pkgconfig_DATA = banshee-preview.pc
 
 bansheedir = $(pkglibdir)
 banshee_SCRIPTS = $(GCONF_SCHEMA_EXTRACTOR_ASSEMBLY)
@@ -25,9 +25,9 @@
 	GConfSchemaExtractor.cs \
 	TranslatorExtractor.cs \
 	gconf-schema-rules \
-	banshee.pc.in
+	banshee-preview.pc.in
 
 CLEANFILES = *.exe *.mdb
-DISTCLEANFILES = banshee.pc
+DISTCLEANFILES = banshee-preview.pc
 MAINTAINERCLEANFILES = Makefile.in
 

Modified: trunk/banshee/build/build.rules.mk
==============================================================================
--- trunk/banshee/build/build.rules.mk	(original)
+++ trunk/banshee/build/build.rules.mk	Wed Mar  5 22:44:04 2008
@@ -33,7 +33,7 @@
 	test "x$$colors" = "xyes" && \
 		echo -e "\033[1mCompiling $(notdir $@)...\033[0m" || \
 		echo "Compiling $(notdir $@)...";
-	@$(BUILD) -target:$(TARGET) -out:$@ -warnaserror $(LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
+	@test "x$(top_srcdir)" = "x$(top_builddir)" && warn="-warnaserror"; $(BUILD) -target:$(TARGET) -out:$@ $$warn $(LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
 	@if [ -e $(notdir $  config) ]; then \
 		cp $(notdir $  config) $(top_builddir)/bin; \
 	fi;

Modified: trunk/banshee/build/m4/banshee/libbanshee.m4
==============================================================================
--- trunk/banshee/build/m4/banshee/libbanshee.m4	(original)
+++ trunk/banshee/build/m4/banshee/libbanshee.m4	Wed Mar  5 22:44:04 2008
@@ -13,8 +13,8 @@
 	PKG_CHECK_MODULES(GLIB, glib-2.0)
 	SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GLIB)
 
-	PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
-	SHAMROCK_CONCAT_MODULE(LIBBANSHEE, DBUS)
+	dnl PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
+	dnl SHAMROCK_CONCAT_MODULE(LIBBANSHEE, DBUS)
 	
 	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8)
 	SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GTK)	
@@ -22,8 +22,8 @@
 	PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0)
 	SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GNOMEVFS)
 	
-	PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz >= 2.1.1)
-	SHAMROCK_CONCAT_MODULE(LIBBANSHEE, MUSICBRAINZ)
+	dnl PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz >= 2.1.1)
+	dnl SHAMROCK_CONCAT_MODULE(LIBBANSHEE, MUSICBRAINZ)
 
 	AC_SUBST(LIBBANSHEE_CFLAGS)
 	AC_SUBST(LIBBANSHEE_LIBS)

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Wed Mar  5 22:44:04 2008
@@ -25,7 +25,7 @@
 
 dnl libbanshee/native dependencies (required)
 BANSHEE_CHECK_LIBBANSHEE
-BANSHEE_CHECK_NAUTILUS_BURN
+#BANSHEE_CHECK_NAUTILUS_BURN
 BANSHEE_CHECK_GSTREAMER
 SHAMROCK_CHECK_GSTREAMER_0_10_PLUGINS([
 	decodebin
@@ -96,10 +96,10 @@
 
 build/Makefile
 build/m4/Makefile
-build/banshee.pc
+build/banshee-preview.pc
 
 data/Makefile
-data/org.gnome.Banshee.service
+data/org.bansheeproject.Banshee.service
 data/audio-profiles/Makefile
 data/icon-theme-hicolor/Makefile
 

Modified: trunk/banshee/data/Makefile.am
==============================================================================
--- trunk/banshee/data/Makefile.am	(original)
+++ trunk/banshee/data/Makefile.am	Wed Mar  5 22:44:04 2008
@@ -3,7 +3,7 @@
 	icon-theme-hicolor
 
 desktopdir = $(datadir)/applications
-desktop_in_files=banshee.desktop.in.in
+desktop_in_files=banshee-preview.desktop.in.in
 desktop_DATA=$(desktop_in_files:.desktop.in.in=.desktop)
 
 %.desktop.in: %.desktop.in.in
@@ -11,7 +11,7 @@
 
 @INTLTOOL_DESKTOP_RULE@
 
-dbusservice_in_files = org.gnome.Banshee.service.in
+dbusservice_in_files = org.bansheeproject.Banshee.service.in
 dbusservicedir = $(datadir)/dbus-1/services
 dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
 
@@ -19,11 +19,10 @@
 	$(desktop_in_files) \
 	$(dbusservice_in_files)
 
-DISTCLEANFILES =	\
+DISTCLEANFILES = \
 	$(dbusservice_DATA) \
 	$(desktop_DATA)
 
 MAINTAINERCLEANFILES = \
 	Makefile.in
 
-CLEANFILES = translators.xml

Copied: trunk/banshee/data/banshee-preview.desktop.in.in (from r3382, /trunk/banshee/data/banshee.desktop.in.in)
==============================================================================
--- /trunk/banshee/data/banshee.desktop.in.in	(original)
+++ trunk/banshee/data/banshee-preview.desktop.in.in	Wed Mar  5 22:44:04 2008
@@ -4,7 +4,7 @@
 _Name=Banshee Music Player
 _GenericName=Music Player
 Comment=Play and organize your music
-Exec=banshee --play-enqueued --enqueue %U
+Exec=banshee-preview --play-enqueued --enqueue %U
 Icon=music-player-banshee
 StartupNotify=true
 Terminal=false

Copied: trunk/banshee/data/org.bansheeproject.Banshee.service.in (from r3382, /trunk/banshee/data/org.gnome.Banshee.service.in)
==============================================================================
--- /trunk/banshee/data/org.gnome.Banshee.service.in	(original)
+++ trunk/banshee/data/org.bansheeproject.Banshee.service.in	Wed Mar  5 22:44:04 2008
@@ -1,4 +1,4 @@
 [D-BUS Service]
-Name=org.gnome.Banshee
-Exec= expanded_bindir@/banshee
+Name=org.bansheeproject.Banshee
+Exec= expanded_bindir@/banshee-preview
 

Modified: trunk/banshee/libbanshee/Makefile.am
==============================================================================
--- trunk/banshee/libbanshee/Makefile.am	(original)
+++ trunk/banshee/libbanshee/Makefile.am	Wed Mar  5 22:44:04 2008
@@ -18,14 +18,16 @@
 	gst-cd-rip.h \
 	gst-tagger.c \
 	gst-tagger.h \
-	gst-mbtrm.h \
-	misc-glue.c \
-	nautilus-burn.c \
 	gst-playback-0.10.c \
 	gst-misc-0.10.c \
 	gst-transcode-0.10.c \
-	gst-cd-rip-0.10.c \
-	gst-mbtrm.c
+	gst-cd-rip-0.10.c
+
+OLD_CODE = \
+	gst-mbtrm.h \
+	gst-mbtrm.c \
+	nautilus-burn.c \
+	misc-glue.c
 
 libbanshee_la_LIBADD = \
 	$(LIBBANSHEE_LIBS) \

Modified: trunk/banshee/libbanshee/gst-misc-0.10.c
==============================================================================
--- trunk/banshee/libbanshee/gst-misc-0.10.c	(original)
+++ trunk/banshee/libbanshee/gst-misc-0.10.c	Wed Mar  5 22:44:04 2008
@@ -42,31 +42,8 @@
 #  include <gst/pbutils/pbutils.h>
 #endif
 
-#include "gst-mbtrm.h"
-
 static gboolean gstreamer_initialized = FALSE;
 
-static gboolean
-gst_mbtrm_register_elements(GstPlugin *plugin)
-{
-    return gst_element_register(plugin, "mbtrm",
-        GST_RANK_NONE, GST_TYPE_MBTRM);
-}
-
-static GstPluginDesc gst_mbtrm_plugin_desc = {
-    GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "mbtrm",
-    "Private MusicBrainz TRM element",
-    gst_mbtrm_register_elements,
-    "0.10.10",
-    "LGPL",
-    "libbanshee",
-    "Banshee",
-    "http://banshee-project.org/";,
-    GST_PADDING_INIT
-};
-
 void gstreamer_initialize()
 {
     if(gstreamer_initialized) {
@@ -79,8 +56,6 @@
     gst_pb_utils_init();
     #endif
     
-    _gst_plugin_register_static(&gst_mbtrm_plugin_desc);
-
     gstreamer_initialized = TRUE;
 }
 

Modified: trunk/banshee/po/POTFILES.in
==============================================================================
--- trunk/banshee/po/POTFILES.in	(original)
+++ trunk/banshee/po/POTFILES.in	Wed Mar  5 22:44:04 2008
@@ -9,7 +9,7 @@
 data/audio-profiles/wavpack.xml.in
 data/audio-profiles/wav.xml.in
 data/audio-profiles/wma.xml.in
-data/banshee.desktop.in.in
+data/banshee-preview.desktop.in.in
 libbanshee/gst-cd-rip-0.10.c
 libbanshee/gst-transcode-0.10.c
 src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs	Wed Mar  5 22:44:04 2008
@@ -72,14 +72,19 @@
             RegisterService<UserJobManager> ();
             
             AddinManager.Initialize (ApplicationContext.CommandLine.Contains ("uninstalled") 
-                ? "." : UserAddinCachePath);
+                ? "." : Paths.ApplicationData);
             
-            Banshee.Configuration.ConfigurationClient.Initialize ();
+            IProgressStatus monitor = ApplicationContext.CommandLine.Contains ("mono-addins-progress")
+                ? new ConsoleProgressStatus (true)
+                : null;
         
             if (ApplicationContext.Debugging) {
-                AddinManager.Registry.Rebuild (null /*new ConsoleProgressStatus (true)*/);
+                AddinManager.Registry.Rebuild (monitor);
+            } else {
+                AddinManager.Registry.Update (monitor);
             }
             
+            Banshee.Configuration.ConfigurationClient.Initialize ();
             extension_nodes = AddinManager.GetExtensionNodes ("/Banshee/ServiceManager/Service");
         }
         
@@ -243,10 +248,6 @@
             get { return is_initialized; }
         }
         
-        public static string UserAddinCachePath {
-            get { return Paths.ApplicationData; }
-        }
-        
         public static DBusServiceManager DBusServiceManager {
             get { return (DBusServiceManager)Get ("DBusServiceManager"); }
         }

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs	Wed Mar  5 22:44:04 2008
@@ -128,7 +128,8 @@
             
             Column [] columns = ColumnController.ToArray ();
             Array.Sort (columns, delegate (Column a, Column b) {
-                return String.Compare (a.Title, b.Title);
+                // Fully qualified type name to avoid Mono 1.2.4 bug
+                return System.String.Compare (a.Title, b.Title);
             });
             
             foreach (Column column in columns) {