[Libreoffice-commits] .: sfx2/source

[Michael Meeks]

 sfx2/source/appl/shutdowniconunx.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 11a70bd38a01e3ff5aefd639f03b9bf118ab4579
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Dec 7 12:48:48 2010 +0000

    check the gtk+ version, in case we lazy linked to an older ver.

diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 3df2800..9a0b463 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -350,7 +350,10 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
 {
     ::SolarMutexGuard aGuard;
 
-    if( !g_type_from_name( "GdkDisplay" ) )
+    if( /* need gtk_status to resolve */
+        !gtk_check_version( 2, 10, 0 ) ||
+        /* we need the vcl plugin and mainloop initialized */
+        !g_type_from_name( "GdkDisplay" ) )
         return;
 
     OString aLabel;