banshee r3432 - in trunk/banshee: . build data data/icon-theme-hicolor po src/Backends/Banshee.Gnome/Banshee.GnomeBackend src/Clients/Nereid src/Core/Banshee.ThickClient/Banshee.Collection.Gui
- From: abock svn gnome org
- To: svn-commits-list gnome org
- Subject: banshee r3432 - in trunk/banshee: . build data data/icon-theme-hicolor po src/Backends/Banshee.Gnome/Banshee.GnomeBackend src/Clients/Nereid src/Core/Banshee.ThickClient/Banshee.Collection.Gui
- Date: Wed, 12 Mar 2008 22:52:57 +0000 (GMT)
Author: abock
Date: Wed Mar 12 22:52:56 2008
New Revision: 3432
URL: http://svn.gnome.org/viewvc/banshee?rev=3432&view=rev
Log:
2008-03-12 Aaron Bockover <abock gnome org>
Yes. I made all the build stuff refer to Banshee as banshee-1 instead
of banshee-preview. This includes all paths, launchers, and even
gconf keys.
Added:
trunk/banshee/build/banshee-1.pc.in
- copied, changed from r3427, /trunk/banshee/build/banshee-preview.pc.in
trunk/banshee/data/banshee-1.desktop.in.in
- copied, changed from r3427, /trunk/banshee/data/banshee-preview.desktop.in.in
trunk/banshee/data/icon-theme-hicolor/media-player-banshee-16.png
- copied unchanged from r3427, /trunk/banshee/data/icon-theme-hicolor/music-player-banshee-16.png
trunk/banshee/data/icon-theme-hicolor/media-player-banshee-192.png
- copied unchanged from r3427, /trunk/banshee/data/icon-theme-hicolor/music-player-banshee-192.png
trunk/banshee/data/icon-theme-hicolor/media-player-banshee-22.png
- copied unchanged from r3427, /trunk/banshee/data/icon-theme-hicolor/music-player-banshee-22.png
trunk/banshee/data/icon-theme-hicolor/media-player-banshee-24.png
- copied unchanged from r3427, /trunk/banshee/data/icon-theme-hicolor/music-player-banshee-24.png
trunk/banshee/data/icon-theme-hicolor/media-player-banshee-32.png
- copied unchanged from r3427, /trunk/banshee/data/icon-theme-hicolor/music-player-banshee-32.png
trunk/banshee/data/icon-theme-hicolor/media-player-banshee-48.png
- copied unchanged from r3427, /trunk/banshee/data/icon-theme-hicolor/music-player-banshee-48.png
trunk/banshee/src/Clients/Nereid/banshee-1.in
- copied, changed from r3427, /trunk/banshee/src/Clients/Nereid/banshee-preview.in
Removed:
trunk/banshee/build/banshee-preview.pc.in
trunk/banshee/data/banshee-preview.desktop.in.in
trunk/banshee/data/icon-theme-hicolor/music-player-banshee-16.png
trunk/banshee/data/icon-theme-hicolor/music-player-banshee-192.png
trunk/banshee/data/icon-theme-hicolor/music-player-banshee-22.png
trunk/banshee/data/icon-theme-hicolor/music-player-banshee-24.png
trunk/banshee/data/icon-theme-hicolor/music-player-banshee-32.png
trunk/banshee/data/icon-theme-hicolor/music-player-banshee-48.png
trunk/banshee/src/Clients/Nereid/banshee-preview.in
Modified:
trunk/banshee/ChangeLog
trunk/banshee/build/Makefile.am
trunk/banshee/configure.ac
trunk/banshee/data/Makefile.am
trunk/banshee/data/icon-theme-hicolor/Makefile.am
trunk/banshee/data/org.bansheeproject.Banshee.service.in
trunk/banshee/po/POTFILES.in
trunk/banshee/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GConfConfigurationClient.cs
trunk/banshee/src/Clients/Nereid/Makefile.am
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BetaReleaseViewOverlay.cs
Modified: trunk/banshee/build/Makefile.am
==============================================================================
--- trunk/banshee/build/Makefile.am (original)
+++ trunk/banshee/build/Makefile.am Wed Mar 12 22:52:56 2008
@@ -4,7 +4,7 @@
TRANSLATOR_EXTRACTOR_ASSEMBLY = translator-extractor.exe
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = banshee-preview.pc
+pkgconfig_DATA = banshee-1.pc
bansheedir = $(pkglibdir)
banshee_SCRIPTS = $(GCONF_SCHEMA_EXTRACTOR_ASSEMBLY)
@@ -25,7 +25,7 @@
GConfSchemaExtractor.cs \
TranslatorExtractor.cs \
gconf-schema-rules \
- banshee-preview.pc.in
+ banshee-1.pc.in
CLEANFILES = *.exe *.mdb
DISTCLEANFILES = banshee-preview.pc
Copied: trunk/banshee/build/banshee-1.pc.in (from r3427, /trunk/banshee/build/banshee-preview.pc.in)
==============================================================================
--- /trunk/banshee/build/banshee-preview.pc.in (original)
+++ trunk/banshee/build/banshee-1.pc.in Wed Mar 12 22:52:56 2008
@@ -1,13 +1,8 @@
prefix= prefix@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
-systemplugindir= expanded_libdir@/banshee/Banshee.Plugins
-userplugindir=~/.gnome2/banshee/plugins
-pluginapi=2
Name: Banshee
-Description: Mono/GStreamer based media playback and organization platform
+Description: Mono-based Media Playback and Organization Framework
Version: @VERSION@
-Requires: gtk-sharp-2.0 gconf-sharp-2.0 @TAGLIB_SHARP_PC_REQUIRES@ ndesk-dbus-1.0 ndesk-dbus-glib-1.0
-Libs: -r:@expanded_libdir@/banshee/Hyena.dll -r:@expanded_libdir@/banshee/Hyena.Gui.dll -r:@expanded_libdir@/banshee/Banshee.Base.dll -r:@expanded_libdir@/banshee/Banshee.Widgets.dll @TAGLIB_SHARP_PC_LIBS@ -r:@expanded_libdir@/banshee/Hal.dll -r:@expanded_libdir@/banshee/MusicBrainz.dll -r:Mono.Posix
Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac (original)
+++ trunk/banshee/configure.ac Wed Mar 12 22:52:56 2008
@@ -2,7 +2,7 @@
# 0.98.* = Alpha *
# 0.99.* = Beta *
-AC_INIT([banshee-preview], [0.98.1])
+AC_INIT([banshee-1], [0.98.1])
AC_CANONICAL_SYSTEM
AC_PREREQ(2.13)
@@ -95,7 +95,7 @@
#BANSHEE_CHECK_DAAP
dnl i18n
-SHAMROCK_CONFIGURE_I18N(banshee-preview)
+SHAMROCK_CONFIGURE_I18N($PACKAGE)
dnl generated files
AC_OUTPUT([
@@ -103,7 +103,7 @@
build/Makefile
build/m4/Makefile
-build/banshee-preview.pc
+build/banshee-1.pc
data/Makefile
data/org.bansheeproject.Banshee.service
@@ -127,7 +127,7 @@
src/Clients/Makefile
src/Clients/Nereid/Makefile
-src/Clients/Nereid/banshee-preview
+src/Clients/Nereid/banshee-1
src/Core/Makefile
src/Core/Banshee.Core/Makefile
Modified: trunk/banshee/data/Makefile.am
==============================================================================
--- trunk/banshee/data/Makefile.am (original)
+++ trunk/banshee/data/Makefile.am Wed Mar 12 22:52:56 2008
@@ -3,7 +3,7 @@
icon-theme-hicolor
desktopdir = $(datadir)/applications
-desktop_in_files=banshee-preview.desktop.in.in
+desktop_in_files=banshee-1.desktop.in.in
desktop_DATA=$(desktop_in_files:.desktop.in.in=.desktop)
%.desktop.in: %.desktop.in.in
Copied: trunk/banshee/data/banshee-1.desktop.in.in (from r3427, /trunk/banshee/data/banshee-preview.desktop.in.in)
==============================================================================
--- /trunk/banshee/data/banshee-preview.desktop.in.in (original)
+++ trunk/banshee/data/banshee-1.desktop.in.in Wed Mar 12 22:52:56 2008
@@ -1,11 +1,11 @@
[Desktop Entry]
Version=1.0
Encoding=UTF-8
-_Name=Banshee Music Player
-_GenericName=Music Player
-Comment=Play and organize your music
-Exec=banshee-preview --play-enqueued --enqueue %U
-Icon=music-player-banshee
+_Name=Banshee
+_GenericName=Media Player
+Comment=Play and organize your media collection
+Exec=banshee-1 --play-enqueued --enqueue %U
+Icon=media-player-banshee
StartupNotify=true
Terminal=false
Type=Application
Modified: trunk/banshee/data/icon-theme-hicolor/Makefile.am
==============================================================================
--- trunk/banshee/data/icon-theme-hicolor/Makefile.am (original)
+++ trunk/banshee/data/icon-theme-hicolor/Makefile.am Wed Mar 12 22:52:56 2008
@@ -1,12 +1,12 @@
theme = hicolor
themedir = $(datadir)/icons/$(theme)
theme_icons = \
- apps,music-player-banshee-16.png \
- apps,music-player-banshee-22.png \
- apps,music-player-banshee-24.png \
- apps,music-player-banshee-32.png \
- apps,music-player-banshee-48.png \
- apps,music-player-banshee-192.png
+ apps,media-player-banshee-16.png \
+ apps,media-player-banshee-22.png \
+ apps,media-player-banshee-24.png \
+ apps,media-player-banshee-32.png \
+ apps,media-player-banshee-48.png \
+ apps,media-player-banshee-192.png
install_icon_exec = $(top_srcdir)/build/icon-theme-installer \
-t "$(theme)" \
Modified: trunk/banshee/data/org.bansheeproject.Banshee.service.in
==============================================================================
--- trunk/banshee/data/org.bansheeproject.Banshee.service.in (original)
+++ trunk/banshee/data/org.bansheeproject.Banshee.service.in Wed Mar 12 22:52:56 2008
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=org.bansheeproject.Banshee
-Exec= expanded_bindir@/banshee-preview
+Exec= expanded_bindir@/banshee-1
Modified: trunk/banshee/po/POTFILES.in
==============================================================================
--- trunk/banshee/po/POTFILES.in (original)
+++ trunk/banshee/po/POTFILES.in Wed Mar 12 22:52:56 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-preview.desktop.in.in
+data/banshee-1.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/Backends/Banshee.Gnome/Banshee.GnomeBackend/GConfConfigurationClient.cs
==============================================================================
--- trunk/banshee/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GConfConfigurationClient.cs (original)
+++ trunk/banshee/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GConfConfigurationClient.cs Wed Mar 12 22:52:56 2008
@@ -39,7 +39,7 @@
{
public class GConfConfigurationClient : IConfigurationClient
{
- private static string base_key = "/apps/banshee/";
+ private static string base_key = "/apps/banshee-1/";
private GConf.Client client;
private Dictionary<string, string> key_table = new Dictionary<string, string> ();
Modified: trunk/banshee/src/Clients/Nereid/Makefile.am
==============================================================================
--- trunk/banshee/src/Clients/Nereid/Makefile.am (original)
+++ trunk/banshee/src/Clients/Nereid/Makefile.am Wed Mar 12 22:52:56 2008
@@ -6,7 +6,7 @@
Nereid/PlayerInterface.cs \
Nereid/ViewContainer.cs
-bin_SCRIPTS = banshee-preview
+bin_SCRIPTS = banshee-1
include $(top_srcdir)/build/build.mk
Copied: trunk/banshee/src/Clients/Nereid/banshee-1.in (from r3427, /trunk/banshee/src/Clients/Nereid/banshee-preview.in)
==============================================================================
--- /trunk/banshee/src/Clients/Nereid/banshee-preview.in (original)
+++ trunk/banshee/src/Clients/Nereid/banshee-1.in Wed Mar 12 22:52:56 2008
@@ -10,5 +10,5 @@
export GST_PLUGIN_PATH= expanded_libdir@/@PACKAGE@/gstreamer-0.10${GST_PLUGIN_PATH+:$GST_PLUGIN_PATH}
# Finally - environment is set up, time to run our beloved
-exec -a banshee-preview mono --debug $MONO_EXE "$@"
+exec -a banshee-1 mono --debug $MONO_EXE "$@"
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BetaReleaseViewOverlay.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BetaReleaseViewOverlay.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BetaReleaseViewOverlay.cs Wed Mar 12 22:52:56 2008
@@ -43,6 +43,9 @@
{
public class BetaReleaseViewOverlay
{
+ // Every time a release is made, increment this if we want to show it
+ private const int WARNING_VERSION = 1;
+
private string welcome_string;
private SingleActorStage stage = new SingleActorStage ();
private Gdk.Pixbuf logo_scale;
@@ -55,7 +58,7 @@
public BetaReleaseViewOverlay (Widget widget)
{
- if (dismissed) {
+ if (dismissed || Configuration.ConfigurationClient.Get<int> ("core", "beta_release_note", 0) >= WARNING_VERSION) {
return;
}
@@ -120,6 +123,8 @@
protected virtual void OnFinished ()
{
+ Configuration.ConfigurationClient.Set<int> ("core", "beta_release_note", WARNING_VERSION);
+
EventHandler handler = Finished;
if (handler != null) {
handler (this, EventArgs.Empty);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]