vcl/unx/gtk/app/gtksys.cxx | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 22ffe94809374dc84b1417427c5ee8003f242a96
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Mar 15 11:00:56 2013 +0000
Related: rhbz#906137 g_module_symbol returned nothing
for gdk_screen_get_primary_monitor but osl_getAsciiFunctionSymbol does the
right thing
Change-Id: Ibf1a17724a9393d95c4fbe0d26aa82148eea33a9
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index f5862c2..48bc239 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -18,7 +18,6 @@
*/
#include <string.h>
-#include <gmodule.h>
#include <gtk/gtk.h>
#include <unx/gtk/gtkinst.hxx>
#include <unx/gtk/gtksys.hxx>
@@ -201,11 +200,8 @@ static int _get_primary_monitor (GdkScreen *pScreen)
// Perhaps we have a newer gtk+ with this symbol:
if (!get_fn)
{
- GModule *module = g_module_open (NULL, (GModuleFlags) 0);
- if (!g_module_symbol (module, "gdk_screen_get_primary_monitor",
- (gpointer *)&get_fn))
- get_fn = NULL;
- g_module_close (module);
+ get_fn = (int(*)(GdkScreen*))osl_getAsciiFunctionSymbol(NULL,
+ "gdk_screen_get_primary_monitor");
}
#if GTK_CHECK_VERSION(2,14,0)
if (!get_fn)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
