From 30bc36082e2922b11b98907fde12f64fd4f7399d Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri, 6 Nov 2009 14:04:36 +0000
Subject: [PATCH] Do not pass flags to g_module_open(NULL)

The flags are ignored when opening the main module, so we
should pass 0 to avoid confusion when reading the source.
---
 clutter/clutter-alpha.c         | 2 +-
 clutter/clutter-script-parser.c | 6 +++---
 clutter/clutter-script.c        | 2 +-
 clutter/cogl/cogl/cogl.c        | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/clutter/clutter-alpha.c b/clutter/clutter-alpha.c
index 8bb9e77c7..891679604 100644
--- a/clutter/clutter-alpha.c
+++ b/clutter/clutter-alpha.c
@@ -244,7 +244,7 @@ resolve_alpha_func (const gchar *name)
   CLUTTER_NOTE (SCRIPT, "Looking up '%s' alpha function", name);
 
   if (G_UNLIKELY (module == NULL))
-    module = g_module_open (NULL, G_MODULE_BIND_LAZY);
+    module = g_module_open (NULL, 0);
 
   if (g_module_symbol (module, name, (gpointer) &func))
     {
diff --git a/clutter/clutter-script-parser.c b/clutter/clutter-script-parser.c
index f318208d4..ebe84fa93 100644
--- a/clutter/clutter-script-parser.c
+++ b/clutter/clutter-script-parser.c
@@ -76,7 +76,7 @@ clutter_script_get_type_from_symbol (const gchar *symbol)
   GType gtype = G_TYPE_INVALID;
 
   if (!module)
-    module = g_module_open (NULL, G_MODULE_BIND_LAZY);
+    module = g_module_open (NULL, 0);
   
   if (g_module_symbol (module, symbol, (gpointer)&func))
     gtype = func ();
@@ -95,7 +95,7 @@ clutter_script_get_type_from_class (const gchar *name)
   gint i;
 
   if (G_UNLIKELY (!module))
-    module = g_module_open (NULL, G_MODULE_BIND_LAZY);
+    module = g_module_open (NULL, 0);
   
   for (i = 0; name[i] != '\0'; i++)
     {
@@ -803,7 +803,7 @@ resolve_alpha_func (const gchar *name)
   CLUTTER_NOTE (SCRIPT, "Looking up '%s' alpha function", name);
 
   if (G_UNLIKELY (!module))
-    module = g_module_open (NULL, G_MODULE_BIND_LAZY);
+    module = g_module_open (NULL, 0);
 
   if (g_module_symbol (module, name, (gpointer) &func))
     {
diff --git a/clutter/clutter-script.c b/clutter/clutter-script.c
index bb699e776..b1c809ceb 100644
--- a/clutter/clutter-script.c
+++ b/clutter/clutter-script.c
@@ -906,7 +906,7 @@ clutter_script_connect_signals (ClutterScript *script,
     }
 
   cd = g_new (ConnectData, 1);
-  cd->module = g_module_open (NULL, G_MODULE_BIND_LAZY);
+  cd->module = g_module_open (NULL, 0);
   cd->data = user_data;
 
   clutter_script_connect_signals_full (script,
diff --git a/clutter/cogl/cogl/cogl.c b/clutter/cogl/cogl/cogl.c
index 2b028fca8..9ebd40e8b 100644
--- a/clutter/cogl/cogl/cogl.c
+++ b/clutter/cogl/cogl/cogl.c
@@ -97,8 +97,8 @@ cogl_get_proc_address (const gchar* name)
 
   /* this should find the right function if the program is linked against a
    * library providing it */
-  if (module == NULL)
-    module = g_module_open (NULL, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+  if (G_UNLIKELY (module == NULL))
+    module = g_module_open (NULL, 0);
 
   if (module)
     {