[Libreoffice-commits] .: 2 commits - vcl/Library_vclplug_gtk.mk vcl/source

[David Tardon]

 vcl/Library_vclplug_gtk.mk   |    4 ++++
 vcl/source/window/window.cxx |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 8c93f7c003f65fbcc5fd0861a171a5f10f82f4a3
Author: David Tardon <dtardon at redhat.com>
Date:   Sat May 28 07:06:17 2011 +0200

    fix build with ENABLE_DBUS

diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 62f5c33..838df57 100755
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -48,6 +48,10 @@ $(eval $(call gb_Library_set_defs,vclplug_gtk,\
 ))
 
 ifneq ($(ENABLE_DBUS),)
+$(eval $(call gb_Library_set_include,vclplug_gtk,\
+	$$(INCLUDE) \
+	$(filter -I%,$(shell pkg-config --cflags dbus-glib-1)) \
+))
 $(eval $(call gb_Library_set_defs,vclplug_gtk,\
     $$(DEFS) \
     -DENABLE_DBUS \
commit 5ecd630f04e96fc113384874c0fb37afe0b76d60
Author: David Tardon <dtardon at redhat.com>
Date:   Sat May 28 06:57:28 2011 +0200

    this must be #if defined(DBG_UTIL) for now
    
    If this bold font testing is actually useful, IMHO the best approach is
    to make it depend on an env. variable, e.g., SAL_TEST_BOLDAPPFONT.
    Otherwise it should just be scrapped.

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 25c257e..a694cfe 100755
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -529,7 +529,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl
         rSettings.SetStyleSettings( aStyleSettings );
     }
 
-#if OSL_DEBUG_LEVEL > 0
+#if defined(DBG_UTIL)
     // Evt. AppFont auf Fett schalten, damit man feststellen kann,
     // ob fuer die Texte auf anderen Systemen genuegend Platz
     // vorhanden ist