[telepathy-glib/master] Generate error names in the same way telepathy-qt4 does

[Simon McVittie]

camelcase_to_upper is just a lossy guess at what we meant; it's better to
use an unambiguous mapping.
---
 tests/all-errors-documented.py |    5 +++--
 tools/glib-errors-check-gen.py |    6 +++---
 tools/glib-errors-str-gen.py   |    4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/all-errors-documented.py b/tests/all-errors-documented.py
index ab49763..f258b48 100755
--- a/tests/all-errors-documented.py
+++ b/tests/all-errors-documented.py
@@ -7,7 +7,7 @@ import sys
 
 import xml.dom.minidom
 
-from libglibcodegen import NS_TP, camelcase_to_upper
+from libglibcodegen import NS_TP
 
 def check_all_errors_documented(abs_top_srcdir):
     error_path = os.path.join(abs_top_srcdir, 'spec', 'errors.xml')
@@ -20,7 +20,8 @@ def check_all_errors_documented(abs_top_srcdir):
     errors = dom.getElementsByTagNameNS(NS_TP, 'errors')[0]
     for error in errors.getElementsByTagNameNS(NS_TP, 'error'):
         nick = error.getAttribute('name').replace(' ', '')
-        name = 'TP_ERROR_STR_' + camelcase_to_upper(nick.replace('.', ''))
+        name = ('TP_ERROR_STR_' +
+                error.getAttribute('name').replace('.', '_').replace(' ', '_').upper()
 
         if '%s\n' % name not in sections:
             print "'%s' is missing in %s" % (name, sections_path)
diff --git a/tools/glib-errors-check-gen.py b/tools/glib-errors-check-gen.py
index 3d16b8e..d8cee37 100644
--- a/tools/glib-errors-check-gen.py
+++ b/tools/glib-errors-check-gen.py
@@ -3,8 +3,7 @@
 import sys
 import xml.dom.minidom
 
-from libglibcodegen import NS_TP, camelcase_to_upper, get_docstring, \
-        get_descendant_text
+from libglibcodegen import NS_TP, get_docstring, get_descendant_text
 
 class Generator(object):
     def __init__(self, dom):
@@ -24,7 +23,8 @@ class Generator(object):
         for error in self.errors.getElementsByTagNameNS(NS_TP, 'error'):
             ns = error.parentNode.getAttribute('namespace')
             nick = error.getAttribute('name').replace(' ', '')
-            enum = 'TP_ERROR_' + camelcase_to_upper(nick.replace('.', ''))
+            enum = ('TP_ERROR_' +
+                    error.getAttribute('name').replace(' ', '_').replace('.', '_').upper())
 
             print ''
             print '  /* %s.%s */' % (ns, nick)
diff --git a/tools/glib-errors-str-gen.py b/tools/glib-errors-str-gen.py
index f2f6744..5c7ef86 100644
--- a/tools/glib-errors-str-gen.py
+++ b/tools/glib-errors-str-gen.py
@@ -3,7 +3,7 @@
 import sys
 import xml.dom.minidom
 
-from libglibcodegen import NS_TP, camelcase_to_upper, get_docstring, xml_escape
+from libglibcodegen import NS_TP, get_docstring, xml_escape
 
 class Generator(object):
     def __init__(self, dom, basename):
@@ -34,7 +34,7 @@ class Generator(object):
         for error in errors:
             ns = error.parentNode.getAttribute('namespace')
             nick = error.getAttribute('name').replace(' ', '')
-            uc_nick = camelcase_to_upper(nick.replace('.', ''))
+            uc_nick = error.getAttribute('name').replace(' ', '_').replace('.', '_').upper()
             name = 'TP_ERROR_STR_' + uc_nick
             error_name = '%s.%s' % (ns, nick)
 
-- 
1.5.6.5