summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-03-15 11:00:56 +0000
committerFridrich Strba <fridrich@documentfoundation.org>2013-03-15 12:07:45 +0000
commite00ed9262e16ad2a9b421ff004f94096d36d9e17 (patch)
tree28ce04951c7d73f7ef4b8741d26fe28841c24d66 /vcl/unx/gtk
parentff8d03d3871818238f8986b76ff901e4eb6fb701 (diff)
Related: rhbz#906137 g_module_symbol returned nothing
for gdk_screen_get_primary_monitor but osl_getAsciiFunctionSymbol does the right thing Change-Id: Ibf1a17724a9393d95c4fbe0d26aa82148eea33a9 Reviewed-on: https://gerrit.libreoffice.org/2744 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'vcl/unx/gtk')
-rw-r--r--vcl/unx/gtk/app/gtksys.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index f5862c255c20..48bc239fd8b7 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)