Update libglibcodegen from telepathy-glib master, and add libtpcodegen

This requires the imports in glib-ginterface-gen to be updated too.
Sync the entire file. It no longer needs signals-marshal.h to be
generated, so drop that.

This also introduces more strict checks for extension interfaces,
so sync the OLPC interfaces from Gabble master, and add Room_Handle to
the list of external types in all.xml.

4 files changed, 40 insertions, 37 deletions

diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 8e2e7679..7cb835bf 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -15,9 +15,6 @@ libsalut_extensions_la_SOURCES = \
     extensions.h
 
 nodist_libsalut_extensions_la_SOURCES = \
-    _gen/signals-marshal.c \
-    _gen/signals-marshal.h \
-    _gen/signals-marshal.list \
     _gen/enums.h \
     _gen/gtypes.h \
     _gen/gtypes-body.h \
@@ -57,17 +54,6 @@ extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
 		$(tools_dir)/doc-generator.xsl \
 		$< > $@
 
-_gen/signals-marshal.list: _gen/all.xml \
-	$(tools_dir)/glib-signals-marshal-gen.py
-	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@
-
-_gen/signals-marshal.h: _gen/signals-marshal.list Makefile.am
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_salut_ext_marshal $< > $@
-
-_gen/signals-marshal.c: _gen/signals-marshal.list Makefile.am
-	$(AM_V_GEN){ echo '#include "_gen/signals-marshal.h"' && \
-	$(GLIB_GENMARSHAL) --body --prefix=_salut_ext_marshal $< ; } > $@
-
 _gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \
 	$(tools_dir)/glib-client-marshaller-gen.py
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \
@@ -103,9 +89,7 @@ _gen/interfaces-body.h: _gen/all.xml \
 _gen/svc.c _gen/svc.h: _gen/all.xml $(tools_dir)/glib-ginterface-gen.py
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
 		--filename=_gen/svc \
-		--signal-marshal-prefix=_salut_ext \
 		--include='<telepathy-glib/dbus.h>' \
-		--include='"_gen/signals-marshal.h"' \
 		--not-implemented-func='tp_dbus_g_method_return_not_implemented' \
 		--allow-unstable \
 		$< Salut_Svc_
diff --git a/extensions/OLPC_Activity_Properties.xml b/extensions/OLPC_Activity_Properties.xml
index 1976fc63..d1ea2afa 100644
--- a/extensions/OLPC_Activity_Properties.xml
+++ b/extensions/OLPC_Activity_Properties.xml
@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
   <interface name="org.laptop.Telepathy.ActivityProperties">
     <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
 
-    <method name="SetProperties">
+    <method name="SetProperties" tp:name-for-bindings="Set_Properties">
       <arg direction="in" name="room" type="u">
         <tp:docstring>
           An integer handle representing the room of the activity
@@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
       </tp:possible-errors>
     </method>
 
-    <method name="GetProperties">
+    <method name="GetProperties" tp:name-for-bindings="Get_Properties">
       <arg direction="in" name="room" type="u">
         <tp:docstring>
           An integer handle for the activity's room to request his properties for
@@ -61,7 +61,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
       </tp:possible-errors>
     </method>
 
-    <method name="GetActivity">
+    <method name="GetActivity" tp:name-for-bindings="Get_Activity">
       <arg direction="in" name="activity_id" type="s">
         <tp:docstring>
           An activity id
@@ -85,7 +85,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
       </tp:possible-errors>
     </method>
 
-    <signal name="ActivityPropertiesChanged">
+    <signal name="ActivityPropertiesChanged"
+      tp:name-for-bindings="Activity_Properties_Changed">
       <arg name="room" type="u">
         <tp:docstring>
           An integer handle representing the room of the activity
diff --git a/extensions/OLPC_Buddy_Info.xml b/extensions/OLPC_Buddy_Info.xml
index d7ed2ccd..7caf35c0 100644
--- a/extensions/OLPC_Buddy_Info.xml
+++ b/extensions/OLPC_Buddy_Info.xml
@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
   <interface name="org.laptop.Telepathy.BuddyInfo">
     <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
 
-    <method name="SetProperties">
+    <method name="SetProperties" tp:name-for-bindings="Set_Properties">
       <arg direction="in" name="properties" type="a{sv}">
         <tp:docstring>
           A dictionary mapping information names to the desired values.
@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
       </tp:possible-errors>
     </method>
 
-    <method name="GetProperties">
+    <method name="GetProperties" tp:name-for-bindings="Get_Properties">
       <arg direction="in" name="contact" type="u">
         <tp:docstring>
           An integer handle for the contact to request his properties for
