banshee r3222 - in trunk/banshee: . src/Core/Nereid/Nereid

[abock svn gnome org]

Author: abock
Date: Mon Feb 11 16:42:47 2008
New Revision: 3222
URL: http://svn.gnome.org/viewvc/banshee?rev=3222&view=rev

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

    * src/Core/Nereid/Nereid/Client.cs: Load custom gtkrc files from either
    the user config (~/.config/banshee/gtkrc) or any custom gtkrc shipped
    with the application

    * src/Core/Nereid/Nereid/PlayerInterface.cs: Get rid of some whitespace



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Nereid/Nereid/Client.cs
   trunk/banshee/src/Core/Nereid/Nereid/PlayerInterface.cs

Modified: trunk/banshee/src/Core/Nereid/Nereid/Client.cs
==============================================================================
--- trunk/banshee/src/Core/Nereid/Nereid/Client.cs	(original)
+++ trunk/banshee/src/Core/Nereid/Nereid/Client.cs	Mon Feb 11 16:42:47 2008
@@ -26,19 +26,31 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+using System.IO;
+
 namespace Nereid
 {
     public class Client : Banshee.Gui.GtkBaseClient
     {
-        // Command line options:
-        //  --db=PATH   Use the database file at PATH.
         public static void Main ()
         {
+            // This could go into GtkBaseClient, but it's probably something we
+            // should really only support at each client level
+            string user_gtkrc = Path.Combine (Banshee.Base.Paths.ApplicationData, "gtkrc"); 
+            
+            if (File.Exists (user_gtkrc)) {
+                Gtk.Rc.AddDefaultFile (user_gtkrc);
+            } else if (File.Exists ("gtkrc")) {
+                Gtk.Rc.AddDefaultFile ("gtkrc");
+            }
+            
+            // Boot the client
             Banshee.Gui.GtkBaseClient.Entry<Client> ();
         }
         
         protected override void OnRegisterServices ()
         {
+            // Register the main interface
             Banshee.ServiceStack.ServiceManager.RegisterService <PlayerInterface> ();
         }
     }

Modified: trunk/banshee/src/Core/Nereid/Nereid/PlayerInterface.cs
==============================================================================
--- trunk/banshee/src/Core/Nereid/Nereid/PlayerInterface.cs	(original)
+++ trunk/banshee/src/Core/Nereid/Nereid/PlayerInterface.cs	Mon Feb 11 16:42:47 2008
@@ -126,7 +126,6 @@
             BuildViews ();
             BuildFooter ();
 
-            
             primary_vbox.Show ();
             Add (primary_vbox);
         }