--- calibre/src/qtcurve/style/qtcurve.cpp~	2012-06-08 20:17:00.000000000 +0400
+++ calibre/src/qtcurve/style/qtcurve.cpp	2012-10-11 22:55:52.000000000 +0400
@@ -37,7 +37,6 @@
 #define MAX_ROUND_BTN_PAD (ROUND_MAX==opts.round ? 3 : 0)
 
 #ifdef Q_WS_X11
-#include "macmenu.h"
 #include "shadowhelper.h"
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -1975,9 +1974,11 @@ void Style::polish(QWidget *widget)
     else if(qobject_cast<QMenuBar *>(widget))
     {
 #ifdef Q_WS_X11
+#if 0
         if (opts.xbar &&
             (!((APP_QTDESIGNER==theThemedApp || APP_KDEVELOP==theThemedApp) && widget->inherits("QDesignerMenuBar"))))
             Bespin::MacMenu::manage((QMenuBar *)widget);
+#endif
 
         if(BLEND_TITLEBAR || opts.menubarHiding&HIDE_KWIN || opts.windowBorder&WINDOW_BORDER_USE_MENUBAR_COLOR_FOR_TITLEBAR)
             emitMenuSize(widget, PREVIEW_MDI==itsIsPreview || !widget->isVisible() ? 0 : widget->rect().height());
@@ -2515,9 +2516,11 @@ void Style::unpolish(QWidget *widget)
     else if(qobject_cast<QMenuBar *>(widget))
     {
 #ifdef Q_WS_X11
+#if 0
         if(opts.xbar)
             Bespin::MacMenu::release((QMenuBar *)widget);
 #endif
+#endif
 
         widget->setAttribute(Qt::WA_Hover, false);
 
@@ -3592,6 +3595,7 @@ int Style::styleHint(StyleHint hint, con
             return 1;
         case SH_MainWindow_SpaceBelowMenuBar:
 #ifdef Q_WS_X11
+#if 0
             if(opts.xbar)
                 if (const QMenuBar *menubar = qobject_cast<const QMenuBar*>(widget))
                     if (0==menubar->height() && !menubar->actions().isEmpty())
@@ -3600,6 +3604,7 @@ int Style::styleHint(StyleHint hint, con
                         return -menubar->actionGeometry(menubar->actions().first()).height() + 1;
                     }
 #endif
+#endif
             return 0;
         case SH_DialogButtonLayout:
             return opts.gtkButtonOrder ? QDialogButtonBox::GnomeLayout : QDialogButtonBox::KdeLayout;