banshee r3462 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.ServiceStack src/Core/Banshee.ThickClient/Banshee.Gui src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea

[abock svn gnome org]

Author: abock
Date: Fri Mar 14 23:18:59 2008
New Revision: 3462
URL: http://svn.gnome.org/viewvc/banshee?rev=3462&view=rev

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

    * src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs: Define
    a property for the icon name that is expected to be in the GTK icon theme;
    set this value to the new media-player-banshee icon name (used to be
    music-player-banshee, changed to avoid conflicts)

    * src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs:
    * src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs:
    * src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:
    * src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:
    Remove all hardcoded references to music-player-banshee, the old icon
    name, and replaced with the new Application property



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
   trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs
   trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
   trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs	Fri Mar 14 23:18:59 2008
@@ -167,6 +167,10 @@
             get { return "banshee"; }
         }
         
+        public static string IconName {
+            get { return "media-player-banshee"; }
+        }
+        
         private static string version;
         public static string Version {
             get { 

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs	Fri Mar 14 23:18:59 2008
@@ -57,7 +57,7 @@
         
         private string default_icon_name;
         
-        protected GtkBaseClient () : this (true, "music-player-banshee")
+        protected GtkBaseClient () : this (true, Application.IconName)
         {
         }
         

Modified: trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/GtkNotificationAreaBox.cs	Fri Mar 14 23:18:59 2008
@@ -58,7 +58,7 @@
         
         public GtkNotificationAreaBox (BaseClientWindow window)
         {
-            IconName = "music-player-banshee";
+            IconName = Banshee.ServiceStack.Application.IconName;
             
             Tooltip = window.Title;
             window.TitleChanged += delegate { Tooltip = window.Title; };

Modified: trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs	Fri Mar 14 23:18:59 2008
@@ -249,7 +249,7 @@
         {
             try {
                 if (NotifyOnCloseSchema.Get ()) {
-                    Gdk.Pixbuf image = IconThemeUtils.LoadIcon (48, "music-player-banshee");
+                    Gdk.Pixbuf image = IconThemeUtils.LoadIcon (48, Banshee.ServiceStack.Application.IconName);
                     if (image != null) {
                         image = image.ScaleSimple (42, 42, Gdk.InterpType.Bilinear);
                     }

Modified: trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs	Fri Mar 14 23:18:59 2008
@@ -59,7 +59,7 @@
         {
             event_box = new EventBox ();
             image = new Image ();
-            image.IconName = "music-player-banshee";
+            image.IconName = Banshee.ServiceStack.Application.IconName;
             event_box.Add (image);
             Add (event_box);