banshee r3719 - in trunk/banshee: . src/Libraries/Hyena.Gui/Hyena.Widgets

[scottp svn gnome org]

Author: scottp
Date: Tue Apr  8 20:12:48 2008
New Revision: 3719
URL: http://svn.gnome.org/viewvc/banshee?rev=3719&view=rev

Log:
* src/Libraries/Hyena.Gui/Hyena.Widgets/ArrowButton.cs: Cosmetic
change.

* src/Libraries/Hyena.Gui/Hyena.Widgets/ActionButton.cs: Got rid of
some useless checks. There are some cornercases I'm just not
prepared to spend the energy to handle properly.

Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/ActionButton.cs
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/ArrowButton.cs

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/ActionButton.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/ActionButton.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/ActionButton.cs	Tue Apr  8 20:12:48 2008
@@ -116,24 +116,13 @@
             get { return action; }
             set {
                 action = value;
-                if (action == null) {
-                    if (image.IconName != null) {
-                        image.IconName = null;
-                    }
-                    if (image.Stock != null) {
-                        image.Stock = null;
-                    }
-                    label.TextWithMnemonic = String.Empty;
-                    Sensitive = false;
-                } else {
-                    if (!String.IsNullOrEmpty (action.IconName)) {
-                        image.IconName = action.IconName;
-                    } else if (!String.IsNullOrEmpty (action.StockId)) {
-                        image.Stock = action.StockId;
-                    }
-                    label.TextWithMnemonic = action.Label;
-                    Sensitive = action.Sensitive && action.Visible;
+                if (!String.IsNullOrEmpty (action.IconName)) {
+                    image.IconName = action.IconName;
+                } else if (!String.IsNullOrEmpty (action.StockId)) {
+                    image.Stock = action.StockId;
                 }
+                label.TextWithMnemonic = action.Label;
+                Sensitive = action.Sensitive && action.Visible;
             }
         }
         

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/ArrowButton.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/ArrowButton.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/ArrowButton.cs	Tue Apr  8 20:12:48 2008
@@ -55,9 +55,8 @@
         
         protected ArrowButton (Gtk.Action action, Toolbar toolbar)
         {
-            base.ActionButtonStyle = ActionButtonStyle.None;
-            
             this.action = action;
+            base.ActionButtonStyle = ActionButtonStyle.None;
             
             arrow_alloc.Width = 5;
             arrow_alloc.Height = 3;