Attachment 20654 Details for Bug 18752 – Only use the mixin if there are properties

[patch] Only use the mixin if there are properties

0001-Only-use-the-Properties-mixin-in-there-are-propertie.patch (text/plain), 4.23 KB, created by Ross Burton on 2008-11-28 02:33:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Burton

Created: 2008-11-28 02:33:17 UTC

Size: 4.23 KB

patch

obsolete

>From 2bf2122de74d9a7b4e9c74e739839934f711a3bc Mon Sep 17 00:00:00 2001
>From: Ross Burton <ross@linux.intel.com>
>Date: Wed, 19 Nov 2008 15:14:44 +0000
>Subject: [PATCH] Only use the Properties mixin in there are properties defined
>
>If there are no properties in the current node there is no need to write an
>empty table and initialize a mixin which will never be used.
>---
> tools/glib-ginterface-gen.py |   71 ++++++++++++++++++++++--------------------
> 1 files changed, 37 insertions(+), 34 deletions(-)
>
>diff --git a/tools/glib-ginterface-gen.py b/tools/glib-ginterface-gen.py
>index 9eb7af5..1b17155 100644
>--- a/tools/glib-ginterface-gen.py
>+++ b/tools/glib-ginterface-gen.py
>@@ -207,42 +207,45 @@ class Generator(object):
>         self.b('%s%s_base_init_once (gpointer klass G_GNUC_UNUSED)'
>                % (self.prefix_, node_name_lc))
>         self.b('{')
>-        self.b('  static TpDBusPropertiesMixinPropInfo properties[%d] = {'
>-               % (len(properties) + 1))
> 
>-        for m in properties:
>-            access = m.getAttribute('access')
>-            assert access in ('read', 'write', 'readwrite')
>-
>-            if access == 'read':
>-                flags = 'TP_DBUS_PROPERTIES_MIXIN_FLAG_READ'
>-            elif access == 'write':
>-                flags = 'TP_DBUS_PROPERTIES_MIXIN_FLAG_WRITE'
>-            else:
>-                flags = ('TP_DBUS_PROPERTIES_MIXIN_FLAG_READ | '
>-                         'TP_DBUS_PROPERTIES_MIXIN_FLAG_WRITE')
>-
>-            self.b('      { 0, %s, "%s", 0, NULL, NULL }, /* %s */'
>-                   % (flags, m.getAttribute('type'), m.getAttribute('name')))
>-
>-        self.b('      { 0, 0, NULL, 0, NULL, NULL }')
>-        self.b('  };')
>-        self.b('  static TpDBusPropertiesMixinIfaceInfo interface =')
>-        self.b('      { 0, properties, NULL, NULL };')
>-        self.b('')
>-        self.b('  interface.dbus_interface = g_quark_from_static_string '
>-               '("%s");' % self.iface_name)
>-
>-        for i, m in enumerate(properties):
>-            self.b('  properties[%d].name = g_quark_from_static_string ("%s");'
>-                   % (i, m.getAttribute('name')))
>-            self.b('  properties[%d].type = %s;'
>-                   % (i, type_to_gtype(m.getAttribute('type'))[1]))
>-
>-        self.b('  tp_svc_interface_set_dbus_properties_info (%s, &interface);'
>-               % self.current_gtype)
>+        if properties:
>+            self.b('  static TpDBusPropertiesMixinPropInfo properties[%d] = {'
>+                   % (len(properties) + 1))
>+            
>+            for m in properties:
>+                access = m.getAttribute('access')
>+                assert access in ('read', 'write', 'readwrite')
>+                
>+                if access == 'read':
>+                    flags = 'TP_DBUS_PROPERTIES_MIXIN_FLAG_READ'
>+                elif access == 'write':
>+                    flags = 'TP_DBUS_PROPERTIES_MIXIN_FLAG_WRITE'
>+                else:
>+                    flags = ('TP_DBUS_PROPERTIES_MIXIN_FLAG_READ | '
>+                             'TP_DBUS_PROPERTIES_MIXIN_FLAG_WRITE')
>+                    
>+                self.b('      { 0, %s, "%s", 0, NULL, NULL }, /* %s */'
>+                       % (flags, m.getAttribute('type'), m.getAttribute('name')))
>+                
>+            self.b('      { 0, 0, NULL, 0, NULL, NULL }')
>+            self.b('  };')
>+            self.b('  static TpDBusPropertiesMixinIfaceInfo interface =')
>+            self.b('      { 0, properties, NULL, NULL };')
>+            self.b('')
>+            self.b('  interface.dbus_interface = g_quark_from_static_string '
>+                   '("%s");' % self.iface_name)
>+            
>+            for i, m in enumerate(properties):
>+                self.b('  properties[%d].name = g_quark_from_static_string ("%s");'
>+                       % (i, m.getAttribute('name')))
>+                self.b('  properties[%d].type = %s;'
>+                           % (i, type_to_gtype(m.getAttribute('type'))[1]))
>+                
>+            self.b('  tp_svc_interface_set_dbus_properties_info (%s, &interface);'
>+                   % self.current_gtype)
>+            
>+            self.b('')
> 
>-        self.b('')
>         for s in base_init_code:
>             self.b(s)
>         self.b('  dbus_g_object_type_install_info (%s%s_get_type (),'
>-- 
>1.5.6.5
>

Actions: View | Splinter Review

Attachments on bug 18752: 20654 | 20655

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.