[gnome-builder] style: make clang semantic highlighter style agnostic

[Christian Hergert <chergert src gnome org>]

commit 0165eb5bc9a12197228443f34b3afbddb7e68a28
Author: Christian Hergert <christian hergert me>
Date:   Sat Apr 25 02:20:11 2015 -0700

    style: make clang semantic highlighter style agnostic
    
    This tries to use more generic style names that are more common across
    style schemes.

 data/style-schemes/builder.xml       |    6 +++---
 libide/clang/ide-clang-highlighter.h |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/data/style-schemes/builder.xml b/data/style-schemes/builder.xml
index f427f26..c8bb140 100644
--- a/data/style-schemes/builder.xml
+++ b/data/style-schemes/builder.xml
@@ -100,14 +100,13 @@
   <style name="c:type"                      foreground="#669900" bold="true"/>
   <style name="c:macro-name"                foreground="#677685" bold="false"/>
   <style name="c:enum-name"                 foreground="pink1" bold="false"/>
-  <style name="c:function-name"             foreground="#4186A8" bold="false"/>
 
   <style name="def:comment"                 foreground="blue1"/>
-  <style name="def:constant"                foreground="blue2"/>
+  <style name="def:constant"                foreground="pink1"/>
   <style name="def:doc-comment-element"     italic="true"/>
   <style name="def:error"                   line-background="#rgba(235,202,210,.4)" />
   <style name="def:floating-point"          foreground="blue2"/>
-  <style name="def:function"                foreground="pink1"/>
+  <style name="def:function"                foreground="#4186A8"/>
   <style name="def:decimal"                 foreground="purple1"/>
   <style name="def:base-n-integer"          foreground="blue2"/>
   <style name="def:boolean"                 foreground="pink1"/>
@@ -135,6 +134,7 @@
   <style name="python:builtin-object"       foreground="og1"/>
   <style name="python:keyword"              foreground="green1" bold="false"/>
   <style name="python:module-handler"       foreground="purple1" bold="false"/>
+  <style name="python:function-name"        foreground="pink1"/>
 
   <style name="xml:tags"                    foreground="chameleon3"/>
   <style name="xml:namespace"               bold="true"/>
diff --git a/libide/clang/ide-clang-highlighter.h b/libide/clang/ide-clang-highlighter.h
index 566260c..520eb71 100644
--- a/libide/clang/ide-clang-highlighter.h
+++ b/libide/clang/ide-clang-highlighter.h
@@ -26,8 +26,8 @@ G_BEGIN_DECLS
 #define IDE_TYPE_CLANG_HIGHLIGHTER (ide_clang_highlighter_get_type())
 
 #define IDE_CLANG_HIGHLIGHTER_TYPE          "c:type"
-#define IDE_CLANG_HIGHLIGHTER_FUNCTION_NAME "c:function-name"
-#define IDE_CLANG_HIGHLIGHTER_ENUM_NAME     "c:enum-name"
+#define IDE_CLANG_HIGHLIGHTER_FUNCTION_NAME "def:function"
+#define IDE_CLANG_HIGHLIGHTER_ENUM_NAME     "def:constant"
 #define IDE_CLANG_HIGHLIGHTER_MACRO_NAME    "c:macro-name"
 
 G_DECLARE_FINAL_TYPE (IdeClangHighlighter, ide_clang_highlighter,