From dd75e4363061bd6daffe5c6415c2976d39efeceb Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Fri, 14 Jan 2011 10:40:11 +0100 Subject: Changes: Fix compilation of MStatusBarView for environments without D-Bus. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RevBy: MichaƂ Details: declare SharedPixmapHeight outside the #ifdef HAVE_DBUS. --- src/views/mstatusbarview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/mstatusbarview.cpp b/src/views/mstatusbarview.cpp index 1a884767..acf3e992 100644 --- a/src/views/mstatusbarview.cpp +++ b/src/views/mstatusbarview.cpp @@ -40,15 +40,15 @@ #include #endif //HAVE_XDAMAGE -#ifdef HAVE_DBUS namespace{ +#ifdef HAVE_DBUS const QString PIXMAP_PROVIDER_DBUS_SERVICE = "com.meego.core.MStatusBar"; const QString PIXMAP_PROVIDER_DBUS_PATH = "/statusbar"; const char * PIXMAP_PROVIDER_DBUS_INTERFACE = "com.meego.core.MStatusBar"; const QString PIXMAP_PROVIDER_DBUS_SHAREDPIXMAP_CALL = "sharedPixmapHandle"; +#endif // HAVE_DBUS const qreal SharedPixmapHeight = 30; } -#endif // HAVE_DBUS const QString MStatusBarView::STATUS_INDICATOR_MENU_DBUS_SERVICE = "com.meego.core.MStatusIndicatorMenu"; const QString MStatusBarView::STATUS_INDICATOR_MENU_DBUS_PATH = "/statusindicatormenu"; -- cgit v1.2.3