From 475fcc64a7fb047c53617c5926cfb0ca3ceade09 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@openedhand.com>
Date: Tue, 9 Oct 2007 20:04:23 +0000
Subject: [PATCH] 2007-10-09  Emmanuele Bassi  <ebassi@openedhand.com>

	* clutter/clutter-script.c (resolve_alpha_func): Fix the
	ClutterAlphaFunc resolution function.
---
 ChangeLog                |  5 +++++
 clutter/clutter-script.c | 17 ++++++++---------
 tests/test-script.c      |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7db100126..eb0b30fba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-09  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-script.c (resolve_alpha_func): Fix the
+	ClutterAlphaFunc resolution function.
+
 2007-10-09  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* tests/Makefile.am:
diff --git a/clutter/clutter-script.c b/clutter/clutter-script.c
index 43b41ca2b..1f11825fe 100644
--- a/clutter/clutter-script.c
+++ b/clutter/clutter-script.c
@@ -187,6 +187,8 @@ resolve_alpha_func (const gchar *name)
   if (!module)
     module = g_module_open (NULL, 0);
   
+  CLUTTER_NOTE (SCRIPT, "Looking for `%s' alpha function", name);
+  
   if (g_module_symbol (module, name, (gpointer) &func))
     return func;
 
@@ -195,21 +197,18 @@ resolve_alpha_func (const gchar *name)
   for (i = 0; name[i] != '\0'; i++)
     {
       c = name[i];
-      /* skip if uppercase, first or previous is uppercase */
-      if ((c == '-') ||
-          (c == g_ascii_toupper (c) &&
-           i > 0 && name[i-1] != g_ascii_toupper (name[i-1])) ||
-          (i > 2 && name[i]   == g_ascii_toupper (name[i]) &&
-           name[i-1] == g_ascii_toupper (name[i-1]) &&
-           name[i-2] == g_ascii_toupper (name[i-2])))
+      
+      if (name[i] == '-')
         g_string_append_c (symbol_name, '_');
-
-      g_string_append_c (symbol_name, g_ascii_tolower (c));
+      else
+        g_string_append_c (symbol_name, g_ascii_tolower (name[i]));
     }
   g_string_append (symbol_name, "_func");
   
   symbol = g_string_free (symbol_name, FALSE);
 
+  CLUTTER_NOTE (SCRIPT, "Looking for `%s' alpha function", symbol);
+
   if (!g_module_symbol (module, symbol, (gpointer)&func))
     func = NULL;
 
diff --git a/tests/test-script.c b/tests/test-script.c
index b9f26ec88..b3cc51756 100644
--- a/tests/test-script.c
+++ b/tests/test-script.c
@@ -32,7 +32,7 @@ static const gchar *test_behaviour =
 "    \"opacity-end\"   : 0,"
 "    \"alpha\"         : {"
 "      \"timeline\" : \"main-timeline\","
-"      \"function\" : \"ramp\""
+"      \"function\" : \"ramp-inc\""
 "    }"
 "  }"
 "]";