banshee r4519 - in trunk/banshee: . src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs

[abock svn gnome org]

Author: abock
Date: Fri Sep 12 01:18:23 2008
New Revision: 4519
URL: http://svn.gnome.org/viewvc/banshee?rev=4519&view=rev

Log:
2008-09-11  Aaron Bockover  <abock gnome org>

    * src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs: Do
    not display the two version strings if they are the same; Wiki->Website
    string update

    * configure.ac: Bump version to 1.3.0



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/configure.ac
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Fri Sep 12 01:18:23 2008
@@ -1,7 +1,7 @@
 dnl Automake setup
 
-AC_INIT([banshee-1], [1.2.2]) 
-ASM_DISPLAY_VERSION="1.2.2"
+AC_INIT([banshee-1], [1.3.0]) 
+ASM_DISPLAY_VERSION="1.3.0"
 DEVEL_BUILD=yes
 
 AC_CANONICAL_SYSTEM

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs	Fri Sep 12 01:18:23 2008
@@ -83,9 +83,11 @@
             // yet though since it breaks stuff for other people. 
             Name = "Banshee";
             Logo = Gdk.Pixbuf.LoadFromResource (ApplicationContext.Debugging ? /*"jcastro.png"*/ "banshee-logo.png" : "banshee-logo.png");
-            Version = String.Format ("{0} ({1})", 
-                Banshee.ServiceStack.Application.DisplayVersion, 
-                Banshee.ServiceStack.Application.Version);
+            Version = Banshee.ServiceStack.Application.DisplayVersion == Banshee.ServiceStack.Application.Version 
+                ? Banshee.ServiceStack.Application.DisplayVersion
+                : String.Format ("{0} ({1})", 
+                    Banshee.ServiceStack.Application.DisplayVersion, 
+                    Banshee.ServiceStack.Application.Version);
             Comments = Catalog.GetString ("Extraordinary Multimedia Management and Playback");
             Copyright = Catalog.GetString (
                 "Copyright \u00a9 2005\u20132008 Novell, Inc.\n" + 
@@ -93,7 +95,7 @@
             );
             
             Website = "http://banshee-project.org/";;
-            WebsiteLabel = Catalog.GetString ("Banshee Wiki");
+            WebsiteLabel = Catalog.GetString ("Banshee Website");
 
             Authors = authors.ToArray ();
             Artists = ProductInformation.Artists;