@@ -59,7 +59,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
       </tp:possible-errors>
     </method>
 
-    <signal name="PropertiesChanged">
+    <signal name="PropertiesChanged" tp:name-for-bindings="Properties_Changed">
       <arg name="contact" type="u">
         <tp:docstring>
           An integer handle representing the contact
@@ -67,7 +67,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
       </arg>
       <arg name="properties" type="a{sv}">
         <tp:docstring>
-          A dictionary mapping information names to their new values
+          A dictionary mapping property names to their new values. All
+          properties are included, not just those that have changed.
         </tp:docstring>
       </arg>
       <tp:docstring>
@@ -76,9 +77,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
       </tp:docstring>
     </signal>
 
-    <method name="SetActivities">
-      <arg direction="in" name="activities" type="a(su)">
-        <tp:docstring>
+
+   <tp:struct name="Activity" array-name="Activity_List">
+      <tp:docstring>A struct containing:
+          <ul>
+            <li>the identifier of the activity</li>
+            <li>the room handle of the activity channel</li>
+          </ul>
+        </tp:docstring>
+      <tp:member type="s" name="id"/>
+      <tp:member type="u" tp:type="Room_Handle" name="room"/>
+    </tp:struct>
+
+    <method name="SetActivities" tp:name-for-bindings="Set_Activities">
+      <arg direction="in" name="activities" type="a(su)" tp:type="Activity[]">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           An array of structs containing:
           <ul>
             <li>the identifier of the activity</li>
@@ -95,7 +108,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
       </tp:possible-errors>
     </method>
 
-    <method name="AddActivity">
+    <method name="AddActivity" tp:name-for-bindings="Add_Activity">
       <arg direction="in" name="id" type="s">
         <tp:docstring>
           An activity id
@@ -120,14 +133,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
       </tp:possible-errors>
     </method>
 
-    <method name="GetActivities">
+    <method name="GetActivities" tp:name-for-bindings="Get_Activities">
       <arg direction="in" name="contact" type="u">
         <tp:docstring>
           An integer handle for the contact whose activities are to be returned
         </tp:docstring>
       </arg>
-      <arg direction="out" name="activities" type="a(su)">
-        <tp:docstring>
+      <arg direction="out" name="activities" type="a(su)" tp:type="Activity[]">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           An array of structs containing:
           <ul>
             <li>the identifier of the activity</li>
@@ -144,14 +157,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
       </tp:possible-errors>
     </method>
 
-    <signal name="ActivitiesChanged">
+    <signal name="ActivitiesChanged" tp:name-for-bindings="Activities_Changed">
       <arg name="contact" type="u">
         <tp:docstring>
           An integer handle representing the contact
         </tp:docstring>
       </arg>
-      <arg name="activities" type="a(su)">
-        <tp:docstring>
+      <arg name="activities" type="a(su)" tp:type="Activity[]">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           An array of structs containing:
           <ul>
             <li>the identifier of the activity</li>
@@ -165,7 +178,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
       </tp:docstring>
     </signal>
 
-    <method name="SetCurrentActivity">
+    <method name="SetCurrentActivity"
+        tp:name-for-bindings="Set_Current_Activity">
       <arg direction="in" name="activity" type="s">
         <tp:docstring>
           The identifier of the activity, or the empty string if there is no
@@ -187,7 +201,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
       </tp:possible-errors>
     </method>
 
-    <method name="GetCurrentActivity">
+    <method name="GetCurrentActivity"
+        tp:name-for-bindings="Get_Current_Activity">
       <arg direction="in" name="contact" type="u">
         <tp:docstring>
           An integer handle for the contact whose current activity is to be
@@ -213,7 +228,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
       </tp:possible-errors>
     </method>
 
-    <signal name="CurrentActivityChanged">
+    <signal name="CurrentActivityChanged"
+        tp:name-for-bindings="Current_Activity_Changed">
       <arg name="contact" type="u">
         <tp:docstring>
           An integer handle representing the contact
diff --git a/extensions/all.xml b/extensions/all.xml
index ee496336..436272cd 100644
--- a/extensions/all.xml
+++ b/extensions/all.xml
@@ -29,6 +29,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
 <tp:generic-types>
   <tp:external-type name="Contact_Handle" type="u"
     from="Telepathy specification"/>
+  <tp:external-type name="Room_Handle" type="u"
+    from="Telepathy specification"/>
   <tp:external-type name="Socket_Address_Type" type="u"
     from="Telepathy specification"/>
   <tp:external-type name="DBus_Interface" type="s"