[telepathy-glib/master] Correctly set self.basename in glib-ginterface-gen

Will Thompson will.thompson at collabora.co.uk
Tue May 26 08:30:29 PDT 2009


Previously the Generator was using the global 'basename' variable
inherited from __main__, which is confusing at best.
---
 tools/glib-ginterface-gen.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/glib-ginterface-gen.py b/tools/glib-ginterface-gen.py
index f42a85f..b361c7f 100644
--- a/tools/glib-ginterface-gen.py
+++ b/tools/glib-ginterface-gen.py
@@ -66,6 +66,7 @@ class Generator(object):
         self.prefix_ = prefix.lower()
         self.PREFIX_ = prefix.upper()
 
+        self.basename = basename
         self.signal_marshal_prefix = signal_marshal_prefix
         self.headers = headers
         self.end_headers = end_headers
@@ -671,7 +672,7 @@ class Generator(object):
         self.h('G_BEGIN_DECLS')
         self.h('')
 
-        self.b('#include "%s.h"' % basename)
+        self.b('#include "%s.h"' % self.basename)
         self.b('')
         for header in self.headers:
             self.b('#include %s' % header)
@@ -689,8 +690,8 @@ class Generator(object):
 
         self.h('')
         self.b('')
-        open(basename + '.h', 'w').write('\n'.join(self.__header))
-        open(basename + '.c', 'w').write('\n'.join(self.__body))
+        open(self.basename + '.h', 'w').write('\n'.join(self.__header))
+        open(self.basename + '.c', 'w').write('\n'.join(self.__body))
 
 
 def cmdline_error():
-- 
1.5.6.5




More information about the telepathy-commits mailing list