Un-break MOZ_TASKBAR.

cmd/xfe/XfeWidgets/XfeToolBar/ToolBar.c

@@ -1728,8 +1728,8 @@ PreferredVertical(Widget w,Dimension * width,Dimension * height)
 				/* Obtain the dimensions for the child */
 				GetChildDimensions(child,&child_width,&child_height);
 				
-				assert( child_width > 0 );
-				assert( child_height > 0 );
+/* 				assert( child_width > 0 ); */
+/* 				assert( child_height > 0 ); */
 				
 				*height += (child_height + _XfeOrientedSpacing(w));
 			}
@@ -1881,12 +1881,15 @@ LayoutVertical(Widget w)
 			{
 				/* Obtain the dimensions for the child */
 				GetChildDimensions(child,&width,&height);
-				
-				assert( width > 0 );
-				assert( height > 0 );
-				
-				_XfeConfigureWidget(child,x,y,width,height);
-				
+
+/* 				assert( width > 0 ); */
+/* 				assert( height > 0 ); */
+
+				if ((width > 0) && (height > 0))
+				{
+					_XfeConfigureWidget(child,x,y,width,height);
+				}
+
 				y += (_XfeHeight(child) + _XfeOrientedSpacing(w));
 			}
 		}

cmd/xfe/src/TaskBar.cpp

@@ -100,7 +100,8 @@ XFE_TaskBar::XFE_TaskBar(Widget			parent,
 						 XP_Bool		is_floating) :
 	XFE_Component(parent_frame),
     m_isFloating(is_floating),
-	m_parentFrame(parent_frame)
+	m_parentFrame(parent_frame),
+	m_actionButton(NULL)
 #ifdef MOZ_MAIL_NEWS
     ,m_biffNoticeInstalled(False)
 #endif
@@ -472,7 +473,10 @@ XFE_TaskBar::updateFloatingAppearance()
 
 	unsigned char	button_layout;
 
-	button_layout = XFE_Toolbar::styleToLayout(fe_globalPrefs.toolbar_style);
+    int32 toolbar_style;
+    PREF_GetIntPref("browser.chrome.toolbar_style", &toolbar_style);
+
+	button_layout = XFE_Toolbar::styleToLayout(toolbar_style);
 
 	XtVaSetValues(m_widget,XmNbuttonLayout,button_layout,NULL);
 }

cmd/xfe/src/TaskBar.h

@@ -68,6 +68,7 @@ private:
 	
 	XP_Bool				m_isFloating;
 	XFE_Frame *			m_parentFrame;
+	Widget				m_actionButton;
 
 #ifdef MOZ_MAIL_NEWS
 	XP_Bool				m_biffNoticeInstalled;

cmd/xfe/src/TaskBarDrop.cpp

@@ -32,7 +32,7 @@
 #ifdef EDITOR
 #include "EditorFrame.h"
 #endif
-#include <Xfe/Xfe.h>
+#include <Xfe/Button.h>
 #include "xfe2_extern.h"
 
 #ifdef DEBUG_sgidev